diff --git a/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistBoundUserInterface.cs b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistBoundUserInterface.cs
new file mode 100644
index 00000000000..594480d11b3
--- /dev/null
+++ b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistBoundUserInterface.cs
@@ -0,0 +1,41 @@
+using Content.Shared._NF.Chemistry.Events;
+using Content.Shared.Chemistry.Reagent;
+using JetBrains.Annotations;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._NF.Chemistry.UI
+{
+    [UsedImplicitly]
+    public sealed class ChangeReagentWhitelistBoundUserInterface : BoundUserInterface
+    {
+        private ChangeReagentWhitelistWindow? _window;
+        public ChangeReagentWhitelistBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = new ChangeReagentWhitelistWindow(this);
+
+            _window.OnClose += Close;
+            _window.OpenCentered();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            base.Dispose(disposing);
+            if (!disposing) return;
+            _window?.Dispose();
+        }
+        public void ChangeReagentWhitelist(ProtoId<ReagentPrototype> newReagentProto)
+        {
+            SendMessage(new ReagentWhitelistChangeMessage(newReagentProto));
+        }
+
+        public void ResetReagentWhitelist()
+        {
+            SendMessage(new ReagentWhitelistResetMessage());
+        }
+    }
+}
diff --git a/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml
new file mode 100644
index 00000000000..25866e2cb2a
--- /dev/null
+++ b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml
@@ -0,0 +1,11 @@
+<DefaultWindow
+    SetSize="250 300"
+    Margin="4 0"
+    xmlns="https://spacestation14.io">
+    <BoxContainer Orientation="Vertical">
+        <LineEdit Name="SearchBar" PlaceHolder="{Loc 'admin-add-reagent-window-search-placeholder'}" HorizontalExpand="True"  Margin ="0 4"/>
+        <ItemList Name="ReagentList" SelectMode="Single" VerticalExpand="True"  Margin ="0 4"/>
+        <Button Name="ApplyButton" HorizontalExpand="True" Margin ="0 4" />
+        <Button Name="ResetButton" HorizontalExpand="True" Margin ="0 4" />
+    </BoxContainer>
+</DefaultWindow>
diff --git a/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml.cs b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml.cs
new file mode 100644
index 00000000000..3e854eedd00
--- /dev/null
+++ b/Content.Client/_NF/Chemistry/UI/ChangeReagentWhitelistWindow.xaml.cs
@@ -0,0 +1,134 @@
+using Content.Shared._NF.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._NF.Chemistry.UI;
+
+/// <summary>
+///     A window that allows you to change the whitelist of the associated injector
+/// </summary>
+[GenerateTypedNameReferences]
+public sealed partial class ChangeReagentWhitelistWindow : DefaultWindow
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+
+    private readonly EntityUid _injectorEntity;
+    private readonly ChangeReagentWhitelistBoundUserInterface _owner;
+    private ReagentPrototype? _selectedReagent;
+
+    public ChangeReagentWhitelistWindow(ChangeReagentWhitelistBoundUserInterface owner)
+    {
+        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+
+        _injectorEntity = owner.Owner;
+        _owner = owner;
+
+        Title = Loc.GetString("ui-change-reagent-whitelist-title");
+
+        ReagentList.OnItemSelected += ReagentListSelected;
+        ReagentList.OnItemDeselected += ReagentListDeselected;
+        SearchBar.OnTextChanged += (_) => UpdateReagentPrototypes(SearchBar.Text);
+        ApplyButton.OnPressed += ChangeWhitelistedReagent;
+        ResetButton.OnPressed += ResetWhitelistReagent;
+
+        ResetButton.Text = Loc.GetString("ui-change-reagent-whitelist-resetbutton-text");
+
+        UpdateReagentPrototypes();
+        UpdateApplyButton();
+    }
+
+
+    /// <summary>
+    ///     Reset the Entity's InjectorComponent's ReagentWhitelist to nullify the reagent whitelist
+    ///</summary>
+    private void ResetWhitelistReagent(BaseButton.ButtonEventArgs obj)
+    {
+        _owner.ResetReagentWhitelist();
+        _owner.Close();
+    }
+
+    /// <summary>
+    ///     Change the Entity's InjectorComponent's ReagentWhitelist to only include the selected reagent
+    /// </summary>
+    private void ChangeWhitelistedReagent(BaseButton.ButtonEventArgs obj)
+    {
+        if (_selectedReagent == null)
+            return;
+
+        _owner.ChangeReagentWhitelist(_selectedReagent.ID);
+        _owner.Close();
+    }
+
+    private void ReagentListSelected(ItemList.ItemListSelectedEventArgs obj)
+    {
+        _selectedReagent = (ReagentPrototype) obj.ItemList[obj.ItemIndex].Metadata!;
+        UpdateApplyButton();
+    }
+
+    private void ReagentListDeselected(ItemList.ItemListDeselectedEventArgs obj)
+    {
+        _selectedReagent = null;
+        UpdateApplyButton();
+    }
+
+    /// <summary>
+    ///     Set the Text and enabled/disabled status of the button that actually adds the reagent.
+    /// </summary>
+    private void UpdateApplyButton()
+    {
+        ApplyButton.Disabled = true;
+        if (_selectedReagent == null)
+        {
+            ApplyButton.Text = Loc.GetString("ui-change-reagent-whitelist-apply-missing-reagent");
+            return;
+        }
+
+        ApplyButton.Text = Loc.GetString("ui-change-reagent-whitelist-apply",
+            ("reagent", _selectedReagent.ID));
+        ApplyButton.Disabled = false;
+    }
+
+    /// <summary>
+    ///     Get a list of all applicable reagent prototypes and show them in an item list.
+    /// </summary>
+    private void UpdateReagentPrototypes(string? filter = null)
+    {
+        ReagentList.Clear();
+
+        List<string> allowedReagentGroups = new();
+        if (_entityManager.TryGetComponent<ReagentWhitelistChangeComponent>(_injectorEntity, out var reagentWhitelistChangeComp))
+        {
+            allowedReagentGroups = reagentWhitelistChangeComp.AllowedReagentGroups;
+        }
+
+
+        foreach (var reagent in _prototypeManager.EnumeratePrototypes<ReagentPrototype>())
+        {
+            if (!string.IsNullOrEmpty(filter) &&
+                !reagent.ID.ToLowerInvariant().Contains(filter.Trim().ToLowerInvariant()))
+            {
+                continue;
+            }
+
+            if (!allowedReagentGroups.Contains(reagent.Group))
+            {
+                continue;
+            }
+
+            ItemList.Item regentItem = new(ReagentList)
+            {
+                Metadata = reagent,
+                Text = reagent.ID
+            };
+
+            ReagentList.Add(regentItem);
+        }
+    }
+}
+
diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
index 6e88d6928e6..be3cb08f181 100644
--- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs
@@ -73,7 +73,7 @@ await server.WaitPost(() =>
         await server.WaitAssertion(() =>
         {
             var grid = entityManager.GetComponent<MapGridComponent>(gridId);
-            var solution = new Solution("Blood", FixedPoint2.New(100));
+            var solution = new Solution("Wine", FixedPoint2.New(100)); // Frontier - Blood to wine so test pass
             var tileRef = grid.GetTileRef(puddleOrigin);
 #pragma warning disable NUnit2045 // Interdependent tests
             Assert.That(puddleSystem.TrySpillAt(tileRef, solution, out _), Is.True);
diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
index 77c8620ea49..da820e44bd2 100644
--- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
@@ -330,8 +330,23 @@ private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamCompo
             return;
         }
 
+        // Frontier - Reagent Whitelist
+        var applicableTargetSolution = targetSolution.Comp.Solution;
+        // If a whitelist exists, remove all non-whitelisted reagents from the target solution temporarily
+        Solution temporarilyRemovedSolution = new();
+        if (injector.Comp.ReagentWhitelist is { } reagentWhitelist)
+        {
+            string[] reagentPrototypeWhitelistArray = new string[reagentWhitelist.Count];
+            for (var i = 0; i < reagentWhitelist.Count; ++i)
+            {
+                reagentPrototypeWhitelistArray[i] = reagentWhitelist[i];
+            }
+            temporarilyRemovedSolution = applicableTargetSolution.SplitSolutionWithout(applicableTargetSolution.Volume, reagentPrototypeWhitelistArray);
+        }
+        // Frontier - Reagent Whitelist
+
         // Get transfer amount. May be smaller than _transferAmount if not enough room, also make sure there's room in the injector
-        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.Volume,
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, applicableTargetSolution.Volume,
             solution.AvailableVolume);
 
         if (realTransferAmount <= 0)
@@ -353,6 +368,9 @@ private void TryDraw(Entity<InjectorComponent> injector, Entity<BloodstreamCompo
         // Move units from attackSolution to targetSolution
         var removedSolution = SolutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
 
+        // Add back non-whitelisted reagents to the target solution, Frontier - Reagent Whitelist
+        applicableTargetSolution.AddSolution(temporarilyRemovedSolution, null);
+
         if (!SolutionContainers.TryAddSolution(soln.Value, removedSolution))
         {
             return;
diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
index 04a08955a35..2b27a89d9db 100644
--- a/Content.Server/Explosion/Components/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -81,6 +81,13 @@ public sealed partial class ExplosiveComponent : Component
     [DataField("deleteAfterExplosion")]
     public bool? DeleteAfterExplosion;
 
+    /// <summary>
+    /// Whether to not set <see cref="Exploded"/> to true, allowing it to explode multiple times.
+    /// This should never be used if it is damageable.
+    /// </summary>
+    [DataField]
+    public bool Repeatable;
+
     /// <summary>
     ///     Avoid somehow double-triggering this explosion (e.g. by damaging this entity from its own explosion.
     /// </summary>
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
new file mode 100644
index 00000000000..cc08de53f90
--- /dev/null
+++ b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Explosion.Components;
+
+/// <summary>
+/// Constantly triggers after being added to an entity.
+/// </summary>
+[RegisterComponent, Access(typeof(TriggerSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : Component
+{
+    /// <summary>
+    /// How long to wait between triggers.
+    /// The first trigger starts this long after the component is added.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// When the next trigger will be.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextTrigger;
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 1f91b28ec2b..eb2cf9b6548 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -165,7 +165,7 @@ public void TriggerExplosive(EntityUid uid, ExplosiveComponent? explosive = null
         if (explosive.Exploded)
             return;
 
-        explosive.Exploded = true;
+        explosive.Exploded = !explosive.Repeatable;
 
         // Override the explosion intensity if optional arguments were provided.
         if (radius != null)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index eb5aeec8158..37c63438152 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -98,6 +98,7 @@ public override void Initialize()
             SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
+            SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
 
             SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(OnSpawnTrigger);
             SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
@@ -278,6 +279,11 @@ private void OnEmptyTriggered(EntityUid uid, TriggerWhenEmptyComponent component
             Trigger(uid, args.EmptyGun);
         }
 
+        private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+        {
+            ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        }
+
         public bool Trigger(EntityUid trigger, EntityUid? user = null)
         {
             var triggerEvent = new TriggerEvent(trigger, user);
@@ -360,6 +366,7 @@ public override void Update(float frameTime)
             UpdateProximity();
             UpdateTimer(frameTime);
             UpdateTimedCollide(frameTime);
+            UpdateRepeat();
         }
 
         private void UpdateTimer(float frameTime)
@@ -394,5 +401,19 @@ private void UpdateTimer(float frameTime)
                     _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
             }
         }
+
+        private void UpdateRepeat()
+        {
+            var now = _timing.CurTime;
+            var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+            while (query.MoveNext(out var uid, out var comp))
+            {
+                if (comp.NextTrigger > now)
+                    continue;
+
+                comp.NextTrigger = now + comp.Delay;
+                Trigger(uid);
+            }
+        }
     }
 }
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 145f95fc76d..ba4f7b3975f 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -20,6 +20,7 @@
 using Content.Shared.Popups;
 using Content.Shared.StationRecords;
 using Robust.Shared.Audio.Systems;
+using Content.Shared.GameTicking; // Frontier
 
 namespace Content.Server.MassMedia.Systems;
 
@@ -43,6 +44,8 @@ public override void Initialize()
         // News writer
         // Frontier: News is shared across the sector.  No need to create shuttle-local news caches.
         // SubscribeLocalEvent<NewsWriterComponent, MapInitEvent>(OnMapInit);
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
         // End Frontier
 
         // New writer bui messages
@@ -59,6 +62,14 @@ public override void Initialize()
         SubscribeLocalEvent<NewsReaderCartridgeComponent, CartridgeMessageEvent>(OnReaderUiMessage);
         SubscribeLocalEvent<NewsReaderCartridgeComponent, CartridgeUiReadyEvent>(OnReaderUiReady);
     }
+ 
+    // Frontier: article lifecycle management
+    private void OnRoundRestart(RoundRestartCleanupEvent ev)
+    {
+        // A new round is starting, clear any articles from the previous round.
+        SectorNewsComponent.Articles.Clear();
+    }
+    // End Frontier
 
     public override void Update(float frameTime)
     {
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index 5fe5fe1024b..16aaae9b45b 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -72,7 +72,6 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Maintenance",
         "Medical",
         "Mercenary", // Frontier
-        "Pilot", // Frontier
         //"Quartermaster",
         //"Research",
         //"ResearchDirector",
diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs
index 5a0fee31131..736d9e6ac6b 100644
--- a/Content.Shared/Access/Systems/AccessReaderSystem.cs
+++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs
@@ -164,7 +164,7 @@ public bool IsAllowed(
             return IsAllowedInternal(access, stationKeys, reader);
 
         if (!_containerSystem.TryGetContainer(target, reader.ContainerAccessProvider, out var container))
-            return false;
+            return Paused(target); // when mapping, containers with electronics arent spawned
 
         foreach (var entity in container.ContainedEntities)
         {
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 3e1ff4284c7..4e03176f16a 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Shared.Actions;
 using Content.Shared.Damage;
 using Content.Shared.Examine;
@@ -209,7 +209,7 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
             _fixtureSystem.TryCreateFixture(user,
                 component.Shape,
                 BlockingComponent.BlockFixtureID,
-                hard: true,
+                hard: false, // Frontier - True to false, mobs AI abuse.
                 collisionLayer: (int) CollisionGroup.WallLayer,
                 body: physicsComponent);
         }
diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs
index ee7f9bd5798..18b8ff37028 100644
--- a/Content.Shared/Chemistry/Components/InjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs
@@ -1,7 +1,9 @@
 using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.DoAfter;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Chemistry.Components;
@@ -81,6 +83,15 @@ public sealed partial class InjectorComponent : Component
     [AutoNetworkedField]
     [DataField]
     public InjectorToggleMode ToggleState = InjectorToggleMode.Draw;
+
+    // Frontier
+    /// <summary>
+    /// Reagents that are allowed to be within this injector.
+    /// If a solution has both allowed and non-allowed reagents, only allowed reagents will be drawn into this injector.
+    /// A null ReagentWhitelist indicates all reagents are allowed.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<ReagentPrototype>>? ReagentWhitelist = null;
 }
 
 /// <summary>
diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs
index 4de3c369f7c..148753efd25 100644
--- a/Content.Shared/Chemistry/Components/Solution.cs
+++ b/Content.Shared/Chemistry/Components/Solution.cs
@@ -580,7 +580,7 @@ public Solution SplitSolutionWithout(FixedPoint2 toTake, params string[] exclude
         }
 
         /// <summary>
-        /// Splits a solution without the specified reagent prototypes.
+        /// Splits a solution with only the specified reagent prototypes.
         /// </summary>
         public Solution SplitSolutionWithOnly(FixedPoint2 toTake, params string[] includedPrototypes)
         {
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
index 023d024a05b..0ae9ccb3ead 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Evaporation.cs
@@ -8,7 +8,18 @@ public abstract partial class SharedPuddleSystem
     [ValidatePrototypeId<ReagentPrototype>]
     private const string Water = "Water";
 
-    public static readonly string[] EvaporationReagents = [Water];
+    private const string FluorosulfuricAcid = "FluorosulfuricAcid"; // Frontier
+    private const string Vomit = "Vomit"; // Frontier
+    private const string InsectBlood = "InsectBlood"; // Frontier
+    private const string AmmoniaBlood = "AmmoniaBlood"; // Frontier
+    private const string ZombieBlood = "ZombieBlood"; // Frontier
+    private const string Blood = "Blood"; // Frontier
+    private const string Slime = "Slime"; // Frontier
+    private const string CopperBlood = "CopperBlood"; // Frontier
+    private const string Sap = "Sap"; // Frontier
+    private const string JuiceTomato = "JuiceTomato"; // Frontier
+
+    public static readonly string[] EvaporationReagents = [Water, Vomit, InsectBlood, AmmoniaBlood, ZombieBlood, Blood, Slime, CopperBlood, FluorosulfuricAcid, Sap, JuiceTomato]; // Frontier
 
     public bool CanFullyEvaporate(Solution solution)
     {
diff --git a/Content.Shared/Hands/Components/HandHelpers.cs b/Content.Shared/Hands/Components/HandHelpers.cs
index 11fff6d9c8a..aecf3a69369 100644
--- a/Content.Shared/Hands/Components/HandHelpers.cs
+++ b/Content.Shared/Hands/Components/HandHelpers.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared.Hands.EntitySystems;
 
 namespace Content.Shared.Hands.Components;
 
@@ -20,6 +21,15 @@ public static class HandHelpers
     /// </summary>
     public static int CountFreeHands(this HandsComponent component) => component.Hands.Values.Count(hand => hand.IsEmpty);
 
+    /// <summary>
+    ///     Get the number of hands that are not currently holding anything. This is a LinQ method, not a property, so
+    ///     cache it instead of accessing this multiple times.
+    /// </summary>
+    public static int CountFreeableHands(this Entity<HandsComponent> component, SharedHandsSystem system)
+    {
+        return system.CountFreeableHands(component);
+    }
+
     /// <summary>
     ///     Get a list of hands that are currently holding nothing. This is a LinQ method, not a property, so cache
     ///     it instead of accessing this multiple times.
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
index fd732009e9a..e48aafeab52 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs
@@ -5,7 +5,6 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.VirtualItem;
-using Content.Shared.Item;
 using Content.Shared.Storage.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
@@ -299,4 +298,16 @@ public bool TryGetHand(EntityUid handsUid, string handId, [NotNullWhen(true)] ou
 
         return hands.Hands.TryGetValue(handId, out hand);
     }
+
+    public int CountFreeableHands(Entity<HandsComponent> hands)
+    {
+        var freeable = 0;
+        foreach (var hand in hands.Comp.Hands.Values)
+        {
+            if (hand.IsEmpty || CanDropHeld(hands, hand))
+                freeable++;
+        }
+
+        return freeable;
+    }
 }
diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
index e45530e4582..b31cc755763 100644
--- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
+++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Interaction;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item;
+using Content.Shared.Popups;
 using Robust.Shared.Containers;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
@@ -29,6 +30,7 @@ public abstract class SharedVirtualItemSystem : EntitySystem
     [Dependency] private readonly SharedItemSystem _itemSystem = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
     [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
 
     [ValidatePrototypeId<EntityPrototype>]
     private const string VirtualItem = "VirtualItem";
@@ -71,23 +73,53 @@ private void OnBeforeRangedInteract(Entity<VirtualItemComponent> ent, ref Before
     }
 
     #region Hands
+
     /// <summary>
     /// Spawns a virtual item in a empty hand
     /// </summary>
     /// <param name="blockingEnt">The entity we will make a virtual entity copy of</param>
     /// <param name="user">The entity that we want to insert the virtual entity</param>
-    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user)
+    /// <param name="dropOthers">Whether or not to try and drop other items to make space</param>
+    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, bool dropOthers = false)
     {
-        return TrySpawnVirtualItemInHand(blockingEnt, user, out _);
+        return TrySpawnVirtualItemInHand(blockingEnt, user, out _, dropOthers);
     }
 
-    /// <inheritdoc cref="TrySpawnVirtualItemInHand(Robust.Shared.GameObjects.EntityUid,Robust.Shared.GameObjects.EntityUid)"/>
-    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem)
+    /// <inheritdoc cref="TrySpawnVirtualItemInHand(Robust.Shared.GameObjects.EntityUid,Robust.Shared.GameObjects.EntityUid,bool)"/>
+    public bool TrySpawnVirtualItemInHand(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem, bool dropOthers = false)
     {
-        if (!TrySpawnVirtualItem(blockingEnt, user, out virtualItem) || !_handsSystem.TryGetEmptyHand(user, out var hand))
+        virtualItem = null;
+        if (!_handsSystem.TryGetEmptyHand(user, out var empty))
+        {
+            if (!dropOthers)
+                return false;
+
+            foreach (var hand in _handsSystem.EnumerateHands(user))
+            {
+                if (hand.HeldEntity is not { } held)
+                    continue;
+
+                if (held == blockingEnt || HasComp<VirtualItemComponent>(held))
+                    continue;
+
+                if (!_handsSystem.TryDrop(user, hand))
+                    continue;
+
+                if (!TerminatingOrDeleted(held))
+                    _popup.PopupClient(Loc.GetString("virtual-item-dropped-other", ("dropped", held)), user, user);
+
+                empty = hand;
+                break;
+            }
+        }
+
+        if (empty == null)
+            return false;
+
+        if (!TrySpawnVirtualItem(blockingEnt, user, out virtualItem))
             return false;
 
-        _handsSystem.DoPickup(user, hand, virtualItem.Value);
+        _handsSystem.DoPickup(user, empty, virtualItem.Value);
         return true;
     }
 
@@ -120,6 +152,7 @@ public void DeleteInHandsMatching(EntityUid user, EntityUid matching)
     /// <param name="blockingEnt">The entity we will make a virtual entity copy of</param>
     /// <param name="user">The entity that we want to insert the virtual entity</param>
     /// <param name="slot">The slot to which we will insert the virtual entity (could be the "shoes" slot, for example)</param>
+    /// <param name="force">Whether or not to force an equip</param>
     public bool TrySpawnVirtualItemInInventory(EntityUid blockingEnt, EntityUid user, string slot, bool force = false)
     {
         return TrySpawnVirtualItemInInventory(blockingEnt, user, slot, force, out _);
@@ -140,6 +173,8 @@ public bool TrySpawnVirtualItemInInventory(EntityUid blockingEnt, EntityUid user
     /// that's done check if the found virtual entity is a copy of our matching entity,
     /// if it is, delete it
     /// </summary>
+    /// <param name="user">The entity that we want to delete the virtual entity from</param>
+    /// <param name="matching">The entity that made the virtual entity</param>
     /// <param name="slotName">Set this param if you have the name of the slot, it avoids unnecessary queries</param>
     public void DeleteInSlotMatching(EntityUid user, EntityUid matching, string? slotName = null)
     {
@@ -178,6 +213,7 @@ public void DeleteInSlotMatching(EntityUid user, EntityUid matching, string? slo
     /// </summary>
     /// <param name="blockingEnt">The entity we will make a virtual entity copy of</param>
     /// <param name="user">The entity that we want to insert the virtual entity</param>
+    /// <param name="virtualItem">The virtual item, if spawned</param>
     public bool TrySpawnVirtualItem(EntityUid blockingEnt, EntityUid user, [NotNullWhen(true)] out EntityUid? virtualItem)
     {
         if (_netManager.IsClient)
diff --git a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
index e1c6f8395d0..ff3db32fd6f 100644
--- a/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
+++ b/Content.Shared/Preferences/Loadouts/RoleLoadout.cs
@@ -74,12 +74,20 @@ public void EnsureValid(ICommonSession session, IDependencyCollection collection
             {
                 var loadout = loadouts[i];
 
+                // Old prototype or otherwise invalid.
                 if (!protoManager.TryIndex(loadout.Prototype, out var loadoutProto))
                 {
                     loadouts.RemoveAt(i);
                     continue;
                 }
 
+                // Malicious client maybe, check the group even has it.
+                if (!groupProto.Loadouts.Contains(loadout.Prototype))
+                {
+                    loadouts.RemoveAt(i);
+                    continue;
+                }
+
                 // Validate the loadout can be applied (e.g. points).
                 if (!IsValid(session, loadout.Prototype, collection, out _))
                 {
diff --git a/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
new file mode 100644
index 00000000000..112339efd74
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+/// <summary>
+/// Lets you shoot a gun using an action.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ActionGunSystem))]
+public sealed partial class ActionGunComponent : Component
+{
+    /// <summary>
+    /// Action to create, must use <see cref="ActionGunShootEvent"/>.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Action = string.Empty;
+
+    [DataField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Prototype of gun entity to spawn.
+    /// Deleted when this component is removed.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId GunProto = string.Empty;
+
+    [DataField]
+    public EntityUid? Gun;
+}
+
+/// <summary>
+/// Action event for <see cref="ActionGunComponent"/> to shoot at a position.
+/// </summary>
+public sealed partial class ActionGunShootEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
index 2ae71334b47..fa3732209f5 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs
@@ -6,8 +6,13 @@ namespace Content.Shared.Weapons.Ranged.Components;
 /// <summary>
 /// Indicates that this gun requires wielding to be useable.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(WieldableSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+[Access(typeof(WieldableSystem))]
 public sealed partial class GunRequiresWieldComponent : Component
 {
+    [DataField, AutoNetworkedField]
+    public TimeSpan LastPopup;
 
+    [DataField, AutoNetworkedField]
+    public TimeSpan PopupCooldown = TimeSpan.FromSeconds(1);
 }
diff --git a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
index ce96639e3c4..522319ccbd3 100644
--- a/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs
@@ -33,4 +33,7 @@ public sealed partial class GunWieldBonusComponent : Component
     /// </summary>
     [DataField, AutoNetworkedField]
     public Angle AngleIncrease = Angle.FromDegrees(0);
+
+    [DataField]
+    public LocId? WieldBonusExamineMessage = "gunwieldbonus-component-examine";
 }
diff --git a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
index 40925ad614c..d61862bf1a0 100644
--- a/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
+++ b/Content.Shared/Weapons/Ranged/Events/ShotAttemptedEvent.cs
@@ -1,3 +1,5 @@
+using Content.Shared.Weapons.Ranged.Components;
+
 namespace Content.Shared.Weapons.Ranged.Events;
 
 /// <summary>
@@ -15,7 +17,7 @@ public record struct ShotAttemptedEvent
     /// <summary>
     /// The gun being shot.
     /// </summary>
-    public EntityUid Used;
+    public Entity<GunComponent> Used;
 
     public bool Cancelled { get; private set; }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
new file mode 100644
index 00000000000..f3dfe8a2a03
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Systems;
+
+public sealed class ActionGunSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ActionGunComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ActionGunComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ActionGunComponent, ActionGunShootEvent>(OnShoot);
+    }
+
+    private void OnMapInit(Entity<ActionGunComponent> ent, ref MapInitEvent args)
+    {
+        if (string.IsNullOrEmpty(ent.Comp.Action))
+            return;
+
+        _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action);
+        ent.Comp.Gun = Spawn(ent.Comp.GunProto);
+    }
+
+    private void OnShutdown(Entity<ActionGunComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Gun is {} gun)
+            QueueDel(gun);
+    }
+
+    private void OnShoot(Entity<ActionGunComponent> ent, ref ActionGunShootEvent args)
+    {
+        if (TryComp<GunComponent>(ent.Comp.Gun, out var gun))
+            _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target);
+    }
+}
+
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
index c592a241419..eb597467fdc 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
@@ -239,7 +239,7 @@ private void AttemptShoot(EntityUid user, EntityUid gunUid, GunComponent gun)
         var prevention = new ShotAttemptedEvent
         {
             User = user,
-            Used = gunUid
+            Used = (gunUid, gun)
         };
         RaiseLocalEvent(gunUid, ref prevention);
         if (prevention.Cancelled)
diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs
index ba3f787a4bb..c09044f84b4 100644
--- a/Content.Shared/Wieldable/WieldableSystem.cs
+++ b/Content.Shared/Wieldable/WieldableSystem.cs
@@ -1,3 +1,4 @@
+using Content.Shared.Examine;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
@@ -15,7 +16,7 @@
 using Content.Shared.Weapons.Ranged.Systems;
 using Content.Shared.Wieldable.Components;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
+using Robust.Shared.Timing;
 
 namespace Content.Shared.Wieldable;
 
@@ -29,6 +30,7 @@ public sealed class WieldableSystem : EntitySystem
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly UseDelaySystem _delay = default!;
     [Dependency] private readonly SharedGunSystem _gun = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
 
     public override void Initialize()
     {
@@ -39,12 +41,14 @@ public override void Initialize()
         SubscribeLocalEvent<WieldableComponent, GotUnequippedHandEvent>(OnItemLeaveHand);
         SubscribeLocalEvent<WieldableComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
         SubscribeLocalEvent<WieldableComponent, GetVerbsEvent<InteractionVerb>>(AddToggleWieldVerb);
+        SubscribeLocalEvent<WieldableComponent, HandDeselectedEvent>(OnDeselectWieldable);
 
         SubscribeLocalEvent<MeleeRequiresWieldComponent, AttemptMeleeEvent>(OnMeleeAttempt);
-        SubscribeLocalEvent<GunRequiresWieldComponent, AttemptShootEvent>(OnShootAttempt);
+        SubscribeLocalEvent<GunRequiresWieldComponent, ShotAttemptedEvent>(OnShootAttempt);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemWieldedEvent>(OnGunWielded);
         SubscribeLocalEvent<GunWieldBonusComponent, ItemUnwieldedEvent>(OnGunUnwielded);
         SubscribeLocalEvent<GunWieldBonusComponent, GunRefreshModifiersEvent>(OnGunRefreshModifiers);
+        SubscribeLocalEvent<GunWieldBonusComponent, ExaminedEvent>(OnExamine);
 
         SubscribeLocalEvent<IncreaseDamageOnWieldComponent, GetMeleeDamageEvent>(OnGetMeleeDamage);
     }
@@ -59,16 +63,21 @@ private void OnMeleeAttempt(EntityUid uid, MeleeRequiresWieldComponent component
         }
     }
 
-    private void OnShootAttempt(EntityUid uid, GunRequiresWieldComponent component, ref AttemptShootEvent args)
+    private void OnShootAttempt(EntityUid uid, GunRequiresWieldComponent component, ref ShotAttemptedEvent args)
     {
         if (TryComp<WieldableComponent>(uid, out var wieldable) &&
             !wieldable.Wielded)
         {
-            args.Cancelled = true;
+            args.Cancel();
 
-            if (!HasComp<MeleeWeaponComponent>(uid) && !HasComp<MeleeRequiresWieldComponent>(uid))
+            var time = _timing.CurTime;
+            if (time > component.LastPopup + component.PopupCooldown &&
+                !HasComp<MeleeWeaponComponent>(uid) &&
+                !HasComp<MeleeRequiresWieldComponent>(uid))
             {
-                args.Message = Loc.GetString("wieldable-component-requires", ("item", uid));
+                component.LastPopup = time;
+                var message = Loc.GetString("wieldable-component-requires", ("item", uid));
+                _popupSystem.PopupClient(message, args.Used, args.User);
             }
         }
     }
@@ -83,6 +92,14 @@ private void OnGunWielded(EntityUid uid, GunWieldBonusComponent component, ref I
         _gun.RefreshModifiers(uid);
     }
 
+    private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, HandDeselectedEvent args)
+    {
+        if (!component.Wielded)
+            return;
+
+        TryUnwield(uid, component, args.User);
+    }
+
     private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref GunRefreshModifiersEvent args)
     {
         if (TryComp(bonus, out WieldableComponent? wield) &&
@@ -95,6 +112,12 @@ private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref Gun
         }
     }
 
+    private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args)
+    {
+        if (component.WieldBonusExamineMessage != null)
+            args.PushText(Loc.GetString(component.WieldBonusExamineMessage));
+    }
+
     private void AddToggleWieldVerb(EntityUid uid, WieldableComponent component, GetVerbsEvent<InteractionVerb> args)
     {
         if (args.Hands == null || !args.CanAccess || !args.CanInteract)
@@ -147,7 +170,7 @@ public bool CanWield(EntityUid uid, WieldableComponent component, EntityUid user
             return false;
         }
 
-        if (hands.CountFreeHands() < component.FreeHandsRequired)
+        if (_handsSystem.CountFreeableHands((user, hands)) < component.FreeHandsRequired)
         {
             if (!quiet)
             {
@@ -188,9 +211,21 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
         if (component.WieldSound != null)
             _audioSystem.PlayPredicted(component.WieldSound, used, user);
 
+        var virtuals = new List<EntityUid>();
         for (var i = 0; i < component.FreeHandsRequired; i++)
         {
-            _virtualItemSystem.TrySpawnVirtualItemInHand(used, user);
+            if (_virtualItemSystem.TrySpawnVirtualItemInHand(used, user, out var virtualItem, true))
+            {
+                virtuals.Add(virtualItem.Value);
+                continue;
+            }
+
+            foreach (var existingVirtual in virtuals)
+            {
+                QueueDel(existingVirtual);
+            }
+
+            return false;
         }
 
         if (TryComp(used, out UseDelayComponent? useDelay)
diff --git a/Content.Shared/_NF/CCVars/CCVars.cs b/Content.Shared/_NF/CCVars/CCVars.cs
index f48a19a19f9..c80aece5446 100644
--- a/Content.Shared/_NF/CCVars/CCVars.cs
+++ b/Content.Shared/_NF/CCVars/CCVars.cs
@@ -27,7 +27,7 @@ public sealed class NF14CVars
     /// The time in seconds after which a cryosleeping body is considered expired and can be deleted from the storage map.
     /// </summary>
     public static readonly CVarDef<float> CryoExpirationTime =
-        CVarDef.Create("nf14.uncryo.maxtime", 60 * 60f, CVar.SERVER | CVar.REPLICATED);
+        CVarDef.Create("nf14.uncryo.maxtime", 180 * 60f, CVar.SERVER | CVar.REPLICATED);
 
     /*
      *  Public Transit
diff --git a/Content.Shared/_NF/Chemistry/Components/ReagentWhitelistChangeComponent.cs b/Content.Shared/_NF/Chemistry/Components/ReagentWhitelistChangeComponent.cs
new file mode 100644
index 00000000000..74dd4310172
--- /dev/null
+++ b/Content.Shared/_NF/Chemistry/Components/ReagentWhitelistChangeComponent.cs
@@ -0,0 +1,18 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Chemistry.Components;
+
+/// <summary>
+///     Gives click behavior for changing injector reagent whitelist.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class ReagentWhitelistChangeComponent : Component
+{
+    /// <summary>
+    ///     The type of reagents allowed to be selected to change the reagent whitelist
+    /// </summary>
+    [DataField("allowedReagentGroup")]
+    [AutoNetworkedField]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public List<string> AllowedReagentGroups = new();
+}
diff --git a/Content.Shared/_NF/Chemistry/EntitySystems/ChangeReagentWhitelistSystem.cs b/Content.Shared/_NF/Chemistry/EntitySystems/ChangeReagentWhitelistSystem.cs
new file mode 100644
index 00000000000..3cf094867d4
--- /dev/null
+++ b/Content.Shared/_NF/Chemistry/EntitySystems/ChangeReagentWhitelistSystem.cs
@@ -0,0 +1,87 @@
+
+using Content.Shared._NF.Chemistry.Components;
+using Content.Shared._NF.Chemistry.Events;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Verbs;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+
+namespace Content.Shared._NF.Chemistry.EntitySystems;
+
+/// <summary>
+///     Allows an entity to change an injector component's whitelist via a UI box
+/// </summary>
+public sealed class ReagentWhitelistChangeSystem : EntitySystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    [NetSerializable, Serializable]
+    public enum ReagentWhitelistChangeUIKey : byte
+    {
+        Key
+    }
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ReagentWhitelistChangeComponent, GetVerbsEvent<InteractionVerb>>(AddChangeFilterVerb);
+        SubscribeLocalEvent<ReagentWhitelistChangeComponent, ReagentWhitelistChangeMessage>(OnReagentWhitelistChange);
+        SubscribeLocalEvent<ReagentWhitelistChangeComponent, ReagentWhitelistResetMessage>(OnReagentWhitelistReset);
+    }
+
+    private void AddChangeFilterVerb(Entity<ReagentWhitelistChangeComponent> ent, ref GetVerbsEvent<InteractionVerb> args)
+    {
+        var (uid, comp) = ent;
+
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null)
+            return;
+        var @event = args;
+        args.Verbs.Add(new InteractionVerb()
+        {
+            Text = Loc.GetString("comp-change-reagent-whitelist-verb-filter"),
+            //Icon = new SpriteSpecifier(),
+            Act = () =>
+            {
+                _ui.OpenUi(uid, ReagentWhitelistChangeUIKey.Key, @event.User);
+            },
+            Priority = 1
+        });
+    }
+
+    private void OnReagentWhitelistChange(Entity<ReagentWhitelistChangeComponent> ent, ref ReagentWhitelistChangeMessage args)
+    {
+        if (!TryComp<InjectorComponent>(ent.Owner, out var injectorComp))
+        {
+            return;
+        }
+
+        if (!_prototypeManager.TryIndex(args.NewReagentProto, out var protoComp))
+        {
+            return;
+        }
+
+        if (!ent.Comp.AllowedReagentGroups.Contains(protoComp.Group))
+        {
+            return;
+        }
+
+        if (injectorComp.ReagentWhitelist is null)
+        {
+            injectorComp.ReagentWhitelist = new();
+        }
+        injectorComp.ReagentWhitelist.Clear();
+        injectorComp.ReagentWhitelist.Add(args.NewReagentProto);
+    }
+
+    private void OnReagentWhitelistReset(Entity<ReagentWhitelistChangeComponent> ent, ref ReagentWhitelistResetMessage args)
+    {
+        if (!TryComp<InjectorComponent>(ent.Owner, out var injectorComp))
+        {
+            return;
+        }
+
+        injectorComp.ReagentWhitelist = null;
+    }
+}
diff --git a/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistChangeMessage.cs b/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistChangeMessage.cs
new file mode 100644
index 00000000000..e32782fc37d
--- /dev/null
+++ b/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistChangeMessage.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NF.Chemistry.Events;
+
+
+/// <summary>
+///     Sends a message to change the associated injector component's ReagentWhitelist to the newReagent
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ReagentWhitelistChangeMessage : BoundUserInterfaceMessage
+{
+    public ProtoId<ReagentPrototype> NewReagentProto;
+
+    public ReagentWhitelistChangeMessage(ProtoId<ReagentPrototype> newReagentProto)
+    {
+        NewReagentProto = newReagentProto;
+    }
+}
diff --git a/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistResetMessage.cs b/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistResetMessage.cs
new file mode 100644
index 00000000000..f6af2a4dadf
--- /dev/null
+++ b/Content.Shared/_NF/Chemistry/Events/SharedReagentWhitelistResetMessage.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._NF.Chemistry.Events;
+
+
+/// <summary>
+///     Sends a message to change the associated injector component's ReagentWhitelist to the newReagent
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class ReagentWhitelistResetMessage : BoundUserInterfaceMessage
+{
+    public ReagentWhitelistResetMessage()
+    {
+
+    }
+}
diff --git a/Resources/Audio/_NF/Jukebox/attributions.yml b/Resources/Audio/_NF/Jukebox/attributions.yml
new file mode 100644
index 00000000000..92e453f3ef3
--- /dev/null
+++ b/Resources/Audio/_NF/Jukebox/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["lateraligator.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Later Alligator By Silverman Sound Studios. Converted to mono ogg"
+  source: "https://soundcloud.com/silvermansound/later-alligator"
diff --git a/Resources/Audio/_NF/Jukebox/lateraligator.ogg b/Resources/Audio/_NF/Jukebox/lateraligator.ogg
new file mode 100644
index 00000000000..e4186cccdf9
Binary files /dev/null and b/Resources/Audio/_NF/Jukebox/lateraligator.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index c410cbe43e2..068b32bcd15 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -4680,3 +4680,110 @@ Entries:
       message: Fixed Clippy not hearing Service Radio
   id: 4993
   time: '2024-05-26T14:18:25.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Tweak
+      message: Ships can only hire contractors, pilots, and mercs now.
+  id: 4994
+  time: '2024-05-28T15:26:52.0000000+00:00'
+- author: UncaughtEx
+  changes:
+    - type: Add
+      message: >-
+        Introducing from SBI, with Blueprints graciously supplied by the NT
+        archives, the Crown, for all your Civilian Templar oriented needs!
+  id: 4995
+  time: '2024-05-29T06:42:09.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        News articles published in prior rounds no longer show up in later
+        rounds.
+  id: 4996
+  time: '2024-05-30T20:13:16.0000000+00:00'
+- author: UncaughtEx
+  changes:
+    - type: Remove
+      message: >-
+        NT has decided to rescind its License for the Helix Blueprint from the
+        Frontier.
+  id: 4997
+  time: '2024-05-31T11:11:02.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Added more selections to loadouts options! make sure to pick new items!
+  id: 4998
+  time: '2024-06-01T12:46:43.0000000+00:00'
+- author: Katarn1933
+  changes:
+    - type: Add
+      message: New swampy tune for jukebox
+  id: 4999
+  time: '2024-06-01T13:03:59.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added new messenger bags: arcadia, chaplain, chief engineer, contractor,
+        SR, security, black, blue, green, orange, red, purple, brown, light
+        brown, white. Most of new messenger bags available through loadouts.
+    - type: Tweak
+      message: >-
+        Resprited some messenger bags a bit (engineering, janitor, cultist, both
+        NFSD).
+  id: 5000
+  time: '2024-06-01T14:44:45.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: >-
+        Mail RPDS, N2554 Pattern Repeater and BB gun no longer turn invisible if
+        wielded or put in suit storage slot.
+  id: 5001
+  time: '2024-06-01T15:17:54.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: >-
+        Silver Industries has released the argenti 2.0 with improved chamber and
+        shooting speed.
+  id: 5002
+  time: '2024-06-01T16:30:25.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: >-
+        NT Found there is too much fiber and plastic in all employees blood,
+        making gloves use less fiber, but now they also allow your fingerprints
+        to mark stuff you interact with, some illegal gloves possibly kept the
+        old fibers quality.
+  id: 5003
+  time: '2024-06-02T20:33:51.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Pirate Cove got new equipment shipment.
+  id: 5004
+  time: '2024-06-03T01:05:56.0000000+00:00'
+- author: arimah
+  changes:
+    - type: Tweak
+      message: >-
+        The Ceres is no longer under NanoTrasen branding: look for SBB Ceres
+        instead.
+  id: 5005
+  time: '2024-06-03T18:42:27.0000000+00:00'
+- author: Myzumi
+  changes:
+    - type: Add
+      message: Added Admeme Hand teleporter
+  id: 5006
+  time: '2024-06-04T14:02:24.0000000+00:00'
+- author: Myzumi
+  changes:
+    - type: Fix
+      message: Admeme Teleporter hotfix
+  id: 5007
+  time: '2024-06-04T15:26:13.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/chemicals/ui/change-reagent-whitelist.ftl b/Resources/Locale/en-US/_NF/chemicals/ui/change-reagent-whitelist.ftl
new file mode 100644
index 00000000000..ac91892e31b
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/chemicals/ui/change-reagent-whitelist.ftl
@@ -0,0 +1,17 @@
+### Loc for change reagent whitelist bui
+
+## Title
+
+ui-change-reagent-whitelist-title = Reagent Filter
+
+## Text for the apply button when there is a selected reagent
+
+ui-change-reagent-whitelist-apply = Only Draw {$reagent}
+
+## Text for the apply button when there is no selected reagent
+
+ui-change-reagent-whitelist-apply-missing-reagent = Select a Reagent
+
+## Text for the reset button
+
+ui-change-reagent-whitelist-resetbutton-text = Reset Reagent
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
index 8dfafe82a29..f6e62550a42 100644
--- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -3,6 +3,7 @@ guide-entry-bank = NT Galactic Bank
 guide-entry-shipyard = Shipyard
 guide-entry-shipyard-ambition = Ambition
 guide-entry-shipyard-brigand = Brigand
+guide-entry-shipyard-ceres = Ceres
 guide-entry-shipyard-gasbender = Gasbender
 guide-entry-shipyard-harbormaster = Harbormaster
 guide-entry-shipyard-kilderkin = Kilderkin
diff --git a/Resources/Locale/en-US/_NF/paper/paper-misc.ftl b/Resources/Locale/en-US/_NF/paper/paper-misc.ftl
new file mode 100644
index 00000000000..844d3e9b40b
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/paper/paper-misc.ftl
@@ -0,0 +1 @@
+book-text-pirate-scribbles = Clarpy was drinking all the soda again, dont forget to refill the machine.
diff --git a/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
index b2e2b077145..79a9a45c33a 100644
--- a/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/_NF/preferences/loadout-groups.ftl
@@ -14,12 +14,6 @@ loadout-group-contractor-face = mask
 loadout-group-contractor-utility = tools
 loadout-group-contractor-fun = fun
 loadout-group-contractor-trinkets = trinkets
-# Security
-
-loadout-group-security-guard-jumpsuit = head
-loadout-group-security-guard-jumpsuit = jumpsuit
-loadout-group-security-guard-gloves = gloves
-loadout-group-security-guard-head = head
-loadout-group-security-guard-outerclothing = outer clothing
-loadout-group-security-guard-shoes = shoes
-loadout-group-security-guard-id = ID
+loadout-group-contractor-survival-box = survival box
+loadout-group-contractor-encryption-key = encryption keys
+loadout-group-contractor-implanter = implanters
\ No newline at end of file
diff --git a/Resources/Locale/en-US/chemistry/components/change-reagent-whitelist-component.ftl b/Resources/Locale/en-US/chemistry/components/change-reagent-whitelist-component.ftl
new file mode 100644
index 00000000000..953709b164d
--- /dev/null
+++ b/Resources/Locale/en-US/chemistry/components/change-reagent-whitelist-component.ftl
@@ -0,0 +1,3 @@
+### Change Reagent Whitelist component
+
+comp-change-reagent-whitelist-verb-filter = Set Reagent Filter
diff --git a/Resources/Locale/en-US/virtual/virtual-item.ftl b/Resources/Locale/en-US/virtual/virtual-item.ftl
new file mode 100644
index 00000000000..cb91f24cf7c
--- /dev/null
+++ b/Resources/Locale/en-US/virtual/virtual-item.ftl
@@ -0,0 +1 @@
+virtual-item-dropped-other = You dropped {THE($dropped)}!
diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
index 91eee8c2eaf..84b58224a77 100644
--- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl
@@ -1,4 +1,4 @@
-### Locale for wielding items; i.e. two-handing them
+### Locale for wielding items; i.e. two-handing them
 
 wieldable-verb-text-wield = Wield
 wieldable-verb-text-unwield = Unwield
@@ -17,3 +17,4 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand
 
 wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded!
 
+gunwieldbonus-component-examine = This weapon has improved accuracy when wielded.
diff --git a/Resources/Maps/_NF/Bluespace/DataCarrier.yml b/Resources/Maps/_NF/Bluespace/datacarrier.yml
similarity index 58%
rename from Resources/Maps/_NF/Bluespace/DataCarrier.yml
rename to Resources/Maps/_NF/Bluespace/datacarrier.yml
index 07f55f5afa7..42037823d27 100644
--- a/Resources/Maps/_NF/Bluespace/DataCarrier.yml
+++ b/Resources/Maps/_NF/Bluespace/datacarrier.yml
@@ -24,12 +24,13 @@ entities:
   entities:
   - uid: 1
     components:
-    - name: Unknown Ship
-      type: MetaData
-    - pos: -0.984375,22.872152
+    - type: MetaData
+      name: Unknown Ship
+    - type: Transform
+      pos: -0.984375,22.872152
       parent: invalid
-      type: Transform
-    - chunks:
+    - type: MapGrid
+      chunks:
         0,0:
           ind: 0,0
           tiles: HAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -68,7 +69,7 @@ entities:
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAAAAAAVQAAAAAAXQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAcgAAAAAAHQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-3:
           ind: -1,-3
@@ -86,31 +87,31 @@ entities:
           ind: 0,1
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
         - node:
             color: '#141414FF'
             id: BrickTileWhiteCornerNe
           decals:
-            300: 0,-2
+            274: 0,-2
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteCornerNe
@@ -120,16 +121,16 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNe
           decals:
-            239: 6,-16
-            247: 9,-17
-            248: 14,-18
-            249: 14,-22
-            254: 6,-19
+            232: 6,-16
+            240: 9,-17
+            241: 14,-18
+            242: 14,-22
+            247: 6,-19
         - node:
             color: '#141414FF'
             id: BrickTileWhiteCornerNw
           decals:
-            301: -1,-2
+            275: -1,-2
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteCornerNw
@@ -139,15 +140,15 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerNw
           decals:
-            236: 2,-16
-            245: 11,-18
-            246: 11,-22
-            253: 2,-19
+            231: 2,-16
+            238: 11,-18
+            239: 11,-22
+            246: 2,-19
         - node:
             color: '#141414FF'
             id: BrickTileWhiteCornerSe
           decals:
-            302: 0,-8
+            276: 0,-8
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteCornerSe
@@ -157,16 +158,16 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSe
           decals:
-            240: 6,-17
-            241: 6,-24
-            242: 9,-24
-            243: 14,-23
-            244: 14,-19
+            233: 6,-17
+            234: 6,-24
+            235: 9,-24
+            236: 14,-23
+            237: 14,-19
         - node:
             color: '#141414FF'
             id: BrickTileWhiteCornerSw
           decals:
-            303: -1,-8
+            277: -1,-8
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteCornerSw
@@ -176,16 +177,16 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteCornerSw
           decals:
-            235: 2,-17
-            250: 11,-19
-            251: 11,-23
-            252: 8,-24
-            255: 2,-24
+            230: 2,-17
+            243: 11,-19
+            244: 11,-23
+            245: 8,-24
+            248: 2,-24
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteEndN
           decals:
-            261: 8,-16
+            254: 8,-16
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteInnerNe
@@ -197,7 +198,7 @@ entities:
             color: '#DE3A3A96'
             id: BrickTileWhiteInnerNe
           decals:
-            262: 8,-17
+            255: 8,-17
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteInnerNw
@@ -223,11 +224,11 @@ entities:
             color: '#141414FF'
             id: BrickTileWhiteLineE
           decals:
-            304: 0,-7
-            305: 0,-6
-            306: 0,-5
-            307: 0,-4
-            308: 0,-3
+            278: 0,-7
+            279: 0,-6
+            280: 0,-5
+            281: 0,-4
+            282: 0,-3
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteLineE
@@ -244,26 +245,26 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineE
           decals:
-            159: -8,-6
-            160: -8,-7
-            169: 8,-8
-            170: 8,-12
-            171: 8,-13
-            172: 8,-14
+            157: -8,-6
+            158: -8,-7
+            167: 8,-8
+            168: 8,-12
+            169: 8,-13
+            170: 8,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineE
           decals:
-            226: 6,-20
-            227: 6,-21
-            228: 6,-22
-            229: 9,-21
-            230: 9,-20
-            231: 9,-18
-            256: 6,-23
-            257: 9,-23
-            258: 9,-22
-            259: 9,-19
+            221: 6,-20
+            222: 6,-21
+            223: 6,-22
+            224: 9,-21
+            225: 9,-20
+            226: 9,-18
+            249: 6,-23
+            250: 9,-23
+            251: 9,-22
+            252: 9,-19
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteLineN
@@ -303,28 +304,28 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineN
           decals:
-            163: -7,-8
-            164: -6,-8
-            165: -5,-8
-            166: 4,-8
-            167: 5,-8
-            168: 6,-8
-            191: -2,-10
-            192: 1,-10
+            161: -7,-8
+            162: -6,-8
+            163: -5,-8
+            164: 4,-8
+            165: 5,-8
+            166: 6,-8
+            189: -2,-10
+            190: 1,-10
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineN
           decals:
-            197: 3,-19
-            198: 4,-19
-            199: 5,-19
-            201: 12,-18
-            202: 13,-18
-            204: 13,-22
-            205: 12,-22
-            206: 3,-16
-            207: 4,-16
-            208: 5,-16
+            194: 3,-19
+            195: 4,-19
+            196: 5,-19
+            197: 12,-18
+            198: 13,-18
+            199: 13,-22
+            200: 12,-22
+            201: 3,-16
+            202: 4,-16
+            203: 5,-16
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteLineS
@@ -362,43 +363,43 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineS
           decals:
-            177: -8,-14
-            178: -7,-14
-            179: -6,-14
-            180: -5,-14
-            181: -4,-14
-            182: -3,-14
-            183: -2,-14
-            184: 1,-14
-            185: 2,-14
-            186: 3,-14
-            187: 4,-14
-            188: 5,-14
-            189: 6,-14
-            190: 7,-14
+            175: -8,-14
+            176: -7,-14
+            177: -6,-14
+            178: -5,-14
+            179: -4,-14
+            180: -3,-14
+            181: -2,-14
+            182: 1,-14
+            183: 2,-14
+            184: 3,-14
+            185: 4,-14
+            186: 5,-14
+            187: 6,-14
+            188: 7,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
           decals:
-            209: 3,-24
-            210: 4,-24
-            211: 5,-24
-            212: 12,-23
-            213: 13,-23
-            214: 12,-19
-            215: 13,-19
-            232: 3,-17
-            233: 4,-17
-            234: 5,-17
+            204: 3,-24
+            205: 4,-24
+            206: 5,-24
+            207: 12,-23
+            208: 13,-23
+            209: 12,-19
+            210: 13,-19
+            227: 3,-17
+            228: 4,-17
+            229: 5,-17
         - node:
             color: '#141414FF'
             id: BrickTileWhiteLineW
           decals:
-            309: -1,-3
-            310: -1,-4
-            311: -1,-5
-            312: -1,-6
-            313: -1,-7
+            283: -1,-3
+            284: -1,-4
+            285: -1,-5
+            286: -1,-6
+            287: -1,-7
         - node:
             color: '#1E1E1EFF'
             id: BrickTileWhiteLineW
@@ -417,155 +418,155 @@ entities:
             color: '#A4610696'
             id: BrickTileWhiteLineW
           decals:
-            161: 7,-6
-            162: 7,-7
-            173: -9,-8
-            174: -9,-12
-            175: -9,-13
-            176: -9,-14
+            159: 7,-6
+            160: 7,-7
+            171: -9,-8
+            172: -9,-12
+            173: -9,-13
+            174: -9,-14
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineW
           decals:
-            216: 2,-20
-            217: 2,-21
-            218: 2,-22
-            219: 2,-23
-            220: 8,-17
-            221: 8,-18
-            222: 8,-19
-            223: 8,-20
-            224: 8,-21
-            225: 8,-22
-            260: 8,-23
+            211: 2,-20
+            212: 2,-21
+            213: 2,-22
+            214: 2,-23
+            215: 8,-17
+            216: 8,-18
+            217: 8,-19
+            218: 8,-20
+            219: 8,-21
+            220: 8,-22
+            253: 8,-23
         - node:
             color: '#141414FF'
             id: ConcreteTrimInnerNe
           decals:
-            363: -19,-11
-            391: 11,-11
+            333: -19,-11
+            361: 11,-11
         - node:
             color: '#141414FF'
             id: ConcreteTrimInnerNw
           decals:
-            362: -13,-11
-            390: 18,-11
+            332: -13,-11
+            360: 18,-11
         - node:
             color: '#141414FF'
             id: ConcreteTrimInnerSe
           decals:
-            360: -19,-9
-            389: 11,-9
+            330: -19,-9
+            359: 11,-9
         - node:
             color: '#141414FF'
             id: ConcreteTrimInnerSw
           decals:
-            361: -13,-9
-            388: 18,-9
+            331: -13,-9
+            358: 18,-9
         - node:
             color: '#141414FF'
             id: ConcreteTrimLineE
           decals:
-            358: -19,-10
-            387: 11,-10
+            328: -19,-10
+            357: 11,-10
         - node:
             color: '#141414FF'
             id: ConcreteTrimLineN
           decals:
-            364: -18,-11
-            365: -17,-11
-            366: -16,-11
-            367: -15,-11
-            368: -14,-11
-            381: 12,-11
-            382: 13,-11
-            383: 14,-11
-            384: 15,-11
-            385: 16,-11
-            386: 17,-11
+            334: -18,-11
+            335: -17,-11
+            336: -16,-11
+            337: -15,-11
+            338: -14,-11
+            351: 12,-11
+            352: 13,-11
+            353: 14,-11
+            354: 15,-11
+            355: 16,-11
+            356: 17,-11
         - node:
             color: '#141414FF'
             id: ConcreteTrimLineS
           decals:
-            369: -18,-9
-            370: -17,-9
-            371: -16,-9
-            372: -14,-9
-            373: -15,-9
-            374: 12,-9
-            375: 13,-9
-            376: 14,-9
-            377: 15,-9
-            378: 16,-9
-            379: 17,-9
+            339: -18,-9
+            340: -17,-9
+            341: -16,-9
+            342: -14,-9
+            343: -15,-9
+            344: 12,-9
+            345: 13,-9
+            346: 14,-9
+            347: 15,-9
+            348: 16,-9
+            349: 17,-9
         - node:
             color: '#141414FF'
             id: ConcreteTrimLineW
           decals:
-            359: -13,-10
-            380: 18,-10
+            329: -13,-10
+            350: 18,-10
         - node:
             color: '#82141493'
             id: FullTileOverlayGreyscale
           decals:
-            286: -1,-8
-            287: 0,-8
-            288: 0,-7
-            289: -1,-7
-            290: -1,-6
-            291: 0,-6
-            292: 0,-5
-            293: -1,-5
-            294: -1,-4
-            295: 0,-4
-            296: 0,-3
-            297: -1,-3
-            298: -1,-2
-            299: 0,-2
+            260: -1,-8
+            261: 0,-8
+            262: 0,-7
+            263: -1,-7
+            264: -1,-6
+            265: 0,-6
+            266: 0,-5
+            267: -1,-5
+            268: -1,-4
+            269: 0,-4
+            270: 0,-3
+            271: -1,-3
+            272: -1,-2
+            273: 0,-2
         - node:
             color: '#821414FF'
             id: FullTileOverlayGreyscale
           decals:
-            315: -18,-10
-            316: -17,-10
-            317: -16,-10
-            318: -15,-10
-            319: -14,-10
-            322: -18,-27
-            323: -17,-27
-            324: -16,-27
-            325: -15,-27
-            326: -14,-27
-            327: -13,-27
-            328: -12,-27
-            329: -11,-27
-            330: -10,-27
-            331: -9,-27
-            332: -8,-27
-            333: -7,-27
-            334: -6,-27
-            335: -5,-27
-            336: -1,-31
-            337: 0,-31
-            338: 4,-27
-            339: 5,-27
-            340: 7,-27
-            341: 6,-27
-            342: 8,-27
-            343: 9,-27
-            344: 10,-27
-            345: 11,-27
-            346: 12,-27
-            347: 16,-27
-            348: 15,-27
-            349: 14,-27
-            350: 13,-27
-            351: 17,-10
-            352: 16,-10
-            353: 15,-10
-            354: 14,-10
-            355: 13,-10
-            356: 12,-10
+            288: -18,-10
+            289: -17,-10
+            290: -16,-10
+            291: -15,-10
+            292: -14,-10
+            293: -18,-27
+            294: -17,-27
+            295: -16,-27
+            296: -15,-27
+            297: -14,-27
+            298: -13,-27
+            299: -12,-27
+            300: -11,-27
+            301: -10,-27
+            302: -9,-27
+            303: -8,-27
+            304: -7,-27
+            305: -6,-27
+            306: -5,-27
+            307: -1,-31
+            308: 0,-31
+            309: 4,-27
+            310: 5,-27
+            311: 7,-27
+            312: 6,-27
+            313: 8,-27
+            314: 9,-27
+            315: 10,-27
+            316: 11,-27
+            317: 12,-27
+            318: 16,-27
+            319: 15,-27
+            320: 14,-27
+            321: 13,-27
+            322: 17,-10
+            323: 16,-10
+            324: 15,-10
+            325: 14,-10
+            326: 13,-10
+            327: 12,-10
         - node:
             color: '#5D0000FF'
             id: MiniTileOverlay
@@ -621,22 +622,22 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            263: 16,-18
+            256: 16,-18
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            264: 15,-18
+            257: 15,-18
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            266: 16,-19
+            259: 16,-19
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            265: 15,-19
+            258: 15,-19
         - node:
             color: '#A4610696'
             id: tile_diagonal
@@ -653,8 +654,8 @@ entities:
             148: 3,-9
             149: 2,-10
             150: 4,-8
-            193: 2,-10
-            194: 7,-8
+            191: 2,-10
+            192: 7,-8
         - node:
             color: '#A4610696'
             id: tile_diagonal_corner_90
@@ -663,232 +664,206 @@ entities:
             152: -3,-10
             153: -5,-8
             154: 7,-7
-            195: -8,-8
+            193: -8,-8
         - node:
             color: '#A4610696'
             id: tile_diagonal_flipped
           decals:
             145: -9,-7
             146: -8,-6
-            156: 2,-9
-            157: 3,-8
-      type: DecalGrid
-    - version: 2
+            155: 2,-9
+            156: 3,-8
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
           0,0:
-            0: 65535
+            0: 8191
           -1,0:
-            0: 65535
+            0: 36863
+          0,1:
+            1: 61183
+          -1,1:
+            1: 13311
+          0,2:
+            1: 35020
           1,0:
-            0: 14199
+            0: 307
+            1: 13312
+          1,1:
+            1: 13107
+          1,2:
+            1: 4371
+          0,3:
+            1: 136
+          1,3:
+            1: 4369
+          1,-1:
+            0: 6007
+            1: 32768
+          1,4:
+            1: 17
           -2,0:
-            0: 61166
+            0: 2252
+            1: 57856
+          -2,1:
+            1: 61166
+          -2,2:
+            1: 52430
+          -2,3:
+            1: 17612
+          -2,4:
+            1: 68
+          -2,-1:
+            0: 36590
+            1: 4096
+          -1,2:
+            1: 17
           -4,-4:
-            0: 65535
+            0: 61152
+          -5,-4:
+            1: 59392
           -4,-3:
-            0: 65535
-          -4,-2:
-            0: 15
+            0: 65528
+          -5,-3:
+            0: 65520
+          -4,-5:
+            0: 60415
           -3,-4:
-            0: 65535
+            0: 48056
           -3,-3:
-            0: 65535
+            0: 65528
+          -3,-5:
+            0: 48063
           -3,-2:
-            0: 2255
+            1: 2112
+            0: 136
           -2,-4:
-            0: 65535
+            0: 65293
           -2,-3:
             0: 65535
           -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
+            0: 4095
+          -2,-5:
+            0: 64991
           -1,-4:
-            0: 65535
+            0: 65419
           -1,-3:
-            0: 65535
+            0: 16383
           -1,-2:
-            0: 39323
-            1: 26212
+            0: 61165
+          -1,-5:
+            0: 48059
           -1,-1:
-            0: 64409
-            1: 1126
+            0: 3310
           0,-4:
-            0: 65535
+            0: 65309
           0,-3:
-            0: 65535
+            0: 53247
           0,-2:
-            0: 39325
-            1: 26210
+            0: 30587
           0,-1:
-            0: 64921
-            1: 614
+            0: 887
+          0,-5:
+            0: 53725
           1,-4:
-            0: 65535
+            0: 65295
           1,-3:
             0: 65535
           1,-2:
-            0: 65535
-          1,-1:
-            0: 65535
+            0: 4095
+          1,-5:
+            0: 28791
           2,-4:
-            0: 65535
+            0: 56785
           2,-3:
-            0: 65535
+            0: 65521
           2,-2:
-            0: 319
+            0: 17
+            1: 288
+          2,-5:
+            0: 48051
           3,-4:
-            0: 65535
+            0: 30576
           3,-3:
-            0: 65535
-          3,-2:
-            0: 15
-          -6,-3:
-            0: 34952
-          -6,-2:
-            0: 8
-          -5,-4:
-            0: 65472
-          -5,-3:
-            0: 65535
-          -5,-2:
-            0: 15
+            0: 65521
+          3,-5:
+            0: 32752
           4,-4:
-            0: 65328
+            1: 28928
           4,-3:
-            0: 65535
-          4,-2:
-            0: 15
+            0: 65520
+          -6,-3:
+            0: 34944
           5,-3:
-            0: 4369
-          5,-2:
-            0: 1
-          -4,-8:
-            0: 64716
+            0: 4368
           -4,-7:
-            0: 65535
+            0: 4095
+          -5,-7:
+            0: 4095
           -4,-6:
-            0: 64719
             2: 816
-          -4,-5:
-            0: 65535
+            0: 35976
+          -5,-5:
+            0: 2284
+          -4,-8:
+            0: 2176
           -3,-8:
-            0: 65535
+            0: 36856
           -3,-7:
-            0: 65535
+            0: 4095
           -3,-6:
-            0: 65535
-          -3,-5:
-            0: 65535
+            0: 65471
           -2,-8:
-            0: 65535
+            0: 4095
           -2,-7:
-            0: 65535
+            0: 4095
           -2,-6:
             0: 65535
-          -2,-5:
-            0: 65535
+          -2,-9:
+            0: 49152
           -1,-8:
-            0: 65535
+            0: 52701
           -1,-7:
-            0: 65535
+            0: 36863
           -1,-6:
-            0: 65535
-          -1,-5:
-            0: 65535
+            0: 48123
+          -1,-9:
+            0: 56320
           0,-8:
-            0: 65535
+            0: 15291
           0,-7:
-            0: 65535
+            0: 8191
           0,-6:
-            0: 65535
-          0,-5:
-            0: 65535
+            0: 63455
+          0,-9:
+            0: 45824
           1,-8:
-            0: 65535
+            0: 4095
           1,-7:
-            0: 65535
+            0: 4095
           1,-6:
-            0: 65535
-          1,-5:
-            0: 65535
+            0: 30455
+          1,-9:
+            0: 12288
           2,-8:
-            0: 65535
+            0: 8177
           2,-7:
-            0: 65535
+            0: 4095
           2,-6:
-            0: 32759
-            1: 32776
-          2,-5:
-            0: 65535
+            0: 48059
           3,-8:
-            0: 62259
+            0: 272
           3,-7:
-            0: 65535
+            0: 4095
           3,-6:
-            1: 63631
-            0: 1904
-          3,-5:
             0: 65535
-          -6,-8:
-            0: 32768
-          -6,-7:
-            0: 34952
-          -5,-8:
-            0: 61440
-          -5,-7:
-            0: 65535
-          -5,-5:
-            0: 53247
-          -5,-6:
-            0: 60552
-          4,-8:
-            0: 61440
           4,-7:
-            0: 65535
-          4,-6:
-            0: 29457
+            0: 4095
           4,-5:
-            0: 16383
-          -3,-9:
-            0: 49152
-          -2,-9:
-            0: 65024
-          -1,-9:
-            0: 65280
-          0,-9:
-            0: 65280
-          1,-9:
-            0: 63232
-          2,-9:
-            0: 12288
-          0,1:
-            0: 61183
-          0,2:
-            0: 35020
-          0,3:
-            0: 136
-          1,1:
-            0: 13107
-          1,2:
-            0: 4371
-          1,3:
-            0: 4369
-          -2,1:
-            0: 61166
-          -2,2:
-            0: 52430
-          -2,3:
-            0: 17612
-          -1,1:
-            0: 13311
-          -1,2:
-            0: 17
-          -2,4:
-            0: 68
-          1,4:
-            0: 17
+            0: 272
+          -6,-7:
+            0: 2184
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -906,12 +881,12 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 5000
+          immutable: True
           moles:
-          - 6666.982
           - 0
           - 0
-          - 6666.982
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -936,9499 +911,9052 @@ entities:
           - 0
           - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - id: AI-DC01-003
-      type: BecomesStation
-- proto: AirCanister
-  entities:
-  - uid: 937
-    components:
-    - pos: 3.5,-32.5
-      parent: 1
-      type: Transform
-  - uid: 964
-    components:
-    - pos: 3.5,-29.5
-      parent: 1
-      type: Transform
-  - uid: 1073
-    components:
-    - pos: 3.5,-31.5
-      parent: 1
-      type: Transform
-  - uid: 1084
-    components:
-    - pos: 3.5,-30.5
-      parent: 1
-      type: Transform
+    - type: BecomesStation
+      id: AI-DC01-003
 - proto: Airlock
   entities:
   - uid: 568
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-16.5
       parent: 1
-      type: Transform
 - proto: AirlockAtmospherics
   entities:
   - uid: 498
     components:
-    - pos: 8.5,-28.5
+    - type: Transform
+      pos: 8.5,-28.5
       parent: 1
-      type: Transform
 - proto: AirlockCargo
   entities:
   - uid: 577
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 578
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 579
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-8.5
       parent: 1
-      type: Transform
   - uid: 580
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 581
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-10.5
       parent: 1
-      type: Transform
   - uid: 582
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-8.5
       parent: 1
-      type: Transform
   - uid: 583
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 584
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 9.5,-10.5
       parent: 1
-      type: Transform
   - uid: 585
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -8.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1082
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,-14.5
       parent: 1
-      type: Transform
 - proto: AirlockCommandLocked
   entities:
   - uid: 97
     components:
-    - pos: -4.5,-0.5
+    - type: Transform
+      pos: -4.5,-0.5
       parent: 1
-      type: Transform
   - uid: 98
     components:
-    - pos: 4.5,-0.5
+    - type: Transform
+      pos: 4.5,-0.5
       parent: 1
-      type: Transform
 - proto: AirlockEngineering
   entities:
   - uid: 461
     components:
-    - pos: -8.5,-28.5
+    - type: Transform
+      pos: -8.5,-28.5
       parent: 1
-      type: Transform
 - proto: AirlockExternalGlass
   entities:
   - uid: 25
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-      type: Transform
   - uid: 30
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-      type: Transform
 - proto: AirlockFreezer
   entities:
   - uid: 394
     components:
-    - name: bathroom airlock
-      type: MetaData
-    - pos: -12.5,-11.5
+    - type: MetaData
+      name: bathroom airlock
+    - type: Transform
+      pos: -12.5,-11.5
       parent: 1
-      type: Transform
   - uid: 395
     components:
-    - name: bathroom airlock
-      type: MetaData
-    - pos: 12.5,-11.5
+    - type: MetaData
+      name: bathroom airlock
+    - type: Transform
+      pos: 12.5,-11.5
       parent: 1
-      type: Transform
   - uid: 638
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-21.5
       parent: 1
-      type: Transform
 - proto: AirlockGlass
   entities:
   - uid: 606
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-23.5
       parent: 1
-      type: Transform
   - uid: 607
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-16.5
       parent: 1
-      type: Transform
   - uid: 672
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-22.5
       parent: 1
-      type: Transform
 - proto: AirlockGlassShuttle
   entities:
   - uid: 255
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-10.5
       parent: 1
-      type: Transform
   - uid: 256
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-9.5
       parent: 1
-      type: Transform
   - uid: 257
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-8.5
       parent: 1
-      type: Transform
   - uid: 281
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 20.5,-8.5
       parent: 1
-      type: Transform
   - uid: 282
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 20.5,-9.5
       parent: 1
-      type: Transform
   - uid: 283
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 20.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1092
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1189
     components:
-    - pos: -1.5,-33.5
+    - type: Transform
+      pos: -1.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1190
     components:
-    - pos: -0.5,-33.5
+    - type: Transform
+      pos: -0.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1191
     components:
-    - pos: 0.5,-33.5
+    - type: Transform
+      pos: 0.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1192
     components:
-    - pos: 1.5,-33.5
+    - type: Transform
+      pos: 1.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1193
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1194
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1195
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1196
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1197
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 19.5,-27.5
       parent: 1
-      type: Transform
 - proto: AirlockScience
   entities:
   - uid: 679
     components:
-    - pos: 7.5,-15.5
+    - type: Transform
+      pos: 7.5,-15.5
       parent: 1
-      type: Transform
   - uid: 686
     components:
-    - pos: 7.5,-22.5
-      parent: 1
-      type: Transform
-  - uid: 761
-    components:
-    - pos: 10.5,-18.5
-      parent: 1
-      type: Transform
-  - uid: 764
-    components:
-    - pos: 10.5,-21.5
+    - type: Transform
+      pos: 7.5,-22.5
       parent: 1
-      type: Transform
-  - uid: 765
-    components:
-    - pos: 10.5,-22.5
-      parent: 1
-      type: Transform
 - proto: AirlockScienceGlass
   entities:
   - uid: 673
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-23.5
       parent: 1
-      type: Transform
-- proto: AmeJar
-  entities:
-  - uid: 174
-    components:
-    - pos: 2.3387003,-5.446493
-      parent: 1
-      type: Transform
-  - uid: 1677
-    components:
-    - pos: 2.5574503,-5.337118
-      parent: 1
-      type: Transform
-  - uid: 1678
-    components:
-    - pos: 2.7137003,-5.524618
-      parent: 1
-      type: Transform
 - proto: APCBasic
   entities:
   - uid: 916
     components:
-    - pos: -12.5,-28.5
+    - type: Transform
+      pos: -12.5,-28.5
       parent: 1
-      type: Transform
   - uid: 946
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 947
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 948
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-22.5
       parent: 1
-      type: Transform
   - uid: 949
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-19.5
       parent: 1
-      type: Transform
   - uid: 950
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-14.5
       parent: 1
-      type: Transform
   - uid: 951
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 952
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 953
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1042
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1045
     components:
-    - pos: 7.5,-28.5
+    - type: Transform
+      pos: 7.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1157
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-28.5
       parent: 1
-      type: Transform
 - proto: APCConstructed
   entities:
   - uid: 1155
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1156
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-11.5
       parent: 1
-      type: Transform
 - proto: AtmosDeviceFanTiny
   entities:
   - uid: 63
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-      type: Transform
   - uid: 87
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 88
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 89
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-8.5
       parent: 1
-      type: Transform
   - uid: 90
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-8.5
       parent: 1
-      type: Transform
   - uid: 210
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 20.5,-10.5
       parent: 1
-      type: Transform
   - uid: 211
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 20.5,-9.5
       parent: 1
-      type: Transform
   - uid: 212
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 20.5,-8.5
       parent: 1
-      type: Transform
   - uid: 270
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-10.5
       parent: 1
-      type: Transform
   - uid: 271
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-9.5
       parent: 1
-      type: Transform
   - uid: 272
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-8.5
       parent: 1
-      type: Transform
   - uid: 634
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-21.5
       parent: 1
-      type: Transform
   - uid: 861
     components:
-    - pos: 10.5,-21.5
+    - type: Transform
+      pos: 10.5,-21.5
       parent: 1
-      type: Transform
   - uid: 862
     components:
-    - pos: 10.5,-22.5
+    - type: Transform
+      pos: 10.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1075
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-      type: Transform
   - uid: 1086
     components:
-    - pos: 19.5,-25.5
+    - type: Transform
+      pos: 19.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1087
     components:
-    - pos: 19.5,-26.5
+    - type: Transform
+      pos: 19.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1088
     components:
-    - pos: 19.5,-27.5
+    - type: Transform
+      pos: 19.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1089
     components:
-    - pos: -20.5,-25.5
+    - type: Transform
+      pos: -20.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1090
     components:
-    - pos: -20.5,-26.5
+    - type: Transform
+      pos: -20.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1091
     components:
-    - pos: -20.5,-27.5
+    - type: Transform
+      pos: -20.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1093
     components:
-    - pos: -1.5,-33.5
+    - type: Transform
+      pos: -1.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1094
     components:
-    - pos: -0.5,-33.5
+    - type: Transform
+      pos: -0.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1095
     components:
-    - pos: 0.5,-33.5
+    - type: Transform
+      pos: 0.5,-33.5
       parent: 1
-      type: Transform
   - uid: 1096
     components:
-    - pos: 1.5,-33.5
+    - type: Transform
+      pos: 1.5,-33.5
       parent: 1
-      type: Transform
 - proto: AtmosFixFreezerMarker
   entities:
   - uid: 2
     components:
-    - pos: -15.5,-22.5
+    - type: Transform
+      pos: -15.5,-22.5
       parent: 1
-      type: Transform
   - uid: 635
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-21.5
       parent: 1
-      type: Transform
   - uid: 636
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-21.5
       parent: 1
-      type: Transform
   - uid: 637
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-22.5
       parent: 1
-      type: Transform
-- proto: AtmosFixInstantPlasmaFireMarker
+- proto: Autolathe
   entities:
-  - uid: 125
+  - uid: 741
     components:
-    - pos: -2.5,-2.5
+    - type: Transform
+      pos: 3.5,-23.5
       parent: 1
-      type: Transform
-  - uid: 126
+- proto: BaseComputer
+  entities:
+  - uid: 107
     components:
-    - pos: -2.5,-3.5
+    - type: Transform
+      pos: -5.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 127
+  - uid: 108
     components:
-    - pos: -2.5,-4.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 128
+  - uid: 109
     components:
-    - pos: -2.5,-5.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 129
+  - uid: 110
     components:
-    - pos: -2.5,-6.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-3.5
       parent: 1
-      type: Transform
-  - uid: 130
+  - uid: 743
     components:
-    - pos: -1.5,-2.5
+    - type: Transform
+      pos: 6.5,-18.5
       parent: 1
-      type: Transform
-  - uid: 131
+  - uid: 745
     components:
-    - pos: -1.5,-3.5
+    - type: Transform
+      pos: 4.5,-18.5
       parent: 1
-      type: Transform
-  - uid: 132
+  - uid: 746
     components:
-    - pos: -1.5,-4.5
+    - type: Transform
+      pos: 2.5,-18.5
       parent: 1
-      type: Transform
-  - uid: 133
+- proto: BoozeDispenser
+  entities:
+  - uid: 586
     components:
-    - pos: -1.5,-5.5
+    - type: Transform
+      pos: -5.5,-15.5
       parent: 1
-      type: Transform
-  - uid: 134
+- proto: BrokenBottle
+  entities:
+  - uid: 1617
     components:
-    - pos: -1.5,-6.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.2477,-18.462357
       parent: 1
-      type: Transform
-  - uid: 135
+- proto: CableApcExtension
+  entities:
+  - uid: 96
     components:
-    - pos: -1.5,-7.5
+    - type: Transform
+      pos: -11.5,-26.5
       parent: 1
-      type: Transform
-  - uid: 136
+  - uid: 416
     components:
-    - pos: -1.5,-1.5
+    - type: Transform
+      pos: 4.5,17.5
       parent: 1
-      type: Transform
-  - uid: 137
+  - uid: 882
     components:
-    - pos: 1.5,-1.5
+    - type: Transform
+      pos: -4.5,4.5
       parent: 1
-      type: Transform
-  - uid: 138
+  - uid: 883
     components:
-    - pos: 1.5,-2.5
+    - type: Transform
+      pos: -5.5,17.5
       parent: 1
-      type: Transform
-  - uid: 139
+  - uid: 884
     components:
-    - pos: 1.5,-3.5
+    - type: Transform
+      pos: -5.5,16.5
       parent: 1
-      type: Transform
-  - uid: 140
+  - uid: 885
     components:
-    - pos: 1.5,-4.5
+    - type: Transform
+      pos: -5.5,15.5
       parent: 1
-      type: Transform
-  - uid: 141
+  - uid: 886
     components:
-    - pos: 1.5,-5.5
+    - type: Transform
+      pos: -5.5,14.5
       parent: 1
-      type: Transform
-  - uid: 142
+  - uid: 887
     components:
-    - pos: 1.5,-6.5
+    - type: Transform
+      pos: -5.5,13.5
       parent: 1
-      type: Transform
-  - uid: 143
+  - uid: 888
     components:
-    - pos: 1.5,-7.5
+    - type: Transform
+      pos: -5.5,12.5
       parent: 1
-      type: Transform
-  - uid: 144
+  - uid: 889
     components:
-    - pos: 2.5,-6.5
+    - type: Transform
+      pos: -5.5,11.5
       parent: 1
-      type: Transform
-  - uid: 145
+  - uid: 890
     components:
-    - pos: 2.5,-5.5
+    - type: Transform
+      pos: -5.5,10.5
       parent: 1
-      type: Transform
-  - uid: 146
+  - uid: 891
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: -5.5,9.5
       parent: 1
-      type: Transform
-  - uid: 147
+  - uid: 892
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: -5.5,8.5
       parent: 1
-      type: Transform
-  - uid: 148
+  - uid: 893
     components:
-    - pos: 2.5,-2.5
+    - type: Transform
+      pos: -5.5,7.5
       parent: 1
-      type: Transform
-  - uid: 799
+  - uid: 894
     components:
-    - pos: 15.5,-22.5
+    - type: Transform
+      pos: -5.5,6.5
       parent: 1
-      type: Transform
-  - uid: 800
+  - uid: 895
     components:
-    - pos: 15.5,-23.5
+    - type: Transform
+      pos: -5.5,5.5
       parent: 1
-      type: Transform
-  - uid: 801
+  - uid: 896
     components:
-    - pos: 13.5,-23.5
+    - type: Transform
+      pos: -5.5,4.5
       parent: 1
-      type: Transform
-  - uid: 802
+  - uid: 897
     components:
-    - pos: 14.5,-23.5
+    - type: Transform
+      pos: -3.5,4.5
       parent: 1
-      type: Transform
-  - uid: 803
+  - uid: 898
     components:
-    - pos: 15.5,-21.5
-      parent: 1
-      type: Transform
-  - uid: 838
-    components:
-    - pos: 11.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 843
-    components:
-    - pos: 12.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 848
-    components:
-    - pos: 13.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 853
-    components:
-    - pos: 14.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 858
-    components:
-    - pos: 15.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 859
-    components:
-    - pos: 12.5,-23.5
-      parent: 1
-      type: Transform
-  - uid: 860
-    components:
-    - pos: 11.5,-23.5
-      parent: 1
-      type: Transform
-- proto: Autolathe
-  entities:
-  - uid: 741
-    components:
-    - pos: 3.5,-23.5
-      parent: 1
-      type: Transform
-- proto: BaseComputer
-  entities:
-  - uid: 107
-    components:
-    - pos: -5.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 108
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 109
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 110
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 743
-    components:
-    - pos: 6.5,-18.5
-      parent: 1
-      type: Transform
-  - uid: 745
-    components:
-    - pos: 4.5,-18.5
-      parent: 1
-      type: Transform
-  - uid: 746
-    components:
-    - pos: 2.5,-18.5
-      parent: 1
-      type: Transform
-- proto: BaseResearchAndDevelopmentPointSource
-  entities:
-  - uid: 798
-    components:
-    - desc: Somehow generates research data from mearly existing.
-      name: Bluespace Data Reader
-      type: MetaData
-    - pos: 15.5,-21.5
-      parent: 1
-      type: Transform
-- proto: BoozeDispenser
-  entities:
-  - uid: 586
-    components:
-    - pos: -5.5,-15.5
-      parent: 1
-      type: Transform
-- proto: BoxHoloparasite
-  entities:
-  - uid: 694
-    components:
-    - pos: 16.145706,-18.042227
-      parent: 1
-      type: Transform
-- proto: BrokenBottle
-  entities:
-  - uid: 1617
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -5.2477,-18.462357
-      parent: 1
-      type: Transform
-- proto: CableApcExtension
-  entities:
-  - uid: 96
-    components:
-    - pos: -11.5,-26.5
-      parent: 1
-      type: Transform
-  - uid: 416
-    components:
-    - pos: 4.5,17.5
-      parent: 1
-      type: Transform
-  - uid: 882
-    components:
-    - pos: -4.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 883
-    components:
-    - pos: -5.5,17.5
-      parent: 1
-      type: Transform
-  - uid: 884
-    components:
-    - pos: -5.5,16.5
-      parent: 1
-      type: Transform
-  - uid: 885
-    components:
-    - pos: -5.5,15.5
-      parent: 1
-      type: Transform
-  - uid: 886
-    components:
-    - pos: -5.5,14.5
-      parent: 1
-      type: Transform
-  - uid: 887
-    components:
-    - pos: -5.5,13.5
-      parent: 1
-      type: Transform
-  - uid: 888
-    components:
-    - pos: -5.5,12.5
-      parent: 1
-      type: Transform
-  - uid: 889
-    components:
-    - pos: -5.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 890
-    components:
-    - pos: -5.5,10.5
-      parent: 1
-      type: Transform
-  - uid: 891
-    components:
-    - pos: -5.5,9.5
-      parent: 1
-      type: Transform
-  - uid: 892
-    components:
-    - pos: -5.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 893
-    components:
-    - pos: -5.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 894
-    components:
-    - pos: -5.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 895
-    components:
-    - pos: -5.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 896
-    components:
-    - pos: -5.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 897
-    components:
-    - pos: -3.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 898
-    components:
-    - pos: -2.5,4.5
+    - type: Transform
+      pos: -2.5,4.5
       parent: 1
-      type: Transform
   - uid: 899
     components:
-    - pos: -1.5,4.5
+    - type: Transform
+      pos: -1.5,4.5
       parent: 1
-      type: Transform
   - uid: 900
     components:
-    - pos: -0.5,4.5
+    - type: Transform
+      pos: -0.5,4.5
       parent: 1
-      type: Transform
   - uid: 901
     components:
-    - pos: 0.5,4.5
+    - type: Transform
+      pos: 0.5,4.5
       parent: 1
-      type: Transform
   - uid: 902
     components:
-    - pos: 1.5,4.5
+    - type: Transform
+      pos: 1.5,4.5
       parent: 1
-      type: Transform
   - uid: 903
     components:
-    - pos: 2.5,4.5
+    - type: Transform
+      pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 904
     components:
-    - pos: 3.5,4.5
+    - type: Transform
+      pos: 3.5,4.5
       parent: 1
-      type: Transform
   - uid: 924
     components:
-    - pos: -18.5,-26.5
+    - type: Transform
+      pos: -18.5,-26.5
       parent: 1
-      type: Transform
   - uid: 938
     components:
-    - pos: 4.5,4.5
+    - type: Transform
+      pos: 4.5,4.5
       parent: 1
-      type: Transform
   - uid: 939
     components:
-    - pos: 4.5,4.5
+    - type: Transform
+      pos: 4.5,4.5
       parent: 1
-      type: Transform
   - uid: 940
     components:
-    - pos: 4.5,5.5
+    - type: Transform
+      pos: 4.5,5.5
       parent: 1
-      type: Transform
   - uid: 941
     components:
-    - pos: 4.5,6.5
+    - type: Transform
+      pos: 4.5,6.5
       parent: 1
-      type: Transform
   - uid: 942
     components:
-    - pos: 4.5,7.5
+    - type: Transform
+      pos: 4.5,7.5
       parent: 1
-      type: Transform
   - uid: 943
     components:
-    - pos: 4.5,8.5
+    - type: Transform
+      pos: 4.5,8.5
       parent: 1
-      type: Transform
   - uid: 1056
     components:
-    - pos: -12.5,-28.5
+    - type: Transform
+      pos: -12.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1057
     components:
-    - pos: -12.5,-29.5
+    - type: Transform
+      pos: -12.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1058
     components:
-    - pos: -12.5,-29.5
+    - type: Transform
+      pos: -12.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1059
     components:
-    - pos: -11.5,-29.5
+    - type: Transform
+      pos: -11.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1060
     components:
-    - pos: -10.5,-29.5
+    - type: Transform
+      pos: -10.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1061
     components:
-    - pos: -9.5,-29.5
+    - type: Transform
+      pos: -9.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1062
     components:
-    - pos: -8.5,-29.5
+    - type: Transform
+      pos: -8.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1063
     components:
-    - pos: -7.5,-29.5
+    - type: Transform
+      pos: -7.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1064
     components:
-    - pos: -6.5,-29.5
+    - type: Transform
+      pos: -6.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1065
     components:
-    - pos: -7.5,-30.5
+    - type: Transform
+      pos: -7.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1066
     components:
-    - pos: -7.5,-31.5
+    - type: Transform
+      pos: -7.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1067
     components:
-    - pos: -3.5,-28.5
+    - type: Transform
+      pos: -3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1068
     components:
-    - pos: -3.5,-27.5
+    - type: Transform
+      pos: -3.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1069
     components:
-    - pos: -3.5,-26.5
+    - type: Transform
+      pos: -3.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1070
     components:
-    - pos: -4.5,-26.5
+    - type: Transform
+      pos: -4.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1085
     components:
-    - pos: -19.5,-26.5
+    - type: Transform
+      pos: -19.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1160
     components:
-    - pos: 3.5,-28.5
+    - type: Transform
+      pos: 3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1161
     components:
-    - pos: 3.5,-27.5
+    - type: Transform
+      pos: 3.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1162
     components:
-    - pos: 3.5,-26.5
+    - type: Transform
+      pos: 3.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1163
     components:
-    - pos: 2.5,-26.5
+    - type: Transform
+      pos: 2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1164
     components:
-    - pos: 3.5,-26.5
+    - type: Transform
+      pos: 3.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1165
     components:
-    - pos: 4.5,-26.5
+    - type: Transform
+      pos: 4.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1166
     components:
-    - pos: 5.5,-26.5
+    - type: Transform
+      pos: 5.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1167
     components:
-    - pos: 6.5,-26.5
+    - type: Transform
+      pos: 6.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1168
     components:
-    - pos: 7.5,-26.5
+    - type: Transform
+      pos: 7.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1169
     components:
-    - pos: 8.5,-26.5
+    - type: Transform
+      pos: 8.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1170
     components:
-    - pos: 9.5,-26.5
+    - type: Transform
+      pos: 9.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1171
     components:
-    - pos: 10.5,-26.5
+    - type: Transform
+      pos: 10.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1172
     components:
-    - pos: 11.5,-26.5
+    - type: Transform
+      pos: 11.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1173
     components:
-    - pos: 12.5,-26.5
+    - type: Transform
+      pos: 12.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1174
     components:
-    - pos: 13.5,-26.5
+    - type: Transform
+      pos: 13.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1175
     components:
-    - pos: 14.5,-26.5
+    - type: Transform
+      pos: 14.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1176
     components:
-    - pos: 15.5,-26.5
+    - type: Transform
+      pos: 15.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1177
     components:
-    - pos: 16.5,-26.5
+    - type: Transform
+      pos: 16.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1178
     components:
-    - pos: 17.5,-26.5
+    - type: Transform
+      pos: 17.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1179
     components:
-    - pos: 18.5,-26.5
+    - type: Transform
+      pos: 18.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1180
     components:
-    - pos: -2.5,-26.5
+    - type: Transform
+      pos: -2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1181
     components:
-    - pos: -1.5,-26.5
+    - type: Transform
+      pos: -1.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1182
     components:
-    - pos: -0.5,-26.5
+    - type: Transform
+      pos: -0.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1183
     components:
-    - pos: -0.5,-27.5
+    - type: Transform
+      pos: -0.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1184
     components:
-    - pos: -0.5,-28.5
+    - type: Transform
+      pos: -0.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1185
     components:
-    - pos: -0.5,-29.5
+    - type: Transform
+      pos: -0.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1186
     components:
-    - pos: -0.5,-30.5
+    - type: Transform
+      pos: -0.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1187
     components:
-    - pos: -0.5,-31.5
+    - type: Transform
+      pos: -0.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1188
     components:
-    - pos: -0.5,-32.5
+    - type: Transform
+      pos: -0.5,-32.5
       parent: 1
-      type: Transform
   - uid: 1199
     components:
-    - pos: 1.5,-22.5
+    - type: Transform
+      pos: 1.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1200
     components:
-    - pos: 2.5,-22.5
+    - type: Transform
+      pos: 2.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1201
     components:
-    - pos: 3.5,-22.5
+    - type: Transform
+      pos: 3.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1202
     components:
-    - pos: 4.5,-22.5
+    - type: Transform
+      pos: 4.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1203
     components:
-    - pos: 5.5,-22.5
+    - type: Transform
+      pos: 5.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1204
     components:
-    - pos: 6.5,-22.5
+    - type: Transform
+      pos: 6.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1205
     components:
-    - pos: 4.5,-23.5
+    - type: Transform
+      pos: 4.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1206
     components:
-    - pos: 4.5,-22.5
+    - type: Transform
+      pos: 4.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1207
     components:
-    - pos: 4.5,-21.5
+    - type: Transform
+      pos: 4.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1208
     components:
-    - pos: 4.5,-20.5
+    - type: Transform
+      pos: 4.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1209
     components:
-    - pos: 4.5,-19.5
+    - type: Transform
+      pos: 4.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1210
     components:
-    - pos: 4.5,-18.5
+    - type: Transform
+      pos: 4.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1211
     components:
-    - pos: 2.5,-19.5
+    - type: Transform
+      pos: 2.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1212
     components:
-    - pos: 3.5,-19.5
+    - type: Transform
+      pos: 3.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1213
     components:
-    - pos: 4.5,-19.5
+    - type: Transform
+      pos: 4.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1214
     components:
-    - pos: 5.5,-19.5
+    - type: Transform
+      pos: 5.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1215
     components:
-    - pos: 6.5,-19.5
+    - type: Transform
+      pos: 6.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1216
     components:
-    - pos: 10.5,-19.5
+    - type: Transform
+      pos: 10.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1217
     components:
-    - pos: 9.5,-19.5
+    - type: Transform
+      pos: 9.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1218
     components:
-    - pos: 8.5,-19.5
+    - type: Transform
+      pos: 8.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1219
     components:
-    - pos: 9.5,-16.5
+    - type: Transform
+      pos: 9.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1220
     components:
-    - pos: 9.5,-17.5
+    - type: Transform
+      pos: 9.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1221
     components:
-    - pos: 9.5,-18.5
+    - type: Transform
+      pos: 9.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1222
     components:
-    - pos: 9.5,-19.5
+    - type: Transform
+      pos: 9.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1223
     components:
-    - pos: 9.5,-20.5
+    - type: Transform
+      pos: 9.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1224
     components:
-    - pos: 9.5,-21.5
+    - type: Transform
+      pos: 9.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1225
     components:
-    - pos: 9.5,-22.5
+    - type: Transform
+      pos: 9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1226
     components:
-    - pos: 9.5,-23.5
+    - type: Transform
+      pos: 9.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1227
     components:
-    - pos: 9.5,-21.5
+    - type: Transform
+      pos: 9.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1228
     components:
-    - pos: 10.5,-21.5
+    - type: Transform
+      pos: 10.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1229
     components:
-    - pos: 11.5,-21.5
+    - type: Transform
+      pos: 11.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1230
     components:
-    - pos: 12.5,-21.5
+    - type: Transform
+      pos: 12.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1231
     components:
-    - pos: 13.5,-21.5
+    - type: Transform
+      pos: 13.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1232
     components:
-    - pos: 14.5,-21.5
+    - type: Transform
+      pos: 14.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1233
     components:
-    - pos: 4.5,-18.5
+    - type: Transform
+      pos: 4.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1234
     components:
-    - pos: 4.5,-17.5
+    - type: Transform
+      pos: 4.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1235
     components:
-    - pos: 4.5,-16.5
+    - type: Transform
+      pos: 4.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1236
     components:
-    - pos: 4.5,-15.5
+    - type: Transform
+      pos: 4.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1237
     components:
-    - pos: 2.5,-16.5
+    - type: Transform
+      pos: 2.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1238
     components:
-    - pos: 3.5,-16.5
+    - type: Transform
+      pos: 3.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1239
     components:
-    - pos: 4.5,-16.5
+    - type: Transform
+      pos: 4.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1240
     components:
-    - pos: 5.5,-16.5
+    - type: Transform
+      pos: 5.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1241
     components:
-    - pos: 6.5,-16.5
+    - type: Transform
+      pos: 6.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1242
     components:
-    - pos: 9.5,-18.5
+    - type: Transform
+      pos: 9.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1243
     components:
-    - pos: 10.5,-18.5
+    - type: Transform
+      pos: 10.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1244
     components:
-    - pos: 11.5,-18.5
+    - type: Transform
+      pos: 11.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1245
     components:
-    - pos: 12.5,-18.5
+    - type: Transform
+      pos: 12.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1246
     components:
-    - pos: 13.5,-18.5
+    - type: Transform
+      pos: 13.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1247
     components:
-    - pos: 14.5,-18.5
+    - type: Transform
+      pos: 14.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1248
     components:
-    - pos: -1.5,-23.5
+    - type: Transform
+      pos: -1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1249
     components:
-    - pos: -2.5,-23.5
+    - type: Transform
+      pos: -2.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1250
     components:
-    - pos: -3.5,-23.5
+    - type: Transform
+      pos: -3.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1251
     components:
-    - pos: -4.5,-23.5
+    - type: Transform
+      pos: -4.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1252
     components:
-    - pos: -5.5,-23.5
+    - type: Transform
+      pos: -5.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1253
     components:
-    - pos: -6.5,-23.5
+    - type: Transform
+      pos: -6.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1254
     components:
-    - pos: -7.5,-23.5
+    - type: Transform
+      pos: -7.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1255
     components:
-    - pos: -7.5,-22.5
+    - type: Transform
+      pos: -7.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1256
     components:
-    - pos: -7.5,-21.5
+    - type: Transform
+      pos: -7.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1257
     components:
-    - pos: -7.5,-20.5
+    - type: Transform
+      pos: -7.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1258
     components:
-    - pos: -7.5,-19.5
+    - type: Transform
+      pos: -7.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1259
     components:
-    - pos: -7.5,-18.5
+    - type: Transform
+      pos: -7.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1260
     components:
-    - pos: -7.5,-17.5
+    - type: Transform
+      pos: -7.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1261
     components:
-    - pos: -7.5,-16.5
+    - type: Transform
+      pos: -7.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1262
     components:
-    - pos: -7.5,-15.5
+    - type: Transform
+      pos: -7.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1263
     components:
-    - pos: -3.5,-15.5
+    - type: Transform
+      pos: -3.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1264
     components:
-    - pos: -3.5,-16.5
+    - type: Transform
+      pos: -3.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1265
     components:
-    - pos: -3.5,-17.5
+    - type: Transform
+      pos: -3.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1266
     components:
-    - pos: -3.5,-18.5
+    - type: Transform
+      pos: -3.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1267
     components:
-    - pos: -3.5,-19.5
+    - type: Transform
+      pos: -3.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1268
     components:
-    - pos: -3.5,-20.5
+    - type: Transform
+      pos: -3.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1269
     components:
-    - pos: -3.5,-21.5
+    - type: Transform
+      pos: -3.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1270
     components:
-    - pos: -3.5,-22.5
+    - type: Transform
+      pos: -3.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1271
     components:
-    - pos: -9.5,-22.5
+    - type: Transform
+      pos: -9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1272
     components:
-    - pos: -10.5,-22.5
+    - type: Transform
+      pos: -10.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1273
     components:
-    - pos: -11.5,-22.5
+    - type: Transform
+      pos: -11.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1274
     components:
-    - pos: -12.5,-22.5
+    - type: Transform
+      pos: -12.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1275
     components:
-    - pos: -13.5,-22.5
+    - type: Transform
+      pos: -13.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1276
     components:
-    - pos: -14.5,-22.5
+    - type: Transform
+      pos: -14.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1277
     components:
-    - pos: -11.5,-23.5
+    - type: Transform
+      pos: -11.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1278
     components:
-    - pos: -11.5,-22.5
+    - type: Transform
+      pos: -11.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1279
     components:
-    - pos: -11.5,-21.5
+    - type: Transform
+      pos: -11.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1280
     components:
-    - pos: -11.5,-20.5
+    - type: Transform
+      pos: -11.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1281
     components:
-    - pos: -11.5,-19.5
+    - type: Transform
+      pos: -11.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1282
     components:
-    - pos: -11.5,-18.5
+    - type: Transform
+      pos: -11.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1283
     components:
-    - pos: -11.5,-17.5
+    - type: Transform
+      pos: -11.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1284
     components:
-    - pos: -11.5,-16.5
+    - type: Transform
+      pos: -11.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1285
     components:
-    - pos: -10.5,-18.5
+    - type: Transform
+      pos: -10.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1286
     components:
-    - pos: -11.5,-18.5
+    - type: Transform
+      pos: -11.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1287
     components:
-    - pos: -12.5,-18.5
+    - type: Transform
+      pos: -12.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1288
     components:
-    - pos: -13.5,-18.5
+    - type: Transform
+      pos: -13.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1289
     components:
-    - pos: -14.5,-18.5
+    - type: Transform
+      pos: -14.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1290
     components:
-    - pos: -15.5,-18.5
+    - type: Transform
+      pos: -15.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1291
     components:
-    - pos: -16.5,-18.5
+    - type: Transform
+      pos: -16.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1292
     components:
-    - pos: -17.5,-18.5
+    - type: Transform
+      pos: -17.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1293
     components:
-    - pos: -18.5,-18.5
+    - type: Transform
+      pos: -18.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1294
     components:
-    - pos: -13.5,-11.5
+    - type: Transform
+      pos: -13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1295
     components:
-    - pos: -13.5,-10.5
+    - type: Transform
+      pos: -13.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1296
     components:
-    - pos: -13.5,-9.5
+    - type: Transform
+      pos: -13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1297
     components:
-    - pos: -13.5,-9.5
+    - type: Transform
+      pos: -13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1298
     components:
-    - pos: -14.5,-9.5
+    - type: Transform
+      pos: -14.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1299
     components:
-    - pos: -15.5,-9.5
+    - type: Transform
+      pos: -15.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1300
     components:
-    - pos: -16.5,-9.5
+    - type: Transform
+      pos: -16.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1301
     components:
-    - pos: -17.5,-9.5
+    - type: Transform
+      pos: -17.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1302
     components:
-    - pos: -18.5,-9.5
+    - type: Transform
+      pos: -18.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1303
     components:
-    - pos: -19.5,-9.5
+    - type: Transform
+      pos: -19.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1304
     components:
-    - pos: -13.5,-9.5
+    - type: Transform
+      pos: -13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1305
     components:
-    - pos: -12.5,-9.5
+    - type: Transform
+      pos: -12.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1306
     components:
-    - pos: -11.5,-9.5
+    - type: Transform
+      pos: -11.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1307
     components:
-    - pos: -13.5,-11.5
+    - type: Transform
+      pos: -13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1308
     components:
-    - pos: -13.5,-12.5
+    - type: Transform
+      pos: -13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1309
     components:
-    - pos: -13.5,-13.5
+    - type: Transform
+      pos: -13.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1310
     components:
-    - pos: -13.5,-14.5
+    - type: Transform
+      pos: -13.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1311
     components:
-    - pos: -13.5,-13.5
+    - type: Transform
+      pos: -13.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1312
     components:
-    - pos: -12.5,-13.5
+    - type: Transform
+      pos: -12.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1313
     components:
-    - pos: -11.5,-13.5
+    - type: Transform
+      pos: -11.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1314
     components:
-    - pos: -10.5,-13.5
+    - type: Transform
+      pos: -10.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1315
     components:
-    - pos: -10.5,-9.5
+    - type: Transform
+      pos: -10.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1316
     components:
-    - pos: 11.5,-9.5
+    - type: Transform
+      pos: 11.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1317
     components:
-    - pos: 12.5,-9.5
+    - type: Transform
+      pos: 12.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1318
     components:
-    - pos: 13.5,-9.5
+    - type: Transform
+      pos: 13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1319
     components:
-    - pos: 14.5,-9.5
+    - type: Transform
+      pos: 14.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1320
     components:
-    - pos: 15.5,-9.5
+    - type: Transform
+      pos: 15.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1321
     components:
-    - pos: 16.5,-9.5
+    - type: Transform
+      pos: 16.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1322
     components:
-    - pos: 17.5,-9.5
+    - type: Transform
+      pos: 17.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1323
     components:
-    - pos: 18.5,-9.5
+    - type: Transform
+      pos: 18.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1324
     components:
-    - pos: 13.5,-10.5
+    - type: Transform
+      pos: 13.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1325
     components:
-    - pos: 13.5,-11.5
+    - type: Transform
+      pos: 13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1326
     components:
-    - pos: 13.5,-12.5
+    - type: Transform
+      pos: 13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1327
     components:
-    - pos: 13.5,-13.5
+    - type: Transform
+      pos: 13.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1328
     components:
-    - pos: 13.5,-14.5
+    - type: Transform
+      pos: 13.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1329
     components:
-    - pos: 12.5,-13.5
+    - type: Transform
+      pos: 12.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1330
     components:
-    - pos: 11.5,-13.5
+    - type: Transform
+      pos: 11.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1331
     components:
-    - pos: 10.5,-13.5
+    - type: Transform
+      pos: 10.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1332
     components:
-    - pos: 10.5,-9.5
+    - type: Transform
+      pos: 10.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1333
     components:
-    - pos: 19.5,-9.5
+    - type: Transform
+      pos: 19.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1334
     components:
-    - pos: -1.5,-14.5
+    - type: Transform
+      pos: -1.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1335
     components:
-    - pos: -1.5,-13.5
+    - type: Transform
+      pos: -1.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1336
     components:
-    - pos: -1.5,-12.5
+    - type: Transform
+      pos: -1.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1337
     components:
-    - pos: -1.5,-11.5
+    - type: Transform
+      pos: -1.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1338
     components:
-    - pos: -1.5,-10.5
+    - type: Transform
+      pos: -1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1339
     components:
-    - pos: -1.5,-9.5
+    - type: Transform
+      pos: -1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1340
     components:
-    - pos: -7.5,-9.5
+    - type: Transform
+      pos: -7.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1341
     components:
-    - pos: -6.5,-9.5
+    - type: Transform
+      pos: -6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1342
     components:
-    - pos: -5.5,-9.5
+    - type: Transform
+      pos: -5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1343
     components:
-    - pos: -4.5,-9.5
+    - type: Transform
+      pos: -4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1344
     components:
-    - pos: -3.5,-9.5
+    - type: Transform
+      pos: -3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1345
     components:
-    - pos: -2.5,-9.5
+    - type: Transform
+      pos: -2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1346
     components:
-    - pos: -1.5,-9.5
+    - type: Transform
+      pos: -1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1347
     components:
-    - pos: -0.5,-9.5
+    - type: Transform
+      pos: -0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1348
     components:
-    - pos: 0.5,-9.5
+    - type: Transform
+      pos: 0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1349
     components:
-    - pos: 1.5,-9.5
+    - type: Transform
+      pos: 1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1350
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1351
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1352
     components:
-    - pos: 4.5,-9.5
+    - type: Transform
+      pos: 4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1353
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1354
     components:
-    - pos: 6.5,-9.5
+    - type: Transform
+      pos: 6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1355
     components:
-    - pos: 7.5,-9.5
+    - type: Transform
+      pos: 7.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1356
     components:
-    - pos: 8.5,-9.5
+    - type: Transform
+      pos: 8.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1357
     components:
-    - pos: -7.5,-12.5
+    - type: Transform
+      pos: -7.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1358
     components:
-    - pos: -6.5,-12.5
+    - type: Transform
+      pos: -6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1359
     components:
-    - pos: -5.5,-12.5
+    - type: Transform
+      pos: -5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1360
     components:
-    - pos: -4.5,-12.5
+    - type: Transform
+      pos: -4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1361
     components:
-    - pos: -3.5,-12.5
+    - type: Transform
+      pos: -3.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1362
     components:
-    - pos: -2.5,-12.5
+    - type: Transform
+      pos: -2.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1363
     components:
-    - pos: -1.5,-12.5
+    - type: Transform
+      pos: -1.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1364
     components:
-    - pos: -0.5,-12.5
+    - type: Transform
+      pos: -0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1365
     components:
-    - pos: 0.5,-12.5
+    - type: Transform
+      pos: 0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1366
     components:
-    - pos: 1.5,-12.5
+    - type: Transform
+      pos: 1.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1367
     components:
-    - pos: 2.5,-12.5
+    - type: Transform
+      pos: 2.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1368
     components:
-    - pos: 3.5,-12.5
+    - type: Transform
+      pos: 3.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1369
     components:
-    - pos: 4.5,-12.5
+    - type: Transform
+      pos: 4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1370
     components:
-    - pos: 5.5,-12.5
+    - type: Transform
+      pos: 5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1371
     components:
-    - pos: 6.5,-12.5
+    - type: Transform
+      pos: 6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1372
     components:
-    - pos: 7.5,-12.5
+    - type: Transform
+      pos: 7.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1373
     components:
-    - pos: -5.5,-5.5
+    - type: Transform
+      pos: -5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 1374
     components:
-    - pos: -5.5,-6.5
+    - type: Transform
+      pos: -5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1375
     components:
-    - pos: -5.5,-7.5
+    - type: Transform
+      pos: -5.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1376
     components:
-    - pos: -5.5,-8.5
+    - type: Transform
+      pos: -5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1377
     components:
-    - pos: -5.5,-9.5
+    - type: Transform
+      pos: -5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1378
     components:
-    - pos: -5.5,-10.5
+    - type: Transform
+      pos: -5.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1379
     components:
-    - pos: -5.5,-11.5
+    - type: Transform
+      pos: -5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1380
     components:
-    - pos: -5.5,-12.5
+    - type: Transform
+      pos: -5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1381
     components:
-    - pos: -5.5,-13.5
+    - type: Transform
+      pos: -5.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1382
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 1383
     components:
-    - pos: 5.5,-6.5
+    - type: Transform
+      pos: 5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1384
     components:
-    - pos: 5.5,-7.5
+    - type: Transform
+      pos: 5.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1385
     components:
-    - pos: 5.5,-8.5
+    - type: Transform
+      pos: 5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1386
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1387
     components:
-    - pos: 5.5,-10.5
+    - type: Transform
+      pos: 5.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1388
     components:
-    - pos: 5.5,-11.5
+    - type: Transform
+      pos: 5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1389
     components:
-    - pos: 5.5,-12.5
+    - type: Transform
+      pos: 5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1390
     components:
-    - pos: 5.5,-13.5
+    - type: Transform
+      pos: 5.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1391
     components:
-    - pos: -1.5,-0.5
+    - type: Transform
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1392
     components:
-    - pos: -1.5,0.5
+    - type: Transform
+      pos: -1.5,0.5
       parent: 1
-      type: Transform
   - uid: 1393
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 1
-      type: Transform
   - uid: 1394
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
   - uid: 1395
     components:
-    - pos: -5.5,1.5
+    - type: Transform
+      pos: -5.5,1.5
       parent: 1
-      type: Transform
   - uid: 1396
     components:
-    - pos: -4.5,1.5
+    - type: Transform
+      pos: -4.5,1.5
       parent: 1
-      type: Transform
   - uid: 1397
     components:
-    - pos: -3.5,1.5
+    - type: Transform
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
   - uid: 1398
     components:
-    - pos: -2.5,1.5
+    - type: Transform
+      pos: -2.5,1.5
       parent: 1
-      type: Transform
   - uid: 1399
     components:
-    - pos: -1.5,1.5
+    - type: Transform
+      pos: -1.5,1.5
       parent: 1
-      type: Transform
   - uid: 1400
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 1
-      type: Transform
   - uid: 1401
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 1
-      type: Transform
   - uid: 1402
     components:
-    - pos: 1.5,1.5
+    - type: Transform
+      pos: 1.5,1.5
       parent: 1
-      type: Transform
   - uid: 1403
     components:
-    - pos: 2.5,1.5
+    - type: Transform
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
   - uid: 1404
     components:
-    - pos: 3.5,1.5
+    - type: Transform
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
   - uid: 1405
     components:
-    - pos: 4.5,1.5
+    - type: Transform
+      pos: 4.5,1.5
       parent: 1
-      type: Transform
   - uid: 1406
     components:
-    - pos: 5.5,1.5
+    - type: Transform
+      pos: 5.5,1.5
       parent: 1
-      type: Transform
   - uid: 1407
     components:
-    - pos: -3.5,-1.5
+    - type: Transform
+      pos: -3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1408
     components:
-    - pos: -4.5,-1.5
+    - type: Transform
+      pos: -4.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1409
     components:
-    - pos: -4.5,-2.5
+    - type: Transform
+      pos: -4.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1410
     components:
-    - pos: -5.5,-2.5
+    - type: Transform
+      pos: -5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1411
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1412
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1413
     components:
-    - pos: 4.5,-1.5
+    - type: Transform
+      pos: 4.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1414
     components:
-    - pos: 4.5,-2.5
+    - type: Transform
+      pos: 4.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1415
     components:
-    - pos: 5.5,-2.5
+    - type: Transform
+      pos: 5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1429
     components:
-    - pos: 4.5,9.5
+    - type: Transform
+      pos: 4.5,9.5
       parent: 1
-      type: Transform
   - uid: 1430
     components:
-    - pos: 4.5,10.5
+    - type: Transform
+      pos: 4.5,10.5
       parent: 1
-      type: Transform
   - uid: 1481
     components:
-    - pos: -6.5,-26.5
+    - type: Transform
+      pos: -6.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1485
     components:
-    - pos: -17.5,-26.5
+    - type: Transform
+      pos: -17.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1487
     components:
-    - pos: -16.5,-26.5
+    - type: Transform
+      pos: -16.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1488
     components:
-    - pos: -15.5,-26.5
+    - type: Transform
+      pos: -15.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1489
     components:
-    - pos: -14.5,-26.5
+    - type: Transform
+      pos: -14.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1491
     components:
-    - pos: -10.5,-26.5
+    - type: Transform
+      pos: -10.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1492
     components:
-    - pos: -9.5,-26.5
+    - type: Transform
+      pos: -9.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1496
     components:
-    - pos: -12.5,-26.5
+    - type: Transform
+      pos: -12.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1497
     components:
-    - pos: -13.5,-26.5
+    - type: Transform
+      pos: -13.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1498
     components:
-    - pos: -8.5,-26.5
+    - type: Transform
+      pos: -8.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1499
     components:
-    - pos: -4.5,-26.5
+    - type: Transform
+      pos: -4.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1502
     components:
-    - pos: -7.5,-26.5
+    - type: Transform
+      pos: -7.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1503
     components:
-    - pos: -5.5,-26.5
+    - type: Transform
+      pos: -5.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1661
     components:
-    - pos: 4.5,11.5
+    - type: Transform
+      pos: 4.5,11.5
       parent: 1
-      type: Transform
   - uid: 1662
     components:
-    - pos: 4.5,12.5
+    - type: Transform
+      pos: 4.5,12.5
       parent: 1
-      type: Transform
   - uid: 1663
     components:
-    - pos: 4.5,13.5
+    - type: Transform
+      pos: 4.5,13.5
       parent: 1
-      type: Transform
   - uid: 1664
     components:
-    - pos: 4.5,14.5
+    - type: Transform
+      pos: 4.5,14.5
       parent: 1
-      type: Transform
   - uid: 1665
     components:
-    - pos: 4.5,15.5
+    - type: Transform
+      pos: 4.5,15.5
       parent: 1
-      type: Transform
   - uid: 1666
     components:
-    - pos: 4.5,16.5
+    - type: Transform
+      pos: 4.5,16.5
       parent: 1
-      type: Transform
   - uid: 1668
     components:
-    - pos: -1.5,3.5
+    - type: Transform
+      pos: -1.5,3.5
       parent: 1
-      type: Transform
   - uid: 1669
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 1
-      type: Transform
   - uid: 1670
     components:
-    - pos: 1.5,3.5
+    - type: Transform
+      pos: 1.5,3.5
       parent: 1
-      type: Transform
 - proto: CableHV
   entities:
+  - uid: 135
+    components:
+    - type: Transform
+      pos: -3.5,-31.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -3.5,-32.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: -5.5,-32.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -4.5,-32.5
+      parent: 1
   - uid: 872
     components:
-    - pos: -6.5,-29.5
+    - type: Transform
+      pos: -6.5,-29.5
       parent: 1
-      type: Transform
   - uid: 873
     components:
-    - pos: -4.5,-29.5
+    - type: Transform
+      pos: -4.5,-29.5
       parent: 1
-      type: Transform
   - uid: 874
     components:
-    - pos: -5.5,-29.5
+    - type: Transform
+      pos: -5.5,-29.5
       parent: 1
-      type: Transform
   - uid: 875
     components:
-    - pos: -3.5,-29.5
+    - type: Transform
+      pos: -3.5,-29.5
       parent: 1
-      type: Transform
   - uid: 907
     components:
-    - pos: -6.5,-31.5
+    - type: Transform
+      pos: -6.5,-31.5
       parent: 1
-      type: Transform
   - uid: 913
     components:
-    - pos: -11.5,-30.5
+    - type: Transform
+      pos: -11.5,-30.5
       parent: 1
-      type: Transform
   - uid: 915
     components:
-    - pos: -12.5,-30.5
+    - type: Transform
+      pos: -12.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1098
     components:
-    - pos: -8.5,-31.5
+    - type: Transform
+      pos: -8.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1099
     components:
-    - pos: -8.5,-30.5
+    - type: Transform
+      pos: -8.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1100
     components:
-    - pos: -9.5,-30.5
+    - type: Transform
+      pos: -9.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1101
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1102
     components:
-    - pos: -10.5,-29.5
+    - type: Transform
+      pos: -10.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1103
     components:
-    - pos: -9.5,-29.5
+    - type: Transform
+      pos: -9.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1104
     components:
-    - pos: -8.5,-29.5
+    - type: Transform
+      pos: -8.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1105
     components:
-    - pos: -7.5,-31.5
+    - type: Transform
+      pos: -7.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1106
     components:
-    - pos: -6.5,-31.5
+    - type: Transform
+      pos: -6.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1107
     components:
-    - pos: -6.5,-30.5
+    - type: Transform
+      pos: -6.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1108
     components:
-    - pos: -6.5,-29.5
+    - type: Transform
+      pos: -6.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1109
     components:
-    - pos: -7.5,-29.5
+    - type: Transform
+      pos: -7.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1110
     components:
-    - pos: -8.5,-31.5
+    - type: Transform
+      pos: -8.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1111
     components:
-    - pos: -8.5,-31.5
+    - type: Transform
+      pos: -8.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1112
     components:
-    - pos: -8.5,-30.5
+    - type: Transform
+      pos: -8.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1113
     components:
-    - pos: -9.5,-30.5
+    - type: Transform
+      pos: -9.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1114
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1115
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1116
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1117
     components:
-    - pos: -9.5,-30.5
+    - type: Transform
+      pos: -9.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1118
     components:
-    - pos: -8.5,-30.5
+    - type: Transform
+      pos: -8.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1119
     components:
-    - pos: -9.5,-30.5
+    - type: Transform
+      pos: -9.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1120
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1121
     components:
-    - pos: -11.5,-30.5
+    - type: Transform
+      pos: -11.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1122
     components:
-    - pos: -12.5,-30.5
+    - type: Transform
+      pos: -12.5,-30.5
       parent: 1
-      type: Transform
   - uid: 1123
     components:
-    - pos: -12.5,-30.5
-      parent: 1
-      type: Transform
-  - uid: 1671
-    components:
-    - pos: -5.5,-30.5
+    - type: Transform
+      pos: -12.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 1672
-    components:
-    - pos: -4.5,-30.5
-      parent: 1
-      type: Transform
   - uid: 1673
     components:
-    - pos: -3.5,-30.5
+    - type: Transform
+      pos: -3.5,-30.5
       parent: 1
-      type: Transform
 - proto: CableMV
   entities:
   - uid: 917
     components:
-    - pos: -12.5,-28.5
+    - type: Transform
+      pos: -12.5,-28.5
       parent: 1
-      type: Transform
   - uid: 918
     components:
-    - pos: -12.5,-29.5
+    - type: Transform
+      pos: -12.5,-29.5
       parent: 1
-      type: Transform
   - uid: 919
     components:
-    - pos: -12.5,-30.5
+    - type: Transform
+      pos: -12.5,-30.5
       parent: 1
-      type: Transform
   - uid: 955
     components:
-    - pos: -11.5,-29.5
+    - type: Transform
+      pos: -11.5,-29.5
       parent: 1
-      type: Transform
   - uid: 956
     components:
-    - pos: -10.5,-29.5
+    - type: Transform
+      pos: -10.5,-29.5
       parent: 1
-      type: Transform
   - uid: 957
     components:
-    - pos: -9.5,-29.5
+    - type: Transform
+      pos: -9.5,-29.5
       parent: 1
-      type: Transform
   - uid: 958
     components:
-    - pos: -8.5,-29.5
+    - type: Transform
+      pos: -8.5,-29.5
       parent: 1
-      type: Transform
   - uid: 959
     components:
-    - pos: -8.5,-29.5
+    - type: Transform
+      pos: -8.5,-29.5
       parent: 1
-      type: Transform
   - uid: 960
     components:
-    - pos: -8.5,-28.5
+    - type: Transform
+      pos: -8.5,-28.5
       parent: 1
-      type: Transform
   - uid: 961
     components:
-    - pos: -8.5,-27.5
+    - type: Transform
+      pos: -8.5,-27.5
       parent: 1
-      type: Transform
   - uid: 968
     components:
-    - pos: -3.5,-26.5
+    - type: Transform
+      pos: -3.5,-26.5
       parent: 1
-      type: Transform
   - uid: 969
     components:
-    - pos: -2.5,-26.5
+    - type: Transform
+      pos: -2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 970
     components:
-    - pos: -1.5,-26.5
+    - type: Transform
+      pos: -1.5,-26.5
       parent: 1
-      type: Transform
   - uid: 971
     components:
-    - pos: -0.5,-26.5
+    - type: Transform
+      pos: -0.5,-26.5
       parent: 1
-      type: Transform
   - uid: 972
     components:
-    - pos: 3.5,-22.5
+    - type: Transform
+      pos: 3.5,-22.5
       parent: 1
-      type: Transform
   - uid: 973
     components:
-    - pos: 5.5,-22.5
+    - type: Transform
+      pos: 5.5,-22.5
       parent: 1
-      type: Transform
   - uid: 974
     components:
-    - pos: 2.5,-22.5
+    - type: Transform
+      pos: 2.5,-22.5
       parent: 1
-      type: Transform
   - uid: 975
     components:
-    - pos: 4.5,-22.5
+    - type: Transform
+      pos: 4.5,-22.5
       parent: 1
-      type: Transform
   - uid: 976
     components:
-    - pos: -0.5,-25.5
+    - type: Transform
+      pos: -0.5,-25.5
       parent: 1
-      type: Transform
   - uid: 977
     components:
-    - pos: -0.5,-23.5
+    - type: Transform
+      pos: -0.5,-23.5
       parent: 1
-      type: Transform
   - uid: 978
     components:
-    - pos: -0.5,-24.5
+    - type: Transform
+      pos: -0.5,-24.5
       parent: 1
-      type: Transform
   - uid: 979
     components:
-    - pos: -0.5,-22.5
+    - type: Transform
+      pos: -0.5,-22.5
       parent: 1
-      type: Transform
   - uid: 980
     components:
-    - pos: 0.5,-22.5
+    - type: Transform
+      pos: 0.5,-22.5
       parent: 1
-      type: Transform
   - uid: 981
     components:
-    - pos: 3.5,-22.5
+    - type: Transform
+      pos: 3.5,-22.5
       parent: 1
-      type: Transform
   - uid: 982
     components:
-    - pos: -1.5,-23.5
+    - type: Transform
+      pos: -1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 983
     components:
-    - pos: 1.5,-23.5
+    - type: Transform
+      pos: 1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 984
     components:
-    - pos: 1.5,-22.5
+    - type: Transform
+      pos: 1.5,-22.5
       parent: 1
-      type: Transform
   - uid: 985
     components:
-    - pos: 6.5,-22.5
+    - type: Transform
+      pos: 6.5,-22.5
       parent: 1
-      type: Transform
   - uid: 986
     components:
-    - pos: 7.5,-22.5
+    - type: Transform
+      pos: 7.5,-22.5
       parent: 1
-      type: Transform
   - uid: 987
     components:
-    - pos: 8.5,-22.5
+    - type: Transform
+      pos: 8.5,-22.5
       parent: 1
-      type: Transform
   - uid: 988
     components:
-    - pos: 9.5,-22.5
+    - type: Transform
+      pos: 9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 989
     components:
-    - pos: 9.5,-21.5
+    - type: Transform
+      pos: 9.5,-21.5
       parent: 1
-      type: Transform
   - uid: 990
     components:
-    - pos: 9.5,-20.5
+    - type: Transform
+      pos: 9.5,-20.5
       parent: 1
-      type: Transform
   - uid: 991
     components:
-    - pos: 9.5,-19.5
+    - type: Transform
+      pos: 9.5,-19.5
       parent: 1
-      type: Transform
   - uid: 992
     components:
-    - pos: 10.5,-19.5
+    - type: Transform
+      pos: 10.5,-19.5
       parent: 1
-      type: Transform
   - uid: 993
     components:
-    - pos: -1.5,-23.5
+    - type: Transform
+      pos: -1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 994
     components:
-    - pos: -2.5,-23.5
+    - type: Transform
+      pos: -2.5,-23.5
       parent: 1
-      type: Transform
   - uid: 995
     components:
-    - pos: -3.5,-23.5
+    - type: Transform
+      pos: -3.5,-23.5
       parent: 1
-      type: Transform
   - uid: 996
     components:
-    - pos: -4.5,-23.5
+    - type: Transform
+      pos: -4.5,-23.5
       parent: 1
-      type: Transform
   - uid: 997
     components:
-    - pos: -5.5,-23.5
+    - type: Transform
+      pos: -5.5,-23.5
       parent: 1
-      type: Transform
   - uid: 998
     components:
-    - pos: -6.5,-23.5
+    - type: Transform
+      pos: -6.5,-23.5
       parent: 1
-      type: Transform
   - uid: 999
     components:
-    - pos: -7.5,-23.5
+    - type: Transform
+      pos: -7.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1000
     components:
-    - pos: -8.5,-23.5
+    - type: Transform
+      pos: -8.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1001
     components:
-    - pos: -9.5,-23.5
+    - type: Transform
+      pos: -9.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1002
     components:
-    - pos: -9.5,-22.5
+    - type: Transform
+      pos: -9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1003
     components:
-    - pos: -0.5,-21.5
+    - type: Transform
+      pos: -0.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1004
     components:
-    - pos: -0.5,-20.5
+    - type: Transform
+      pos: -0.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1005
     components:
-    - pos: -0.5,-19.5
+    - type: Transform
+      pos: -0.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1006
     components:
-    - pos: -0.5,-18.5
+    - type: Transform
+      pos: -0.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1007
     components:
-    - pos: -0.5,-17.5
+    - type: Transform
+      pos: -0.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1008
     components:
-    - pos: -0.5,-16.5
+    - type: Transform
+      pos: -0.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1009
     components:
-    - pos: -0.5,-15.5
+    - type: Transform
+      pos: -0.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1010
     components:
-    - pos: -0.5,-14.5
+    - type: Transform
+      pos: -0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1011
     components:
-    - pos: -0.5,-13.5
+    - type: Transform
+      pos: -0.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1012
     components:
-    - pos: -1.5,-14.5
+    - type: Transform
+      pos: -1.5,-14.5
       parent: 1
-      type: Transform
   - uid: 1013
     components:
-    - pos: -0.5,-13.5
+    - type: Transform
+      pos: -0.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1014
     components:
-    - pos: -0.5,-12.5
+    - type: Transform
+      pos: -0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1015
     components:
-    - pos: -0.5,-11.5
+    - type: Transform
+      pos: -0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1016
     components:
-    - pos: -0.5,-10.5
+    - type: Transform
+      pos: -0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1017
     components:
-    - pos: -0.5,-9.5
+    - type: Transform
+      pos: -0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1018
     components:
-    - pos: -0.5,-8.5
+    - type: Transform
+      pos: -0.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1019
     components:
-    - pos: -0.5,-7.5
+    - type: Transform
+      pos: -0.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1020
     components:
-    - pos: -0.5,-6.5
+    - type: Transform
+      pos: -0.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1021
     components:
-    - pos: -0.5,-5.5
+    - type: Transform
+      pos: -0.5,-5.5
       parent: 1
-      type: Transform
   - uid: 1022
     components:
-    - pos: -0.5,-4.5
+    - type: Transform
+      pos: -0.5,-4.5
       parent: 1
-      type: Transform
   - uid: 1023
     components:
-    - pos: -0.5,-3.5
+    - type: Transform
+      pos: -0.5,-3.5
       parent: 1
-      type: Transform
   - uid: 1024
     components:
-    - pos: -0.5,-2.5
+    - type: Transform
+      pos: -0.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1025
     components:
-    - pos: -0.5,-1.5
+    - type: Transform
+      pos: -0.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1026
     components:
-    - pos: -0.5,-0.5
+    - type: Transform
+      pos: -0.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1027
     components:
-    - pos: -0.5,0.5
+    - type: Transform
+      pos: -0.5,0.5
       parent: 1
-      type: Transform
   - uid: 1028
     components:
-    - pos: -1.5,0.5
+    - type: Transform
+      pos: -1.5,0.5
       parent: 1
-      type: Transform
   - uid: 1029
     components:
-    - pos: -1.5,-0.5
+    - type: Transform
+      pos: -1.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1030
     components:
-    - pos: -1.5,0.5
+    - type: Transform
+      pos: -1.5,0.5
       parent: 1
-      type: Transform
   - uid: 1031
     components:
-    - pos: -2.5,0.5
+    - type: Transform
+      pos: -2.5,0.5
       parent: 1
-      type: Transform
   - uid: 1032
     components:
-    - pos: -3.5,0.5
+    - type: Transform
+      pos: -3.5,0.5
       parent: 1
-      type: Transform
   - uid: 1033
     components:
-    - pos: -3.5,-1.5
+    - type: Transform
+      pos: -3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1034
     components:
-    - pos: -3.5,-0.5
+    - type: Transform
+      pos: -3.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1035
     components:
-    - pos: 3.5,-1.5
+    - type: Transform
+      pos: 3.5,-1.5
       parent: 1
-      type: Transform
   - uid: 1036
     components:
-    - pos: 3.5,-0.5
+    - type: Transform
+      pos: 3.5,-0.5
       parent: 1
-      type: Transform
   - uid: 1037
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
   - uid: 1038
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
   - uid: 1039
     components:
-    - pos: 2.5,0.5
+    - type: Transform
+      pos: 2.5,0.5
       parent: 1
-      type: Transform
   - uid: 1040
     components:
-    - pos: 1.5,0.5
+    - type: Transform
+      pos: 1.5,0.5
       parent: 1
-      type: Transform
   - uid: 1041
     components:
-    - pos: 0.5,0.5
+    - type: Transform
+      pos: 0.5,0.5
       parent: 1
-      type: Transform
   - uid: 1043
     components:
-    - pos: -3.5,-27.5
+    - type: Transform
+      pos: -3.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1044
     components:
-    - pos: -3.5,-28.5
+    - type: Transform
+      pos: -3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1046
     components:
-    - pos: 0.5,-26.5
+    - type: Transform
+      pos: 0.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1047
     components:
-    - pos: 1.5,-26.5
+    - type: Transform
+      pos: 1.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1048
     components:
-    - pos: 2.5,-26.5
+    - type: Transform
+      pos: 2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1049
     components:
-    - pos: 3.5,-26.5
+    - type: Transform
+      pos: 3.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1050
     components:
-    - pos: 4.5,-26.5
+    - type: Transform
+      pos: 4.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1051
     components:
-    - pos: 5.5,-26.5
+    - type: Transform
+      pos: 5.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1052
     components:
-    - pos: 6.5,-26.5
+    - type: Transform
+      pos: 6.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1053
     components:
-    - pos: 7.5,-26.5
+    - type: Transform
+      pos: 7.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1054
     components:
-    - pos: 7.5,-27.5
+    - type: Transform
+      pos: 7.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1055
     components:
-    - pos: 7.5,-28.5
+    - type: Transform
+      pos: 7.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1124
     components:
-    - pos: -1.5,-9.5
+    - type: Transform
+      pos: -1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1125
     components:
-    - pos: -2.5,-9.5
+    - type: Transform
+      pos: -2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1126
     components:
-    - pos: -3.5,-9.5
+    - type: Transform
+      pos: -3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1127
     components:
-    - pos: -4.5,-9.5
+    - type: Transform
+      pos: -4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1128
     components:
-    - pos: -5.5,-9.5
+    - type: Transform
+      pos: -5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1129
     components:
-    - pos: -6.5,-9.5
+    - type: Transform
+      pos: -6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1130
     components:
-    - pos: -7.5,-9.5
+    - type: Transform
+      pos: -7.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1131
     components:
-    - pos: -8.5,-9.5
+    - type: Transform
+      pos: -8.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1132
     components:
-    - pos: -9.5,-9.5
+    - type: Transform
+      pos: -9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1133
     components:
-    - pos: -10.5,-9.5
+    - type: Transform
+      pos: -10.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1134
     components:
-    - pos: -11.5,-9.5
+    - type: Transform
+      pos: -11.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1135
     components:
-    - pos: -12.5,-9.5
+    - type: Transform
+      pos: -12.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1136
     components:
-    - pos: -13.5,-9.5
+    - type: Transform
+      pos: -13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1137
     components:
-    - pos: -13.5,-10.5
+    - type: Transform
+      pos: -13.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1138
     components:
-    - pos: -13.5,-11.5
+    - type: Transform
+      pos: -13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1139
     components:
-    - pos: 0.5,-9.5
+    - type: Transform
+      pos: 0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1140
     components:
-    - pos: 1.5,-9.5
+    - type: Transform
+      pos: 1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1141
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: 2.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1142
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1143
     components:
-    - pos: 4.5,-9.5
+    - type: Transform
+      pos: 4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1144
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1145
     components:
-    - pos: 6.5,-9.5
+    - type: Transform
+      pos: 6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1146
     components:
-    - pos: 7.5,-9.5
+    - type: Transform
+      pos: 7.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1147
     components:
-    - pos: 8.5,-9.5
+    - type: Transform
+      pos: 8.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1148
     components:
-    - pos: 9.5,-9.5
+    - type: Transform
+      pos: 9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1149
     components:
-    - pos: 10.5,-9.5
+    - type: Transform
+      pos: 10.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1150
     components:
-    - pos: 11.5,-9.5
+    - type: Transform
+      pos: 11.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1151
     components:
-    - pos: 12.5,-9.5
+    - type: Transform
+      pos: 12.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1152
     components:
-    - pos: 13.5,-9.5
+    - type: Transform
+      pos: 13.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1153
     components:
-    - pos: 13.5,-10.5
+    - type: Transform
+      pos: 13.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1154
     components:
-    - pos: 13.5,-11.5
+    - type: Transform
+      pos: 13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1158
     components:
-    - pos: 3.5,-27.5
+    - type: Transform
+      pos: 3.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1159
     components:
-    - pos: 3.5,-28.5
+    - type: Transform
+      pos: 3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 1504
     components:
-    - pos: -8.5,-27.5
+    - type: Transform
+      pos: -8.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1505
     components:
-    - pos: -7.5,-27.5
+    - type: Transform
+      pos: -7.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1506
     components:
-    - pos: -6.5,-27.5
+    - type: Transform
+      pos: -6.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1507
     components:
-    - pos: -5.5,-27.5
+    - type: Transform
+      pos: -5.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1508
     components:
-    - pos: -4.5,-27.5
+    - type: Transform
+      pos: -4.5,-27.5
       parent: 1
-      type: Transform
 - proto: CableTerminal
   entities:
   - uid: 925
     components:
-    - pos: -9.5,-29.5
+    - type: Transform
+      pos: -9.5,-29.5
       parent: 1
-      type: Transform
   - uid: 927
     components:
-    - pos: -10.5,-29.5
+    - type: Transform
+      pos: -10.5,-29.5
       parent: 1
-      type: Transform
   - uid: 936
     components:
-    - pos: -8.5,-29.5
+    - type: Transform
+      pos: -8.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1097
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-31.5
       parent: 1
-      type: Transform
 - proto: CargoPallet
   entities:
   - uid: 292
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-5.5
       parent: 1
-      type: Transform
   - uid: 293
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-6.5
       parent: 1
-      type: Transform
   - uid: 294
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 295
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 296
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-5.5
       parent: 1
-      type: Transform
   - uid: 297
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-6.5
       parent: 1
-      type: Transform
   - uid: 298
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-5.5
       parent: 1
-      type: Transform
   - uid: 299
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-6.5
       parent: 1
-      type: Transform
   - uid: 300
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 301
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 302
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-5.5
       parent: 1
-      type: Transform
   - uid: 303
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-6.5
       parent: 1
-      type: Transform
   - uid: 304
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-8.5
       parent: 1
-      type: Transform
   - uid: 305
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 306
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 307
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 308
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-8.5
       parent: 1
-      type: Transform
   - uid: 309
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 310
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-8.5
       parent: 1
-      type: Transform
   - uid: 311
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 312
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 313
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 314
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-8.5
       parent: 1
-      type: Transform
   - uid: 315
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 316
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 317
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-11.5
       parent: 1
-      type: Transform
   - uid: 318
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 319
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 320
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 321
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-11.5
       parent: 1
-      type: Transform
   - uid: 322
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-11.5
       parent: 1
-      type: Transform
   - uid: 323
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 324
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 325
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-12.5
       parent: 1
-      type: Transform
   - uid: 326
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-11.5
       parent: 1
-      type: Transform
   - uid: 327
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 328
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 329
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-11.5
       parent: 1
-      type: Transform
   - uid: 330
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 331
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 332
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 333
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 334
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 335
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-11.5
       parent: 1
-      type: Transform
   - uid: 1568
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-      type: Transform
   - uid: 1569
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 1
-      type: Transform
   - uid: 1570
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,1.5
       parent: 1
-      type: Transform
   - uid: 1571
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,1.5
       parent: 1
-      type: Transform
   - uid: 1572
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,1.5
       parent: 1
-      type: Transform
   - uid: 1573
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,1.5
       parent: 1
-      type: Transform
 - proto: Catwalk
   entities:
   - uid: 233
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,14.5
       parent: 1
-      type: Transform
   - uid: 905
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,15.5
       parent: 1
-      type: Transform
   - uid: 906
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,16.5
       parent: 1
-      type: Transform
   - uid: 909
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,16.5
       parent: 1
-      type: Transform
   - uid: 910
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,15.5
       parent: 1
-      type: Transform
   - uid: 911
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,14.5
       parent: 1
-      type: Transform
   - uid: 912
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,12.5
       parent: 1
-      type: Transform
   - uid: 920
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,11.5
       parent: 1
-      type: Transform
   - uid: 921
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,10.5
       parent: 1
-      type: Transform
   - uid: 922
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,9.5
       parent: 1
-      type: Transform
   - uid: 923
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,8.5
       parent: 1
-      type: Transform
   - uid: 935
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,13.5
       parent: 1
-      type: Transform
   - uid: 1079
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,7.5
       parent: 1
-      type: Transform
   - uid: 1480
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,12.5
       parent: 1
-      type: Transform
   - uid: 1482
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,10.5
       parent: 1
-      type: Transform
   - uid: 1483
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,6.5
       parent: 1
-      type: Transform
   - uid: 1484
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,4.5
       parent: 1
-      type: Transform
   - uid: 1486
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,13.5
       parent: 1
-      type: Transform
   - uid: 1490
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,4.5
       parent: 1
-      type: Transform
   - uid: 1493
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,11.5
       parent: 1
-      type: Transform
   - uid: 1494
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,5.5
       parent: 1
-      type: Transform
   - uid: 1495
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,9.5
       parent: 1
-      type: Transform
   - uid: 1500
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,5.5
       parent: 1
-      type: Transform
   - uid: 1501
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,7.5
       parent: 1
-      type: Transform
   - uid: 1516
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,8.5
       parent: 1
-      type: Transform
   - uid: 1517
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,6.5
       parent: 1
-      type: Transform
   - uid: 1518
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,7.5
       parent: 1
-      type: Transform
   - uid: 1519
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,6.5
       parent: 1
-      type: Transform
   - uid: 1520
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,5.5
       parent: 1
-      type: Transform
   - uid: 1521
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,4.5
       parent: 1
-      type: Transform
   - uid: 1522
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 1
-      type: Transform
   - uid: 1523
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,5.5
       parent: 1
-      type: Transform
   - uid: 1524
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,6.5
       parent: 1
-      type: Transform
   - uid: 1525
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,7.5
       parent: 1
-      type: Transform
   - uid: 1526
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,4.5
       parent: 1
-      type: Transform
   - uid: 1527
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,4.5
       parent: 1
-      type: Transform
   - uid: 1528
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,4.5
       parent: 1
-      type: Transform
   - uid: 1529
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,4.5
       parent: 1
-      type: Transform
   - uid: 1530
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,4.5
       parent: 1
-      type: Transform
   - uid: 1531
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,4.5
       parent: 1
-      type: Transform
   - uid: 1532
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,4.5
       parent: 1
-      type: Transform
   - uid: 1533
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,4.5
       parent: 1
-      type: Transform
   - uid: 1534
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,5.5
       parent: 1
-      type: Transform
   - uid: 1535
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,5.5
       parent: 1
-      type: Transform
   - uid: 1536
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 1
-      type: Transform
   - uid: 1537
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,5.5
       parent: 1
-      type: Transform
   - uid: 1538
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 1
-      type: Transform
   - uid: 1539
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 1
-      type: Transform
   - uid: 1540
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,5.5
       parent: 1
-      type: Transform
 - proto: ChairOfficeDark
   entities:
   - uid: 99
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 100
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 1
-      type: Transform
   - uid: 718
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-19.5
       parent: 1
-      type: Transform
   - uid: 751
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-19.5
       parent: 1
-      type: Transform
 - proto: ChairWood
   entities:
   - uid: 664
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-21.5
       parent: 1
-      type: Transform
   - uid: 665
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-22.5
       parent: 1
-      type: Transform
   - uid: 666
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -8.5,-21.5
       parent: 1
-      type: Transform
   - uid: 667
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -8.5,-22.5
       parent: 1
-      type: Transform
   - uid: 668
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-21.5
       parent: 1
-      type: Transform
   - uid: 669
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-22.5
       parent: 1
-      type: Transform
   - uid: 670
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-21.5
       parent: 1
-      type: Transform
   - uid: 671
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-22.5
       parent: 1
-      type: Transform
-- proto: chem_master
-  entities:
-  - uid: 589
-    components:
-    - pos: -2.5,-15.5
-      parent: 1
-      type: Transform
 - proto: CircuitImprinter
   entities:
   - uid: 742
     components:
-    - pos: 5.5,-23.5
+    - type: Transform
+      pos: 5.5,-23.5
       parent: 1
-      type: Transform
 - proto: ClothingBeltSecurityFilled
   entities:
   - uid: 175
     components:
-    - pos: -2.461778,-5.5628567
+    - type: Transform
+      pos: -2.5901327,-5.535246
       parent: 1
-      type: Transform
 - proto: ClothingHeadHelmetSwatSyndicate
   entities:
   - uid: 176
     components:
-    - pos: -2.461778,-5.3284817
+    - type: Transform
+      pos: -2.2672162,-5.253996
       parent: 1
-      type: Transform
 - proto: ClothingMaskGasSwat
   entities:
   - uid: 177
     components:
-    - pos: -2.383653,-5.4222317
-      parent: 1
-      type: Transform
-- proto: ClothingOuterArmorCaptainCarapace
-  entities:
-  - uid: 782
-    components:
-    - pos: 14.521454,-16.387169
+    - type: Transform
+      pos: -2.6422162,-5.222746
       parent: 1
-      type: Transform
 - proto: ClothingShoesSwat
   entities:
   - uid: 178
     components:
-    - pos: -2.461778,-5.4847317
-      parent: 1
-      type: Transform
-- proto: ClothingUniformJumpskirtCaptain
-  entities:
-  - uid: 784
-    components:
-    - pos: 14.333954,-16.512169
-      parent: 1
-      type: Transform
-- proto: ClothingUniformJumpsuitCaptain
-  entities:
-  - uid: 785
-    components:
-    - pos: 14.740204,-16.480919
+    - type: Transform
+      pos: -2.3609662,-5.514412
       parent: 1
-      type: Transform
 - proto: ComputerAlert
   entities:
   - uid: 105
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 106
     components:
-    - pos: 5.5,-1.5
+    - type: Transform
+      pos: 5.5,-1.5
       parent: 1
-      type: Transform
 - proto: ComputerAnalysisConsole
   entities:
   - uid: 744
     components:
-    - pos: 3.5,-18.5
+    - type: Transform
+      pos: 3.5,-18.5
       parent: 1
-      type: Transform
   - uid: 748
     components:
-    - pos: 5.5,-18.5
-      parent: 1
-      type: Transform
-- proto: CrateChemistrySupplies
-  entities:
-  - uid: 340
-    components:
-    - pos: 1.5,-11.5
-      parent: 1
-      type: Transform
-- proto: CrateEmergencyAdvancedKit
-  entities:
-  - uid: 342
-    components:
-    - pos: -6.5,-9.5
-      parent: 1
-      type: Transform
-- proto: CrateEmergencyRadiationKit
-  entities:
-  - uid: 343
-    components:
-    - pos: 6.5,-11.5
-      parent: 1
-      type: Transform
-- proto: CrateEmergencyToxinKit
-  entities:
-  - uid: 344
-    components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-18.5
       parent: 1
-      type: Transform
-- proto: CrateEngineeringAMEJar
-  entities:
-  - uid: 338
-    components:
-    - pos: -5.5,-12.5
-      parent: 1
-      type: Transform
-- proto: CrateEngineeringCableBulk
-  entities:
-  - uid: 339
-    components:
-    - pos: 5.5,-8.5
-      parent: 1
-      type: Transform
-- proto: CrateEvaKit
-  entities:
-  - uid: 341
-    components:
-    - pos: -6.5,-5.5
-      parent: 1
-      type: Transform
 - proto: CrateFilledSpawner
   entities:
   - uid: 354
     components:
-    - pos: -5.5,-11.5
+    - type: Transform
+      pos: -5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 355
     components:
-    - pos: -4.5,-11.5
+    - type: Transform
+      pos: -4.5,-11.5
       parent: 1
-      type: Transform
   - uid: 356
     components:
-    - pos: -4.5,-12.5
+    - type: Transform
+      pos: -4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 357
     components:
-    - pos: -6.5,-12.5
+    - type: Transform
+      pos: -6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 358
     components:
-    - pos: -6.5,-8.5
+    - type: Transform
+      pos: -6.5,-8.5
       parent: 1
-      type: Transform
   - uid: 359
     components:
-    - pos: -5.5,-8.5
+    - type: Transform
+      pos: -5.5,-8.5
       parent: 1
-      type: Transform
   - uid: 360
     components:
-    - pos: -4.5,-9.5
+    - type: Transform
+      pos: -4.5,-9.5
       parent: 1
-      type: Transform
   - uid: 361
     components:
-    - pos: -6.5,-6.5
+    - type: Transform
+      pos: -6.5,-6.5
       parent: 1
-      type: Transform
   - uid: 362
     components:
-    - pos: -4.5,-5.5
+    - type: Transform
+      pos: -4.5,-5.5
       parent: 1
-      type: Transform
   - uid: 363
     components:
-    - pos: -4.5,-6.5
+    - type: Transform
+      pos: -4.5,-6.5
       parent: 1
-      type: Transform
   - uid: 364
     components:
-    - pos: -1.5,-10.5
+    - type: Transform
+      pos: -1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 365
     components:
-    - pos: -0.5,-11.5
+    - type: Transform
+      pos: -0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 366
     components:
-    - pos: 0.5,-11.5
+    - type: Transform
+      pos: 0.5,-11.5
       parent: 1
-      type: Transform
   - uid: 367
     components:
-    - pos: 0.5,-10.5
+    - type: Transform
+      pos: 0.5,-10.5
       parent: 1
-      type: Transform
   - uid: 368
     components:
-    - pos: 1.5,-10.5
+    - type: Transform
+      pos: 1.5,-10.5
       parent: 1
-      type: Transform
   - uid: 369
     components:
-    - pos: 4.5,-12.5
+    - type: Transform
+      pos: 4.5,-12.5
       parent: 1
-      type: Transform
   - uid: 370
     components:
-    - pos: 5.5,-11.5
+    - type: Transform
+      pos: 5.5,-11.5
       parent: 1
-      type: Transform
   - uid: 371
     components:
-    - pos: 6.5,-12.5
+    - type: Transform
+      pos: 6.5,-12.5
       parent: 1
-      type: Transform
   - uid: 372
     components:
-    - pos: 6.5,-9.5
+    - type: Transform
+      pos: 6.5,-9.5
       parent: 1
-      type: Transform
   - uid: 373
     components:
-    - pos: 6.5,-8.5
+    - type: Transform
+      pos: 6.5,-8.5
       parent: 1
-      type: Transform
   - uid: 374
     components:
-    - pos: 5.5,-9.5
+    - type: Transform
+      pos: 5.5,-9.5
       parent: 1
-      type: Transform
   - uid: 375
     components:
-    - pos: 4.5,-8.5
+    - type: Transform
+      pos: 4.5,-8.5
       parent: 1
-      type: Transform
   - uid: 376
     components:
-    - pos: 4.5,-6.5
+    - type: Transform
+      pos: 4.5,-6.5
       parent: 1
-      type: Transform
   - uid: 377
     components:
-    - pos: 5.5,-6.5
+    - type: Transform
+      pos: 5.5,-6.5
       parent: 1
-      type: Transform
   - uid: 378
     components:
-    - pos: 6.5,-6.5
+    - type: Transform
+      pos: 6.5,-6.5
       parent: 1
-      type: Transform
   - uid: 379
     components:
-    - pos: 6.5,-5.5
-      parent: 1
-      type: Transform
-- proto: CrateFunATV
-  entities:
-  - uid: 336
-    components:
-    - pos: -4.5,-8.5
-      parent: 1
-      type: Transform
-- proto: CrateFunMysteryFigurines
-  entities:
-  - uid: 346
-    components:
-    - pos: -5.5,-5.5
-      parent: 1
-      type: Transform
-- proto: CrateHydroponicsTools
-  entities:
-  - uid: 648
-    components:
-    - pos: -17.5,-18.5
-      parent: 1
-      type: Transform
-- proto: CrateMaterialGlass
-  entities:
-  - uid: 353
-    components:
-    - pos: -1.5,-11.5
-      parent: 1
-      type: Transform
-- proto: CrateMaterialPlasma
-  entities:
-  - uid: 352
-    components:
-    - pos: -5.5,-9.5
-      parent: 1
-      type: Transform
-- proto: CrateMaterialPlasteel
-  entities:
-  - uid: 347
-    components:
-    - pos: -6.5,-11.5
+    - type: Transform
+      pos: 6.5,-5.5
       parent: 1
-      type: Transform
-- proto: CrateMaterialPlastic
+- proto: CratePartsT3T4
   entities:
-  - uid: 348
+  - uid: 596
     components:
-    - pos: -0.5,-10.5
+    - type: Transform
+      pos: 13.5,-23.5
       parent: 1
-      type: Transform
-  - uid: 349
+  - uid: 776
     components:
-    - pos: 4.5,-11.5
+    - type: Transform
+      pos: 11.5,-23.5
       parent: 1
-      type: Transform
-  - uid: 350
+  - uid: 779
     components:
-    - pos: -5.5,-6.5
+    - type: Transform
+      pos: 12.5,-23.5
       parent: 1
-      type: Transform
-- proto: CrateMaterialSteel
-  entities:
-  - uid: 351
+  - uid: 784
     components:
-    - pos: 4.5,-5.5
+    - type: Transform
+      pos: 14.5,-23.5
       parent: 1
-      type: Transform
-- proto: CrateNPCEmotionalSupportSafe
-  entities:
-  - uid: 337
+  - uid: 801
     components:
-    - pos: 5.5,-12.5
+    - type: Transform
+      pos: 15.5,-23.5
       parent: 1
-      type: Transform
-- proto: CrateServiceJanitorialSupplies
+- proto: CratePartsT4
   entities:
-  - uid: 345
+  - uid: 343
     components:
-    - pos: 4.5,-9.5
+    - type: Transform
+      pos: 15.5,-21.5
       parent: 1
-      type: Transform
-- proto: CrateSyndicateLightSurplusBundle
-  entities:
-  - uid: 767
-    components:
-    - pos: 11.5,-16.5
-      parent: 1
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 75.31249
-        moles:
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
-- proto: EnergyKatana
-  entities:
-  - uid: 173
+  - uid: 772
     components:
-    - pos: -2.419681,-4.5316067
+    - type: Transform
+      pos: 15.5,-22.5
       parent: 1
-      type: Transform
 - proto: Firelock
   entities:
   - uid: 248
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -1.5,-22.5
       parent: 1
-      type: Transform
   - uid: 284
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-8.5
       parent: 1
-      type: Transform
   - uid: 285
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 286
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-10.5
       parent: 1
-      type: Transform
   - uid: 287
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 288
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,-14.5
       parent: 1
-      type: Transform
   - uid: 289
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-8.5
       parent: 1
-      type: Transform
   - uid: 290
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-9.5
       parent: 1
-      type: Transform
   - uid: 291
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-10.5
       parent: 1
-      type: Transform
   - uid: 572
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-19.5
       parent: 1
-      type: Transform
   - uid: 573
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-20.5
       parent: 1
-      type: Transform
   - uid: 574
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-21.5
       parent: 1
-      type: Transform
   - uid: 575
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -9.5,-23.5
       parent: 1
-      type: Transform
   - uid: 576
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -8.5,-14.5
       parent: 1
-      type: Transform
   - uid: 600
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,-18.5
       parent: 1
-      type: Transform
   - uid: 601
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,-18.5
       parent: 1
-      type: Transform
   - uid: 602
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-18.5
       parent: 1
-      type: Transform
   - uid: 603
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-18.5
       parent: 1
-      type: Transform
   - uid: 639
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-18.5
       parent: 1
-      type: Transform
   - uid: 640
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-19.5
       parent: 1
-      type: Transform
   - uid: 722
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-20.5
       parent: 1
-      type: Transform
   - uid: 723
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-21.5
       parent: 1
-      type: Transform
   - uid: 724
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-24.5
       parent: 1
-      type: Transform
   - uid: 725
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-24.5
       parent: 1
-      type: Transform
   - uid: 726
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-25.5
       parent: 1
-      type: Transform
   - uid: 727
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 728
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-27.5
       parent: 1
-      type: Transform
   - uid: 729
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-25.5
       parent: 1
-      type: Transform
   - uid: 730
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-26.5
       parent: 1
-      type: Transform
   - uid: 731
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-27.5
       parent: 1
-      type: Transform
   - uid: 732
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-28.5
       parent: 1
-      type: Transform
   - uid: 733
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-28.5
       parent: 1
-      type: Transform
   - uid: 734
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,-28.5
       parent: 1
-      type: Transform
   - uid: 735
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-28.5
       parent: 1
-      type: Transform
 - proto: FloorDrain
   entities:
   - uid: 415
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-12.5
       parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
   - uid: 419
     components:
-    - pos: 14.5,-12.5
+    - type: Transform
+      pos: 14.5,-12.5
       parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
   - uid: 590
     components:
-    - pos: -5.5,-18.5
+    - type: Transform
+      pos: -5.5,-18.5
       parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
   - uid: 591
     components:
-    - pos: -3.5,-18.5
+    - type: Transform
+      pos: -3.5,-18.5
       parent: 1
-      type: Transform
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
 - proto: FoodBowlBigTrash
   entities:
   - uid: 1615
     components:
-    - pos: -10.52895,-17.431107
+    - type: Transform
+      pos: -10.52895,-17.431107
       parent: 1
-      type: Transform
 - proto: FoodCornTrash
   entities:
   - uid: 1616
     components:
-    - pos: -4.4977,-22.134232
-      parent: 1
-      type: Transform
-- proto: FoodMeat
-  entities:
-  - uid: 1625
-    components:
-    - pos: -14.742225,-21.727854
-      parent: 1
-      type: Transform
-  - uid: 1626
-    components:
-    - pos: -15.070351,-22.227854
+    - type: Transform
+      pos: -4.4977,-22.134232
       parent: 1
-      type: Transform
-  - uid: 1627
-    components:
-    - pos: -14.460975,-22.055979
-      parent: 1
-      type: Transform
 - proto: FoodPlateSmallTrash
   entities:
   - uid: 1619
     components:
-    - pos: -9.563675,-19.800158
+    - type: Transform
+      pos: -9.563675,-19.800158
       parent: 1
-      type: Transform
 - proto: FoodPlateTrash
   entities:
   - uid: 1618
     components:
-    - pos: -9.48555,-21.097033
+    - type: Transform
+      pos: -9.48555,-21.097033
       parent: 1
-      type: Transform
 - proto: GasPipeStraight
   entities:
   - uid: 944
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 10.5,-29.5
       parent: 1
-      type: Transform
   - uid: 945
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-29.5
       parent: 1
-      type: Transform
-- proto: GeneratorRTG
+- proto: GeneratorBasic15kW
   entities:
-  - uid: 172
+  - uid: 152
     components:
-    - pos: -4.5,-29.5
+    - type: Transform
+      pos: -4.5,-32.5
       parent: 1
-      type: Transform
-    missingComponents:
-    - Anchorable
-  - uid: 869
+  - uid: 153
     components:
-    - pos: -3.5,-29.5
+    - type: Transform
+      pos: -3.5,-32.5
       parent: 1
-      type: Transform
-    missingComponents:
-    - Anchorable
-  - uid: 871
+  - uid: 154
     components:
-    - pos: -5.5,-29.5
+    - type: Transform
+      pos: -5.5,-32.5
       parent: 1
-      type: Transform
-    missingComponents:
-    - Anchorable
-  - uid: 1674
+  - uid: 157
     components:
-    - pos: -5.5,-30.5
+    - type: Transform
+      pos: -3.5,-31.5
       parent: 1
-      type: Transform
-  - uid: 1675
+  - uid: 158
     components:
-    - pos: -4.5,-30.5
+    - type: Transform
+      pos: -3.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 1676
+  - uid: 782
     components:
-    - pos: -3.5,-30.5
+    - type: Transform
+      pos: -3.5,-29.5
       parent: 1
-      type: Transform
-- proto: GravityGenerator
-  entities:
-  - uid: 870
+  - uid: 785
+    components:
+    - type: Transform
+      pos: -4.5,-29.5
+      parent: 1
+  - uid: 800
     components:
-    - pos: -4.5,-31.5
+    - type: Transform
+      pos: -5.5,-29.5
       parent: 1
-      type: Transform
 - proto: GravityGeneratorMini
   entities:
   - uid: 954
     components:
-    - pos: -11.5,-30.5
+    - type: Transform
+      pos: -11.5,-30.5
       parent: 1
-      type: Transform
 - proto: Grille
   entities:
   - uid: 71
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 72
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 73
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 74
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,1.5
       parent: 1
-      type: Transform
   - uid: 75
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,0.5
       parent: 1
-      type: Transform
   - uid: 76
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,2.5
       parent: 1
-      type: Transform
   - uid: 77
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,3.5
       parent: 1
-      type: Transform
   - uid: 78
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,3.5
       parent: 1
-      type: Transform
   - uid: 79
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,3.5
       parent: 1
-      type: Transform
   - uid: 80
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-      type: Transform
   - uid: 81
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,2.5
       parent: 1
-      type: Transform
   - uid: 82
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,1.5
       parent: 1
-      type: Transform
   - uid: 83
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,0.5
       parent: 1
-      type: Transform
   - uid: 84
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 85
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 86
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 430
     components:
-    - pos: 6.5,-17.5
+    - type: Transform
+      pos: 6.5,-17.5
       parent: 1
-      type: Transform
   - uid: 550
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-24.5
       parent: 1
-      type: Transform
   - uid: 551
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-24.5
       parent: 1
-      type: Transform
   - uid: 552
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-24.5
       parent: 1
-      type: Transform
   - uid: 553
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-24.5
       parent: 1
-      type: Transform
   - uid: 554
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-24.5
       parent: 1
-      type: Transform
   - uid: 555
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-21.5
       parent: 1
-      type: Transform
   - uid: 556
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-20.5
       parent: 1
-      type: Transform
   - uid: 557
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-19.5
       parent: 1
-      type: Transform
   - uid: 863
     components:
-    - pos: 5.5,-17.5
+    - type: Transform
+      pos: 5.5,-17.5
       parent: 1
-      type: Transform
   - uid: 864
     components:
-    - pos: 4.5,-17.5
+    - type: Transform
+      pos: 4.5,-17.5
       parent: 1
-      type: Transform
   - uid: 865
     components:
-    - pos: 3.5,-17.5
+    - type: Transform
+      pos: 3.5,-17.5
       parent: 1
-      type: Transform
   - uid: 866
     components:
-    - pos: 2.5,-17.5
+    - type: Transform
+      pos: 2.5,-17.5
       parent: 1
-      type: Transform
-- proto: HighSecCommandLocked
+- proto: HighSecCentralCommandLocked
   entities:
-  - uid: 91
+  - uid: 31
     components:
-    - pos: -0.5,-8.5
+    - type: Transform
+      pos: 10.5,-18.5
       parent: 1
-      type: Transform
-  - uid: 92
+  - uid: 32
     components:
-    - pos: 0.5,-8.5
+    - type: Transform
+      pos: 10.5,-21.5
       parent: 1
-      type: Transform
-  - uid: 93
+  - uid: 33
     components:
-    - pos: 0.5,-0.5
+    - type: Transform
+      pos: 10.5,-22.5
       parent: 1
-      type: Transform
-  - uid: 94
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 0.5,-8.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: -0.5,-8.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 168
     components:
-    - pos: -0.5,-0.5
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 1
-      type: Transform
 - proto: HospitalCurtains
   entities:
   - uid: 406
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -10.5,-14.5
       parent: 1
-      type: Transform
   - uid: 407
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,-14.5
       parent: 1
-      type: Transform
   - uid: 412
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-14.5
       parent: 1
-      type: Transform
   - uid: 413
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-13.5
       parent: 1
-      type: Transform
-    - secondsUntilStateChange: -1523.923
+    - type: Door
+      secondsUntilStateChange: -3065.4983
       state: Opening
-      type: Door
   - uid: 414
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 422
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 423
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-13.5
       parent: 1
-      type: Transform
   - uid: 424
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-14.5
       parent: 1
-      type: Transform
-    - secondsUntilStateChange: -5287.2925
+    - type: Door
+      secondsUntilStateChange: -6828.868
       state: Opening
-      type: Door
 - proto: hydroponicsTrayAnchored
   entities:
   - uid: 641
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -17.5,-19.5
       parent: 1
-      type: Transform
   - uid: 642
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -16.5,-19.5
       parent: 1
-      type: Transform
   - uid: 643
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-19.5
       parent: 1
-      type: Transform
   - uid: 644
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-19.5
       parent: 1
-      type: Transform
-- proto: JetpackCaptainFilled
-  entities:
-  - uid: 783
-    components:
-    - pos: 14.521454,-16.184044
-      parent: 1
-      type: Transform
 - proto: KitchenMicrowave
   entities:
   - uid: 655
     components:
-    - pos: -12.5,-23.5
+    - type: Transform
+      pos: -12.5,-23.5
       parent: 1
-      type: Transform
   - uid: 657
     components:
-    - pos: -10.5,-16.5
+    - type: Transform
+      pos: -10.5,-16.5
       parent: 1
-      type: Transform
 - proto: KitchenReagentGrinder
   entities:
   - uid: 656
     components:
-    - pos: -11.5,-23.5
+    - type: Transform
+      pos: -11.5,-23.5
       parent: 1
-      type: Transform
   - uid: 658
     components:
-    - pos: -10.5,-18.5
+    - type: Transform
+      pos: -10.5,-18.5
       parent: 1
-      type: Transform
 - proto: KitchenSpike
   entities:
   - uid: 659
     components:
-    - pos: -15.5,-21.5
+    - type: Transform
+      pos: -15.5,-21.5
       parent: 1
-      type: Transform
 - proto: LightPostSmall
   entities:
   - uid: 1514
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,17.5
       parent: 1
-      type: Transform
   - uid: 1515
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,17.5
       parent: 1
-      type: Transform
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 749
     components:
-    - pos: 3.5,-15.5
+    - type: Transform
+      pos: 3.5,-15.5
       parent: 1
-      type: Transform
   - uid: 750
     components:
-    - pos: 5.5,-15.5
-      parent: 1
-      type: Transform
-- proto: MagazinePistolSubMachineGunTopMounted
-  entities:
-  - uid: 180
-    components:
-    - pos: 2.6408477,-3.524395
+    - type: Transform
+      pos: 5.5,-15.5
       parent: 1
-      type: Transform
-  - uid: 181
-    components:
-    - pos: 2.4845977,-3.649395
-      parent: 1
-      type: Transform
 - proto: Mirror
   entities:
   - uid: 400
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-13.5
       parent: 1
-      type: Transform
   - uid: 402
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 9.5,-13.5
       parent: 1
-      type: Transform
-- proto: NitrogenCanister
+- proto: N14ContrabandCrateSpawner
   entities:
-  - uid: 962
-    components:
-    - pos: 4.5,-30.5
-      parent: 1
-      type: Transform
-  - uid: 965
+  - uid: 139
     components:
-    - pos: 4.5,-31.5
+    - type: Transform
+      pos: 2.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 1078
+  - uid: 822
     components:
-    - pos: 4.5,-29.5
+    - type: Transform
+      pos: 3.5,-15.5
       parent: 1
-      type: Transform
-- proto: OxygenCanister
-  entities:
-  - uid: 1077
+  - uid: 830
     components:
-    - pos: 4.5,-32.5
+    - type: Transform
+      pos: 2.5,-15.5
       parent: 1
-      type: Transform
 - proto: PaperBin10
   entities:
   - uid: 756
     components:
-    - pos: 5.5,-21.5
-      parent: 1
-      type: Transform
-- proto: PlasmaCanister
-  entities:
-  - uid: 1071
-    components:
-    - pos: 7.5,-29.5
+    - type: Transform
+      pos: 5.5,-21.5
       parent: 1
-      type: Transform
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 111
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-1.5
       parent: 1
-      type: Transform
   - uid: 112
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-2.5
       parent: 1
-      type: Transform
   - uid: 113
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 1
-      type: Transform
   - uid: 114
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-4.5
       parent: 1
-      type: Transform
   - uid: 115
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-5.5
       parent: 1
-      type: Transform
   - uid: 116
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-6.5
       parent: 1
-      type: Transform
   - uid: 117
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-7.5
       parent: 1
-      type: Transform
   - uid: 118
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-7.5
       parent: 1
-      type: Transform
   - uid: 119
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-6.5
       parent: 1
-      type: Transform
   - uid: 120
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-5.5
       parent: 1
-      type: Transform
   - uid: 121
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-4.5
       parent: 1
-      type: Transform
   - uid: 122
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-      type: Transform
   - uid: 123
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 1
-      type: Transform
   - uid: 124
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 1
-      type: Transform
-  - uid: 149
+  - uid: 692
     components:
-    - rot: 3.141592653589793 rad
-      pos: -1.5,-6.5
+    - type: Transform
+      pos: 11.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 150
+  - uid: 693
     components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,-6.5
+    - type: Transform
+      pos: 12.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 151
+  - uid: 716
     components:
-    - pos: -1.5,-2.5
+    - type: Transform
+      pos: 15.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 152
+  - uid: 773
     components:
-    - pos: -2.5,-2.5
+    - type: Transform
+      pos: 13.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 153
+  - uid: 774
     components:
-    - pos: 2.5,-2.5
+    - type: Transform
+      pos: 14.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 154
+  - uid: 787
     components:
-    - pos: 1.5,-2.5
+    - type: Transform
+      pos: 14.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 155
+  - uid: 788
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,-6.5
+    - type: Transform
+      pos: 13.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 156
+  - uid: 789
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,-6.5
+    - type: Transform
+      pos: 12.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 692
+  - uid: 790
     components:
-    - pos: 11.5,-16.5
+    - type: Transform
+      pos: 11.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 693
+  - uid: 791
     components:
-    - pos: 12.5,-16.5
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-23.5
       parent: 1
-      type: Transform
-  - uid: 716
-    components:
-    - pos: 15.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 773
-    components:
-    - pos: 13.5,-16.5
-      parent: 1
-      type: Transform
-  - uid: 774
-    components:
-    - pos: 14.5,-16.5
-      parent: 1
-      type: Transform
-  - uid: 787
-    components:
-    - pos: 14.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 788
-    components:
-    - pos: 13.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 789
-    components:
-    - pos: 12.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 790
-    components:
-    - pos: 11.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 791
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-23.5
-      parent: 1
-      type: Transform
   - uid: 792
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-23.5
       parent: 1
-      type: Transform
   - uid: 793
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-23.5
       parent: 1
-      type: Transform
   - uid: 794
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 14.5,-23.5
       parent: 1
-      type: Transform
   - uid: 795
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 15.5,-23.5
       parent: 1
-      type: Transform
   - uid: 796
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-21.5
       parent: 1
-      type: Transform
   - uid: 797
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-22.5
       parent: 1
-      type: Transform
   - uid: 878
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 14.5,-18.5
       parent: 1
-      type: Transform
   - uid: 879
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 14.5,-17.5
       parent: 1
-      type: Transform
 - proto: PlastitaniumWindow
   entities:
   - uid: 3
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 4
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 5
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 6
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-1.5
       parent: 1
-      type: Transform
   - uid: 7
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-2.5
       parent: 1
-      type: Transform
   - uid: 8
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-3.5
       parent: 1
-      type: Transform
   - uid: 15
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,2.5
       parent: 1
-      type: Transform
   - uid: 16
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,1.5
       parent: 1
-      type: Transform
   - uid: 17
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,0.5
       parent: 1
-      type: Transform
   - uid: 18
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,1.5
       parent: 1
-      type: Transform
   - uid: 19
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,0.5
       parent: 1
-      type: Transform
   - uid: 20
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,2.5
       parent: 1
-      type: Transform
   - uid: 21
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,3.5
       parent: 1
-      type: Transform
   - uid: 22
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,3.5
       parent: 1
-      type: Transform
   - uid: 24
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,3.5
       parent: 1
-      type: Transform
   - uid: 95
     components:
-    - pos: 2.5,3.5
+    - type: Transform
+      pos: 2.5,3.5
       parent: 1
-      type: Transform
   - uid: 429
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-19.5
       parent: 1
-      type: Transform
   - uid: 431
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-21.5
       parent: 1
-      type: Transform
   - uid: 544
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-24.5
       parent: 1
-      type: Transform
   - uid: 545
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-24.5
       parent: 1
-      type: Transform
   - uid: 546
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-24.5
       parent: 1
-      type: Transform
   - uid: 547
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-24.5
       parent: 1
-      type: Transform
   - uid: 548
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-24.5
       parent: 1
-      type: Transform
   - uid: 736
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-17.5
       parent: 1
-      type: Transform
   - uid: 737
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-17.5
       parent: 1
-      type: Transform
   - uid: 738
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-17.5
       parent: 1
-      type: Transform
   - uid: 739
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-17.5
       parent: 1
-      type: Transform
   - uid: 747
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-17.5
       parent: 1
-      type: Transform
   - uid: 867
     components:
-    - pos: -1.5,-20.5
+    - type: Transform
+      pos: -1.5,-20.5
+      parent: 1
+- proto: PlastitaniumWindowIndestructible
+  entities:
+  - uid: 763
+    components:
+    - type: Transform
+      pos: 10.5,-17.5
       parent: 1
-      type: Transform
 - proto: PlushieCorgi
   entities:
   - uid: 695
     components:
-    - pos: 17.982115,-12.495051
+    - type: Transform
+      pos: 17.982115,-12.495051
       parent: 1
-      type: Transform
 - proto: PlushieGirlyCorgi
   entities:
   - uid: 877
     components:
-    - pos: 17.044615,-12.479426
+    - type: Transform
+      pos: 17.044615,-12.479426
       parent: 1
-      type: Transform
 - proto: PlushieJester
   entities:
   - uid: 880
     components:
-    - pos: -16.414333,-12.510676
+    - type: Transform
+      pos: -16.414333,-12.510676
       parent: 1
-      type: Transform
 - proto: PlushieLizard
   entities:
   - uid: 1680
     components:
-    - pos: -16.836208,-12.729426
+    - type: Transform
+      pos: -16.836208,-12.729426
       parent: 1
-      type: Transform
 - proto: PlushieSlips
   entities:
   - uid: 1679
     components:
-    - pos: -16.508083,-12.916926
+    - type: Transform
+      pos: -16.508083,-12.916926
       parent: 1
-      type: Transform
 - proto: PortableScrubber
   entities:
   - uid: 768
     components:
-    - pos: 11.5,-29.5
+    - type: Transform
+      pos: 11.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1667
     components:
-    - pos: 12.5,-29.5
+    - type: Transform
+      pos: 12.5,-29.5
       parent: 1
-      type: Transform
 - proto: Poweredlight
   entities:
   - uid: 930
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -0.5,-18.5
       parent: 1
-      type: Transform
   - uid: 931
     components:
-    - pos: -8.5,-25.5
+    - type: Transform
+      pos: -8.5,-25.5
       parent: 1
-      type: Transform
   - uid: 932
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,-18.5
       parent: 1
-      type: Transform
   - uid: 933
     components:
-    - pos: -16.5,-25.5
+    - type: Transform
+      pos: -16.5,-25.5
       parent: 1
-      type: Transform
   - uid: 934
     components:
-    - pos: -12.5,-25.5
+    - type: Transform
+      pos: -12.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1076
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -16.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1080
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -12.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1417
     components:
-    - pos: -2.5,-25.5
+    - type: Transform
+      pos: -2.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1418
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1419
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1420
     components:
-    - pos: 2.5,-25.5
+    - type: Transform
+      pos: 2.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1421
     components:
-    - pos: 8.5,-25.5
+    - type: Transform
+      pos: 8.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1422
     components:
-    - pos: 12.5,-25.5
+    - type: Transform
+      pos: 12.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1423
     components:
-    - pos: 15.5,-25.5
+    - type: Transform
+      pos: 15.5,-25.5
       parent: 1
-      type: Transform
   - uid: 1424
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1425
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 15.5,-27.5
       parent: 1
-      type: Transform
   - uid: 1426
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1427
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1428
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -12.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1431
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 12.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1432
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,-29.5
       parent: 1
-      type: Transform
   - uid: 1433
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-31.5
       parent: 1
-      type: Transform
   - uid: 1434
     components:
-    - pos: 2.5,-18.5
+    - type: Transform
+      pos: 2.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1435
     components:
-    - pos: 6.5,-18.5
+    - type: Transform
+      pos: 6.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1436
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 4.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1437
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1438
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1439
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1440
     components:
-    - pos: 11.5,-16.5
+    - type: Transform
+      pos: 11.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1441
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 16.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1442
     components:
-    - pos: 12.5,-20.5
+    - type: Transform
+      pos: 12.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1443
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 12.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1444
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1445
     components:
-    - pos: -10.5,-12.5
+    - type: Transform
+      pos: -10.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1446
     components:
-    - pos: 10.5,-12.5
+    - type: Transform
+      pos: 10.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1447
     components:
-    - pos: -17.5,-8.5
+    - type: Transform
+      pos: -17.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1448
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -17.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1449
     components:
-    - pos: 5.5,-5.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 1450
     components:
-    - pos: -5.5,-5.5
+    - type: Transform
+      pos: -5.5,-5.5
       parent: 1
-      type: Transform
   - uid: 1451
     components:
-    - pos: -11.5,-8.5
+    - type: Transform
+      pos: -11.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1452
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -11.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1453
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 11.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1454
     components:
-    - pos: 11.5,-8.5
+    - type: Transform
+      pos: 11.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1455
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -6.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1456
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 7.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1457
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 17.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1458
     components:
-    - pos: 17.5,-8.5
+    - type: Transform
+      pos: 17.5,-8.5
       parent: 1
-      type: Transform
   - uid: 1459
     components:
-    - pos: -1.5,-9.5
+    - type: Transform
+      pos: -1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1460
     components:
-    - pos: 1.5,-9.5
+    - type: Transform
+      pos: 1.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1461
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -8.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1462
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 8.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1463
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1464
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1465
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1466
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1467
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1468
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 1
-      type: Transform
   - uid: 1469
     components:
-    - pos: -1.5,2.5
+    - type: Transform
+      pos: -1.5,2.5
       parent: 1
-      type: Transform
   - uid: 1470
     components:
-    - pos: 1.5,2.5
+    - type: Transform
+      pos: 1.5,2.5
       parent: 1
-      type: Transform
   - uid: 1471
     components:
-    - pos: -7.5,-15.5
+    - type: Transform
+      pos: -7.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1472
     components:
-    - pos: -4.5,-15.5
+    - type: Transform
+      pos: -4.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1473
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-23.5
       parent: 1
-      type: Transform
   - uid: 1474
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -12.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1475
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -12.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1476
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1477
     components:
-    - pos: -15.5,-17.5
+    - type: Transform
+      pos: -15.5,-17.5
       parent: 1
-      type: Transform
 - proto: PoweredlightLED
   entities:
   - uid: 1083
     components:
-    - pos: 5.5,7.5
+    - type: Transform
+      pos: 5.5,7.5
       parent: 1
-      type: Transform
   - uid: 1511
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -5.5,8.5
       parent: 1
-      type: Transform
   - uid: 1512
     components:
-    - pos: -6.5,7.5
+    - type: Transform
+      pos: -6.5,7.5
       parent: 1
-      type: Transform
   - uid: 1513
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,8.5
       parent: 1
-      type: Transform
 - proto: Protolathe
   entities:
   - uid: 740
     components:
-    - pos: 4.5,-23.5
+    - type: Transform
+      pos: 4.5,-23.5
       parent: 1
-      type: Transform
 - proto: Rack
   entities:
   - uid: 161
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-3.5
       parent: 1
-      type: Transform
   - uid: 162
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-4.5
       parent: 1
-      type: Transform
   - uid: 163
     components:
-    - pos: 2.5,-3.5
+    - type: Transform
+      pos: 2.5,-3.5
       parent: 1
-      type: Transform
   - uid: 164
     components:
-    - pos: -2.5,-5.5
+    - type: Transform
+      pos: -2.5,-5.5
       parent: 1
-      type: Transform
   - uid: 165
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
-      type: Transform
   - uid: 166
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 167
-    components:
-    - pos: -1.5,-6.5
-      parent: 1
-      type: Transform
-  - uid: 168
-    components:
-    - pos: 1.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 169
-    components:
-    - pos: -1.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 170
+  - uid: 336
     components:
-    - pos: 1.5,-6.5
+    - type: Transform
+      pos: 2.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 780
+  - uid: 339
     components:
-    - pos: 12.5,-16.5
+    - type: Transform
+      pos: 2.5,-6.5
       parent: 1
-      type: Transform
   - uid: 781
     components:
-    - pos: 14.5,-16.5
+    - type: Transform
+      pos: 14.5,-16.5
       parent: 1
-      type: Transform
   - uid: 804
     components:
-    - pos: 15.5,-20.5
+    - type: Transform
+      pos: 15.5,-20.5
       parent: 1
-      type: Transform
   - uid: 805
     components:
-    - pos: 14.5,-20.5
+    - type: Transform
+      pos: 14.5,-20.5
       parent: 1
-      type: Transform
   - uid: 806
     components:
-    - pos: 13.5,-20.5
+    - type: Transform
+      pos: 13.5,-20.5
       parent: 1
-      type: Transform
   - uid: 807
     components:
-    - pos: 12.5,-20.5
+    - type: Transform
+      pos: 12.5,-20.5
       parent: 1
-      type: Transform
   - uid: 808
     components:
-    - pos: 11.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 830
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 15.5,-23.5
-      parent: 1
-      type: Transform
-  - uid: 835
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 14.5,-23.5
-      parent: 1
-      type: Transform
-  - uid: 840
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 13.5,-23.5
+    - type: Transform
+      pos: 11.5,-20.5
       parent: 1
-      type: Transform
-  - uid: 845
+  - uid: 812
     components:
-    - rot: 3.141592653589793 rad
-      pos: 12.5,-23.5
+    - type: Transform
+      pos: -2.5,-2.5
       parent: 1
-      type: Transform
-  - uid: 850
+  - uid: 814
     components:
-    - rot: 3.141592653589793 rad
-      pos: 11.5,-23.5
+    - type: Transform
+      pos: -2.5,-6.5
       parent: 1
-      type: Transform
 - proto: Railing
   entities:
   - uid: 908
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,7.5
       parent: 1
-      type: Transform
   - uid: 1541
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,7.5
       parent: 1
-      type: Transform
   - uid: 1542
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,6.5
       parent: 1
-      type: Transform
   - uid: 1543
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,5.5
       parent: 1
-      type: Transform
   - uid: 1544
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,4.5
       parent: 1
-      type: Transform
   - uid: 1545
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,3.5
       parent: 1
-      type: Transform
   - uid: 1546
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,6.5
       parent: 1
-      type: Transform
   - uid: 1547
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,5.5
       parent: 1
-      type: Transform
   - uid: 1548
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,4.5
       parent: 1
-      type: Transform
   - uid: 1549
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,3.5
       parent: 1
-      type: Transform
   - uid: 1550
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,9.5
       parent: 1
-      type: Transform
   - uid: 1551
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,10.5
       parent: 1
-      type: Transform
   - uid: 1552
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,11.5
       parent: 1
-      type: Transform
   - uid: 1553
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,12.5
       parent: 1
-      type: Transform
   - uid: 1554
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,13.5
       parent: 1
-      type: Transform
   - uid: 1555
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,14.5
       parent: 1
-      type: Transform
   - uid: 1556
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,15.5
       parent: 1
-      type: Transform
   - uid: 1557
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,16.5
       parent: 1
-      type: Transform
   - uid: 1558
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,16.5
       parent: 1
-      type: Transform
   - uid: 1559
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,15.5
       parent: 1
-      type: Transform
   - uid: 1560
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,14.5
       parent: 1
-      type: Transform
   - uid: 1561
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,13.5
       parent: 1
-      type: Transform
   - uid: 1562
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,12.5
       parent: 1
-      type: Transform
   - uid: 1563
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,11.5
       parent: 1
-      type: Transform
   - uid: 1564
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,10.5
       parent: 1
-      type: Transform
   - uid: 1565
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,9.5
       parent: 1
-      type: Transform
   - uid: 1566
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,8.5
       parent: 1
-      type: Transform
 - proto: RandomArcade
   entities:
-  - uid: 563
+  - uid: 344
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,-16.5
+    - type: Transform
+      pos: -7.5,-15.5
       parent: 1
-      type: Transform
-  - uid: 596
+- proto: RandomCargoSpawner
+  entities:
+  - uid: 91
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,-18.5
+    - type: Transform
+      pos: 5.5,-8.5
       parent: 1
-      type: Transform
-  - uid: 597
+  - uid: 93
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,-17.5
+    - type: Transform
+      pos: 5.5,-12.5
       parent: 1
-      type: Transform
-- proto: RandomMagicBookSafe
-  entities:
-  - uid: 876
+  - uid: 125
     components:
-    - pos: 2.5,-4.5
+    - type: Transform
+      pos: -5.5,-12.5
       parent: 1
-      type: Transform
-- proto: RandomSoap
-  entities:
-  - uid: 881
+  - uid: 126
     components:
-    - pos: -14.5,-12.5
+    - type: Transform
+      pos: -0.5,-10.5
       parent: 1
-      type: Transform
-  - uid: 1681
+  - uid: 140
     components:
-    - pos: 14.5,-12.5
+    - type: Transform
+      pos: -4.5,-8.5
       parent: 1
-      type: Transform
-- proto: RandomSpawner100
-  entities:
-  - uid: 1567
+  - uid: 142
     components:
-    - pos: 18.5,-27.5
+    - type: Transform
+      pos: 4.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 1580
+  - uid: 146
     components:
-    - pos: -7.5,-21.5
+    - type: Transform
+      pos: 6.5,-11.5
       parent: 1
-      type: Transform
-  - uid: 1581
+  - uid: 151
     components:
-    - pos: -16.5,-18.5
+    - type: Transform
+      pos: -5.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 1582
+  - uid: 169
     components:
-    - pos: -11.5,-25.5
+    - type: Transform
+      pos: -5.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 1583
+  - uid: 173
     components:
-    - pos: -3.5,-27.5
+    - type: Transform
+      pos: 4.5,-11.5
       parent: 1
-      type: Transform
-  - uid: 1584
+  - uid: 179
     components:
-    - pos: 0.5,-31.5
+    - type: Transform
+      pos: 4.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 1585
+  - uid: 346
     components:
-    - pos: 9.5,-25.5
+    - type: Transform
+      pos: -5.5,-6.5
       parent: 1
-      type: Transform
-  - uid: 1586
+  - uid: 347
     components:
-    - pos: -5.5,16.5
+    - type: Transform
+      pos: -1.5,-11.5
       parent: 1
-      type: Transform
-  - uid: 1587
+  - uid: 348
     components:
-    - pos: 5.5,-29.5
+    - type: Transform
+      pos: 1.5,-11.5
       parent: 1
-      type: Transform
-  - uid: 1588
+  - uid: 353
     components:
-    - pos: -0.5,-20.5
+    - type: Transform
+      pos: -6.5,-9.5
       parent: 1
-      type: Transform
-  - uid: 1589
+  - uid: 829
     components:
-    - pos: 0.5,-16.5
+    - type: Transform
+      pos: -6.5,-11.5
       parent: 1
-      type: Transform
-  - uid: 1590
+- proto: RandomSoap
+  entities:
+  - uid: 881
     components:
-    - pos: -14.5,-13.5
+    - type: Transform
+      pos: -14.5,-12.5
       parent: 1
-      type: Transform
-  - uid: 1591
+  - uid: 1681
     components:
-    - pos: -11.5,-12.5
+    - type: Transform
+      pos: 14.5,-12.5
       parent: 1
-      type: Transform
-  - uid: 1592
+- proto: SalvageMaterialCrateSpawner
+  entities:
+  - uid: 1574
     components:
-    - pos: -12.5,-14.5
+    - type: Transform
+      pos: -2.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1593
+  - uid: 1575
     components:
-    - pos: 11.5,-12.5
+    - type: Transform
+      pos: -3.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1594
+  - uid: 1576
     components:
-    - pos: 12.5,-14.5
+    - type: Transform
+      pos: -0.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1595
+  - uid: 1577
     components:
-    - pos: 14.5,-13.5
+    - type: Transform
+      pos: 0.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1596
+  - uid: 1578
     components:
-    - pos: 19.5,-8.5
+    - type: Transform
+      pos: 2.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1597
+  - uid: 1579
     components:
-    - pos: 13.5,-10.5
+    - type: Transform
+      pos: 3.5,1.5
       parent: 1
-      type: Transform
-  - uid: 1598
+- proto: SeedExtractor
+  entities:
+  - uid: 646
     components:
-    - pos: 13.5,-8.5
+    - type: Transform
+      pos: -16.5,-17.5
       parent: 1
-      type: Transform
-  - uid: 1599
+- proto: SignConspiracyBoard
+  entities:
+  - uid: 755
     components:
-    - pos: 6.5,-7.5
+    - type: MetaData
+      desc: Seems like a board connecting different factions and items to one another, but the language is foriegn to you.
+      name: Unknown Scrawls
+    - type: Transform
+      pos: 3.5,-21.5
       parent: 1
-      type: Transform
-  - uid: 1600
+- proto: SinkStemlessWater
+  entities:
+  - uid: 398
     components:
-    - pos: -1.5,-13.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,-13.5
       parent: 1
-      type: Transform
-  - uid: 1601
+  - uid: 399
     components:
-    - pos: -8.5,-8.5
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-13.5
       parent: 1
-      type: Transform
-  - uid: 1602
+- proto: SMESBasic
+  entities:
+  - uid: 926
     components:
-    - pos: -8.5,-12.5
+    - type: Transform
+      pos: -8.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 1603
+  - uid: 928
     components:
-    - pos: -3.5,-10.5
+    - type: Transform
+      pos: -10.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 1604
+  - uid: 929
     components:
-    - pos: 2.5,-9.5
+    - type: Transform
+      pos: -9.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 1605
+  - uid: 1081
     components:
-    - pos: 2.5,-13.5
+    - type: Transform
+      pos: -8.5,-31.5
       parent: 1
-      type: Transform
-  - uid: 1606
+- proto: soda_dispenser
+  entities:
+  - uid: 587
     components:
-    - pos: 8.5,-10.5
+    - type: Transform
+      pos: -4.5,-15.5
       parent: 1
-      type: Transform
-  - uid: 1607
+- proto: SpawnDungeonLootArmoryRare
+  entities:
+  - uid: 134
     components:
-    - pos: -4.5,1.5
+    - type: Transform
+      pos: 15.647137,-17.521189
       parent: 1
-      type: Transform
-  - uid: 1608
+  - uid: 138
     components:
-    - pos: 3.5,2.5
+    - type: Transform
+      pos: 14.539088,-16.392649
       parent: 1
-      type: Transform
-  - uid: 1609
+  - uid: 148
     components:
-    - pos: -5.5,4.5
+    - type: Transform
+      pos: -2.5797162,-4.285246
       parent: 1
-      type: Transform
-  - uid: 1610
+  - uid: 337
     components:
-    - pos: 4.5,8.5
+    - type: Transform
+      pos: -2.3088827,-4.472746
       parent: 1
-      type: Transform
-  - uid: 1611
+  - uid: 338
     components:
-    - pos: -4.5,11.5
+    - type: Transform
+      pos: -2.3061519,-3.42457
       parent: 1
-      type: Transform
-  - uid: 1612
+  - uid: 770
     components:
-    - pos: -3.5,9.5
+    - type: Transform
+      pos: 16.293282,-18.270037
       parent: 1
-      type: Transform
-  - uid: 1614
+  - uid: 823
     components:
-    - pos: 2.5,4.5
+    - type: Transform
+      pos: -2.5769854,-3.33082
       parent: 1
-      type: Transform
-- proto: ResearchDisk
+- proto: SpawnDungeonLootCanister
   entities:
-  - uid: 812
+  - uid: 92
     components:
-    - pos: 15.582792,-20.514729
+    - type: Transform
+      pos: 3.5,-31.5
       parent: 1
-      type: Transform
-  - uid: 813
+  - uid: 94
     components:
-    - pos: 12.504667,-20.530354
+    - type: Transform
+      pos: 4.5,-32.5
       parent: 1
-      type: Transform
-  - uid: 814
+  - uid: 141
     components:
-    - pos: 11.582792,-20.545979
+    - type: Transform
+      pos: 3.5,-32.5
       parent: 1
-      type: Transform
-  - uid: 822
+  - uid: 144
     components:
-    - pos: 14.489042,-20.514729
+    - type: Transform
+      pos: 4.5,-29.5
       parent: 1
-      type: Transform
-  - uid: 823
+  - uid: 145
     components:
-    - pos: 13.567167,-20.545979
+    - type: Transform
+      pos: 4.5,-30.5
       parent: 1
-      type: Transform
-- proto: ResearchDisk10000
-  entities:
-  - uid: 820
+  - uid: 172
     components:
-    - pos: 14.285917,-20.545979
+    - type: Transform
+      pos: 4.5,-31.5
       parent: 1
-      type: Transform
-  - uid: 821
+  - uid: 174
     components:
-    - pos: 13.442167,-20.499104
+    - type: Transform
+      pos: 3.5,-29.5
       parent: 1
-      type: Transform
-  - uid: 827
+  - uid: 180
     components:
-    - pos: 12.629667,-20.545979
+    - type: Transform
+      pos: 9.5,-29.5
       parent: 1
-      type: Transform
-- proto: ResearchDisk5000
-  entities:
-  - uid: 811
+  - uid: 350
     components:
-    - pos: 14.910917,-20.561604
+    - type: Transform
+      pos: 3.5,-30.5
       parent: 1
-      type: Transform
-  - uid: 815
+  - uid: 597
     components:
-    - pos: 12.145292,-20.530354
+    - type: Transform
+      pos: 7.5,-29.5
       parent: 1
-      type: Transform
-  - uid: 824
+  - uid: 648
     components:
-    - pos: 12.973417,-20.545979
+    - type: Transform
+      pos: 6.5,-29.5
       parent: 1
-      type: Transform
-  - uid: 828
+  - uid: 694
     components:
-    - pos: 13.910917,-20.561604
+    - type: Transform
+      pos: 7.5,-31.5
       parent: 1
-      type: Transform
-- proto: RGBStaff
-  entities:
-  - uid: 779
+  - uid: 757
     components:
-    - pos: 12.535913,-16.465294
+    - type: Transform
+      pos: 8.5,-31.5
       parent: 1
-      type: Transform
-- proto: SalvageCanisterSpawner
-  entities:
-  - uid: 963
+  - uid: 758
     components:
-    - pos: 9.5,-29.5
+    - type: Transform
+      pos: 6.5,-31.5
       parent: 1
-      type: Transform
-  - uid: 966
+- proto: SpawnDungeonLootCrateArmoryArmor
+  entities:
+  - uid: 342
     components:
-    - pos: 6.5,-29.5
+    - type: Transform
+      pos: 12.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 967
+- proto: SpawnDungeonLootCrateArmoryWeapon
+  entities:
+  - uid: 147
     components:
-    - pos: 7.5,-31.5
+    - type: Transform
+      pos: 11.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 1072
+- proto: SpawnDungeonLootCrateVehicle
+  entities:
+  - uid: 149
     components:
-    - pos: 8.5,-31.5
+    - type: Transform
+      pos: 5.5,-5.5
       parent: 1
-      type: Transform
-  - uid: 1074
+  - uid: 150
     components:
-    - pos: 6.5,-31.5
+    - type: Transform
+      pos: -6.5,-5.5
       parent: 1
-      type: Transform
-- proto: SalvageMaterialCrateSpawner
+- proto: SpawnDungeonLootFood
   entities:
-  - uid: 1574
+  - uid: 349
     components:
-    - pos: -2.5,1.5
+    - type: Transform
+      pos: -14.583118,-21.524698
       parent: 1
-      type: Transform
-  - uid: 1575
+  - uid: 351
     components:
-    - pos: -3.5,1.5
+    - type: Transform
+      pos: -14.426868,-22.274698
       parent: 1
-      type: Transform
-  - uid: 1576
+  - uid: 352
     components:
-    - pos: -0.5,1.5
+    - type: Transform
+      pos: -15.103952,-22.441364
       parent: 1
-      type: Transform
-  - uid: 1577
+- proto: SpawnDungeonLootMaterialsValuableFull
+  entities:
+  - uid: 181
     components:
-    - pos: 0.5,1.5
+    - type: Transform
+      pos: -2.4832354,-2.372488
       parent: 1
-      type: Transform
-  - uid: 1578
+  - uid: 815
     components:
-    - pos: 2.5,1.5
+    - type: Transform
+      pos: -2.3374019,-2.33082
       parent: 1
-      type: Transform
-  - uid: 1579
+  - uid: 816
     components:
-    - pos: 3.5,1.5
+    - type: Transform
+      pos: -2.4832354,-2.216238
       parent: 1
-      type: Transform
-- proto: SalvagePartsT3Spawner
-  entities:
-  - uid: 829
+  - uid: 860
     components:
-    - pos: 12.5,-23.5
+    - type: Transform
+      pos: -2.535338,-2.3554745
       parent: 1
-      type: Transform
-  - uid: 831
+  - uid: 868
     components:
-    - pos: 13.5,-23.5
+    - type: Transform
+      pos: -2.420755,-2.3867245
       parent: 1
-      type: Transform
-  - uid: 832
+- proto: SpawnDungeonLootRnDDisk
+  entities:
+  - uid: 130
     components:
-    - pos: 14.5,-23.5
+    - type: Transform
+      pos: 15.355455,-20.454132
       parent: 1
-      type: Transform
-  - uid: 834
+  - uid: 131
     components:
-    - pos: 13.5,-23.5
+    - type: Transform
+      pos: 12.647122,-20.422882
       parent: 1
-      type: Transform
-  - uid: 836
+  - uid: 397
     components:
-    - pos: 12.5,-23.5
+    - type: Transform
+      pos: 12.324205,-20.422882
       parent: 1
-      type: Transform
-  - uid: 837
+  - uid: 563
     components:
-    - pos: 15.5,-23.5
+    - type: Transform
+      pos: 14.657538,-20.391632
       parent: 1
-      type: Transform
-  - uid: 839
+  - uid: 588
     components:
-    - pos: 14.5,-23.5
+    - type: Transform
+      pos: 15.678372,-20.46455
       parent: 1
-      type: Transform
-  - uid: 841
+  - uid: 589
     components:
-    - pos: 11.5,-23.5
+    - type: Transform
+      pos: 13.282538,-20.412466
       parent: 1
-      type: Transform
-  - uid: 844
+  - uid: 818
     components:
-    - pos: 15.5,-23.5
+    - type: Transform
+      pos: 11.782538,-20.412466
       parent: 1
-      type: Transform
-  - uid: 846
+  - uid: 819
     components:
-    - pos: 11.5,-23.5
+    - type: Transform
+      pos: 13.626288,-20.412466
       parent: 1
-      type: Transform
-  - uid: 849
+  - uid: 820
     components:
-    - pos: 15.5,-23.5
+    - type: Transform
+      pos: 14.313788,-20.412466
       parent: 1
-      type: Transform
-  - uid: 851
+  - uid: 821
     components:
-    - pos: 12.5,-23.5
+    - type: Transform
+      pos: 11.511705,-20.412466
       parent: 1
-      type: Transform
-  - uid: 854
+  - uid: 869
     components:
-    - pos: 14.5,-23.5
+    - type: Transform
+      pos: 11.724657,-20.39805
       parent: 1
-      type: Transform
-  - uid: 855
+  - uid: 870
     components:
-    - pos: 11.5,-23.5
+    - type: Transform
+      pos: 12.505907,-20.418884
       parent: 1
-      type: Transform
-  - uid: 856
+  - uid: 871
+    components:
+    - type: Transform
+      pos: 13.422574,-20.4293
+      parent: 1
+  - uid: 876
+    components:
+    - type: Transform
+      pos: 14.578824,-20.39805
+      parent: 1
+  - uid: 937
+    components:
+    - type: Transform
+      pos: 15.432991,-20.502216
+      parent: 1
+- proto: SpawnDungeonLootSeed
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -13.476086,-19.409409
+      parent: 1
+  - uid: 345
     components:
-    - pos: 13.5,-23.5
+    - type: Transform
+      pos: -13.507336,-18.482325
       parent: 1
-      type: Transform
-- proto: SalvagePartsT4Spawner
+- proto: SpawnDungeonLootSpesos
   entities:
+  - uid: 340
+    components:
+    - type: Transform
+      pos: -2.3374019,-6.33082
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 2.4125981,-6.20582
+      parent: 1
+  - uid: 802
+    components:
+    - type: Transform
+      pos: 2.4334316,-6.54957
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: 2.6105149,-2.33082
+      parent: 1
+  - uid: 809
+    components:
+    - type: Transform
+      pos: 2.4855149,-2.51832
+      parent: 1
+  - uid: 810
+    components:
+    - type: Transform
+      pos: 2.6105149,-6.372488
+      parent: 1
+  - uid: 811
+    components:
+    - type: Transform
+      pos: 2.4230149,-2.247488
+      parent: 1
+  - uid: 813
+    components:
+    - type: Transform
+      pos: -2.6082354,-6.226654
+      parent: 1
+  - uid: 817
+    components:
+    - type: Transform
+      pos: -2.5457354,-6.54957
+      parent: 1
+  - uid: 831
+    components:
+    - type: Transform
+      pos: -2.577005,-6.4464664
+      parent: 1
+  - uid: 832
+    components:
+    - type: Transform
+      pos: -2.5249214,-6.3631344
+      parent: 1
   - uid: 833
     components:
-    - pos: 15.5,-23.5
+    - type: Transform
+      pos: -2.389505,-6.4464664
+      parent: 1
+  - uid: 834
+    components:
+    - type: Transform
+      pos: -2.4936714,-6.5714664
+      parent: 1
+  - uid: 835
+    components:
+    - type: Transform
+      pos: -2.6186714,-6.5089664
+      parent: 1
+  - uid: 836
+    components:
+    - type: Transform
+      pos: -2.629088,-6.4360504
+      parent: 1
+  - uid: 837
+    components:
+    - type: Transform
+      pos: -2.3061714,-6.3423004
+      parent: 1
+  - uid: 838
+    components:
+    - type: Transform
+      pos: -2.4936714,-6.4673004
+      parent: 1
+  - uid: 839
+    components:
+    - type: Transform
+      pos: -2.566588,-6.3631344
+      parent: 1
+  - uid: 840
+    components:
+    - type: Transform
+      pos: -2.472838,-6.3423004
+      parent: 1
+  - uid: 841
+    components:
+    - type: Transform
+      pos: 2.464662,-2.5298004
       parent: 1
-      type: Transform
   - uid: 842
     components:
-    - pos: 11.5,-23.5
+    - type: Transform
+      pos: 2.4750786,-2.3943844
+      parent: 1
+  - uid: 843
+    components:
+    - type: Transform
+      pos: 2.6938286,-2.4985504
+      parent: 1
+  - uid: 844
+    components:
+    - type: Transform
+      pos: 2.5063286,-2.4881344
+      parent: 1
+  - uid: 845
+    components:
+    - type: Transform
+      pos: 2.4542456,-2.3527164
+      parent: 1
+  - uid: 846
+    components:
+    - type: Transform
+      pos: 2.7563286,-2.3735504
       parent: 1
-      type: Transform
   - uid: 847
     components:
-    - pos: 12.5,-23.5
+    - type: Transform
+      pos: 2.7250786,-2.4881344
+      parent: 1
+  - uid: 848
+    components:
+    - type: Transform
+      pos: 2.5167456,-2.4152164
+      parent: 1
+  - uid: 849
+    components:
+    - type: Transform
+      pos: 2.620912,-2.3423004
+      parent: 1
+  - uid: 850
+    components:
+    - type: Transform
+      pos: 2.4438286,-6.4881344
+      parent: 1
+  - uid: 851
+    components:
+    - type: Transform
+      pos: 2.527162,-6.3318844
       parent: 1
-      type: Transform
   - uid: 852
     components:
-    - pos: 13.5,-23.5
+    - type: Transform
+      pos: 2.6729956,-6.4152164
       parent: 1
-      type: Transform
-  - uid: 857
+  - uid: 853
     components:
-    - pos: 14.5,-23.5
+    - type: Transform
+      pos: 2.6104956,-6.5714664
       parent: 1
-      type: Transform
-- proto: SeedExtractor
-  entities:
-  - uid: 646
+  - uid: 854
     components:
-    - pos: -16.5,-17.5
+    - type: Transform
+      pos: 2.4438286,-6.3735504
       parent: 1
-      type: Transform
-- proto: SignConspiracyBoard
-  entities:
-  - uid: 755
+  - uid: 855
     components:
-    - desc: Seems like a board connecting different factions and items to one another, but the language is foriegn to you.
-      name: Unknown Scrawls
-      type: MetaData
-    - pos: 3.5,-21.5
+    - type: Transform
+      pos: 2.6417456,-6.3006344
       parent: 1
-      type: Transform
-- proto: SinkStemlessWater
-  entities:
-  - uid: 398
+  - uid: 856
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -10.5,-13.5
+    - type: Transform
+      pos: 2.7250786,-6.4568844
       parent: 1
-      type: Transform
-  - uid: 399
+  - uid: 857
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 10.5,-13.5
+    - type: Transform
+      pos: 2.4750786,-6.4985504
       parent: 1
-      type: Transform
-- proto: SMESBasic
+  - uid: 858
+    components:
+    - type: Transform
+      pos: 2.5479956,-6.3214664
+      parent: 1
+  - uid: 859
+    components:
+    - type: Transform
+      pos: 2.6625786,-6.4881344
+      parent: 1
+- proto: SpawnDungeonLootToolsAdvancedEngineering
   entities:
-  - uid: 926
+  - uid: 769
     components:
-    - pos: -8.5,-30.5
+    - type: Transform
+      pos: -6.518159,-3.4314861
       parent: 1
-      type: Transform
-  - uid: 928
+  - uid: 780
     components:
-    - pos: -10.5,-30.5
+    - type: Transform
+      pos: 6.4818416,-3.3689861
       parent: 1
-      type: Transform
-  - uid: 929
+  - uid: 783
     components:
-    - pos: -9.5,-30.5
+    - type: Transform
+      pos: -6.4973254,-1.4106541
       parent: 1
-      type: Transform
-  - uid: 1081
+  - uid: 786
     components:
-    - pos: -8.5,-31.5
+    - type: Transform
+      pos: 6.5339246,-1.4314861
       parent: 1
-      type: Transform
-- proto: soda_dispenser
+- proto: SpawnDungeonLootToolsHydroponics
   entities:
-  - uid: 587
+  - uid: 129
     components:
-    - pos: -4.5,-15.5
+    - type: Transform
+      pos: -14.507337,-18.888575
       parent: 1
-      type: Transform
-- proto: SpaceCash5000
+- proto: SpawnDungeonLootVaultGuns
   entities:
-  - uid: 157
+  - uid: 127
     components:
-    - pos: 1.5823038,-6.3065434
+    - type: Transform
+      pos: 2.5442045,-5.4516087
       parent: 1
-      type: Transform
-  - uid: 158
+  - uid: 170
     components:
-    - pos: -1.4333212,-6.3846684
+    - type: Transform
+      pos: 2.5233712,-3.5141087
       parent: 1
-      type: Transform
-  - uid: 159
+  - uid: 171
     components:
-    - pos: -1.5739462,-6.5096684
+    - type: Transform
+      pos: 2.5233712,-4.5349426
       parent: 1
-      type: Transform
-  - uid: 160
+  - uid: 828
     components:
-    - pos: 1.6916788,-6.2596684
+    - type: Transform
+      pos: 5.5138226,-15.586215
       parent: 1
-      type: Transform
-  - uid: 171
+- proto: SpawnDungeonVendomatsArmory
+  entities:
+  - uid: 827
     components:
-    - pos: -1.6520712,-6.3065434
+    - type: Transform
+      pos: 13.5,-16.5
       parent: 1
-      type: Transform
-  - uid: 769
+- proto: SpawnDungeonVendomatsClothes
+  entities:
+  - uid: 128
     components:
-    - pos: -1.5114462,-2.3221684
+    - type: Transform
+      pos: 11.5,-12.5
       parent: 1
-      type: Transform
-  - uid: 770
+  - uid: 396
     components:
-    - pos: 1.7541788,-6.5252934
+    - type: Transform
+      pos: -11.5,-12.5
       parent: 1
-      type: Transform
-  - uid: 771
+  - uid: 767
     components:
-    - pos: -1.4333212,-2.3846684
+    - type: Transform
+      pos: 11.5,-14.5
       parent: 1
-      type: Transform
-  - uid: 772
+  - uid: 771
     components:
-    - pos: -1.5270712,-2.5721684
+    - type: Transform
+      pos: -12.5,-14.5
       parent: 1
-      type: Transform
   - uid: 775
     components:
-    - pos: 1.7073038,-2.6034184
+    - type: Transform
+      pos: 12.5,-14.5
       parent: 1
-      type: Transform
-  - uid: 776
+  - uid: 778
     components:
-    - pos: 1.5823038,-2.4159184
+    - type: Transform
+      pos: -11.5,-14.5
       parent: 1
-      type: Transform
-  - uid: 777
+  - uid: 824
     components:
-    - pos: 1.7698038,-2.2127934
+    - type: Transform
+      pos: -10.5,-12.5
+      parent: 1
+  - uid: 825
+    components:
+    - type: Transform
+      pos: 10.5,-12.5
       parent: 1
-      type: Transform
 - proto: SpawnMobArcIndBlaster
   entities:
   - uid: 1629
     components:
-    - pos: -11.5,-19.5
+    - type: Transform
+      pos: -11.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1630
     components:
-    - pos: -11.5,-21.5
+    - type: Transform
+      pos: -11.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1636
     components:
-    - pos: -3.5,-16.5
+    - type: Transform
+      pos: -3.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1647
     components:
-    - pos: -7.5,-12.5
+    - type: Transform
+      pos: -7.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1648
     components:
-    - pos: 3.5,-9.5
+    - type: Transform
+      pos: 3.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1649
     components:
-    - pos: 8.5,-12.5
+    - type: Transform
+      pos: 8.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1656
     components:
-    - pos: -4.5,0.5
+    - type: Transform
+      pos: -4.5,0.5
       parent: 1
-      type: Transform
   - uid: 1657
     components:
-    - pos: 3.5,0.5
+    - type: Transform
+      pos: 3.5,0.5
       parent: 1
-      type: Transform
 - proto: SpawnMobArcIndHoloparasiteGuardian
   entities:
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
   - uid: 1635
     components:
-    - pos: -6.5,-21.5
+    - type: Transform
+      pos: -6.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1637
     components:
-    - pos: 3.5,-20.5
+    - type: Transform
+      pos: 3.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1638
     components:
-    - pos: 12.5,-17.5
+    - type: Transform
+      pos: 12.5,-17.5
       parent: 1
-      type: Transform
   - uid: 1639
     components:
-    - pos: 14.5,-18.5
+    - type: Transform
+      pos: 14.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1643
     components:
-    - pos: 12.5,-21.5
+    - type: Transform
+      pos: 12.5,-21.5
       parent: 1
-      type: Transform
   - uid: 1644
     components:
-    - pos: -7.5,-10.5
+    - type: Transform
+      pos: -7.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1645
     components:
-    - pos: 0.5,-12.5
+    - type: Transform
+      pos: 0.5,-12.5
       parent: 1
-      type: Transform
   - uid: 1646
     components:
-    - pos: 7.5,-7.5
+    - type: Transform
+      pos: 7.5,-7.5
       parent: 1
-      type: Transform
   - uid: 1660
     components:
-    - pos: 14.5,-22.5
+    - type: Transform
+      pos: 14.5,-22.5
       parent: 1
-      type: Transform
 - proto: SpawnMobArcIndShredder
   entities:
+  - uid: 777
+    components:
+    - type: Transform
+      pos: 6.5,-16.5
+      parent: 1
   - uid: 1631
     components:
-    - pos: -15.5,-18.5
+    - type: Transform
+      pos: -15.5,-18.5
       parent: 1
-      type: Transform
   - uid: 1632
     components:
-    - pos: -17.5,-19.5
+    - type: Transform
+      pos: -17.5,-19.5
       parent: 1
-      type: Transform
   - uid: 1633
     components:
-    - pos: -14.5,-16.5
+    - type: Transform
+      pos: -14.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1634
     components:
-    - pos: -15.5,-22.5
-      parent: 1
-      type: Transform
-  - uid: 1640
-    components:
-    - pos: 2.5,-15.5
+    - type: Transform
+      pos: -15.5,-22.5
       parent: 1
-      type: Transform
   - uid: 1641
     components:
-    - pos: 4.5,-16.5
+    - type: Transform
+      pos: 4.5,-16.5
       parent: 1
-      type: Transform
   - uid: 1642
     components:
-    - pos: 6.5,-15.5
+    - type: Transform
+      pos: 6.5,-15.5
       parent: 1
-      type: Transform
   - uid: 1650
     components:
-    - pos: -7.5,-6.5
+    - type: Transform
+      pos: -7.5,-6.5
       parent: 1
-      type: Transform
   - uid: 1651
     components:
-    - pos: 8.5,-9.5
+    - type: Transform
+      pos: 8.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1652
     components:
-    - pos: -4.5,-13.5
+    - type: Transform
+      pos: -4.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1653
     components:
-    - pos: 6.5,-10.5
+    - type: Transform
+      pos: 6.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1654
     components:
-    - pos: -4.5,-10.5
+    - type: Transform
+      pos: -4.5,-10.5
       parent: 1
-      type: Transform
   - uid: 1655
     components:
-    - pos: 0.5,-9.5
+    - type: Transform
+      pos: 0.5,-9.5
       parent: 1
-      type: Transform
   - uid: 1658
     components:
-    - pos: -14.5,-13.5
+    - type: Transform
+      pos: -14.5,-13.5
       parent: 1
-      type: Transform
   - uid: 1659
     components:
-    - pos: 14.5,-13.5
+    - type: Transform
+      pos: 14.5,-13.5
       parent: 1
-      type: Transform
 - proto: StationMapBroken
   entities:
   - uid: 1620
     components:
-    - pos: -1.5,-24.5
+    - type: Transform
+      pos: -1.5,-24.5
       parent: 1
-      type: Transform
   - uid: 1621
     components:
-    - pos: 1.5,-8.5
+    - type: Transform
+      pos: 1.5,-8.5
       parent: 1
-      type: Transform
 - proto: StoolBar
   entities:
   - uid: 571
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -6.5,-19.5
       parent: 1
-      type: Transform
   - uid: 592
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -5.5,-19.5
       parent: 1
-      type: Transform
   - uid: 593
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,-19.5
       parent: 1
-      type: Transform
   - uid: 594
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -3.5,-19.5
       parent: 1
-      type: Transform
   - uid: 595
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -2.5,-19.5
       parent: 1
-      type: Transform
 - proto: SubstationBasic
   entities:
   - uid: 914
     components:
-    - pos: -12.5,-30.5
+    - type: Transform
+      pos: -12.5,-30.5
       parent: 1
-      type: Transform
 - proto: TableCounterMetal
   entities:
   - uid: 562
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-19.5
       parent: 1
-      type: Transform
   - uid: 604
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-20.5
       parent: 1
-      type: Transform
   - uid: 605
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -9.5,-21.5
       parent: 1
-      type: Transform
   - uid: 609
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-18.5
       parent: 1
-      type: Transform
   - uid: 610
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-19.5
       parent: 1
-      type: Transform
   - uid: 649
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -12.5,-22.5
       parent: 1
-      type: Transform
   - uid: 650
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -12.5,-23.5
       parent: 1
-      type: Transform
   - uid: 651
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -11.5,-23.5
       parent: 1
-      type: Transform
   - uid: 652
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -10.5,-16.5
       parent: 1
-      type: Transform
   - uid: 653
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -10.5,-17.5
       parent: 1
-      type: Transform
   - uid: 654
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -10.5,-18.5
       parent: 1
-      type: Transform
   - uid: 719
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-20.5
       parent: 1
-      type: Transform
   - uid: 720
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-21.5
       parent: 1
-      type: Transform
   - uid: 754
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,-21.5
       parent: 1
-      type: Transform
 - proto: TableCounterWood
   entities:
   - uid: 564
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-18.5
       parent: 1
-      type: Transform
   - uid: 565
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-18.5
       parent: 1
-      type: Transform
   - uid: 566
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-18.5
       parent: 1
-      type: Transform
   - uid: 567
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-18.5
       parent: 1
-      type: Transform
   - uid: 569
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-15.5
       parent: 1
-      type: Transform
   - uid: 570
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-15.5
       parent: 1
-      type: Transform
+  - uid: 826
+    components:
+    - type: Transform
+      pos: -3.5,-15.5
+      parent: 1
 - proto: TableReinforced
   entities:
   - uid: 101
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-1.5
       parent: 1
-      type: Transform
   - uid: 102
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-3.5
       parent: 1
-      type: Transform
   - uid: 103
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 1
-      type: Transform
   - uid: 104
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
-      type: Transform
 - proto: TableWood
   entities:
   - uid: 660
     components:
-    - pos: -7.5,-21.5
+    - type: Transform
+      pos: -7.5,-21.5
       parent: 1
-      type: Transform
   - uid: 661
     components:
-    - pos: -7.5,-22.5
+    - type: Transform
+      pos: -7.5,-22.5
       parent: 1
-      type: Transform
   - uid: 662
     components:
-    - pos: -4.5,-21.5
+    - type: Transform
+      pos: -4.5,-21.5
       parent: 1
-      type: Transform
   - uid: 663
     components:
-    - pos: -4.5,-22.5
-      parent: 1
-      type: Transform
-- proto: TechnologyDiskRare
-  entities:
-  - uid: 809
-    components:
-    - pos: 13.051542,-20.467854
-      parent: 1
-      type: Transform
-  - uid: 810
-    components:
-    - pos: 15.176542,-20.467854
-      parent: 1
-      type: Transform
-  - uid: 816
-    components:
-    - pos: 11.520292,-20.514729
-      parent: 1
-      type: Transform
-  - uid: 817
-    components:
-    - pos: 14.489042,-20.467854
-      parent: 1
-      type: Transform
-  - uid: 818
-    components:
-    - pos: 14.082792,-20.499104
-      parent: 1
-      type: Transform
-  - uid: 819
-    components:
-    - pos: 13.504667,-20.420979
-      parent: 1
-      type: Transform
-  - uid: 825
-    components:
-    - pos: 15.598417,-20.452229
-      parent: 1
-      type: Transform
-  - uid: 826
-    components:
-    - pos: 12.473417,-20.452229
-      parent: 1
-      type: Transform
-  - uid: 868
-    components:
-    - pos: 12.004667,-20.545979
-      parent: 1
-      type: Transform
-- proto: Telecrystal1
-  entities:
-  - uid: 757
-    components:
-    - pos: 3.467102,-15.562607
-      parent: 1
-      type: Transform
-- proto: TelescopicShield
-  entities:
-  - uid: 778
-    components:
-    - pos: -2.4958212,-3.4315434
+    - type: Transform
+      pos: -4.5,-22.5
       parent: 1
-      type: Transform
 - proto: ToiletEmpty
   entities:
   - uid: 401
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-14.5
       parent: 1
-      type: Transform
   - uid: 403
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 10.5,-14.5
       parent: 1
-      type: Transform
-- proto: VendingMachineArcadia
-  entities:
-  - uid: 396
-    components:
-    - pos: -10.5,-12.5
-      parent: 1
-      type: Transform
-  - uid: 397
-    components:
-    - pos: 10.5,-12.5
-      parent: 1
-      type: Transform
 - proto: VendingMachineBooze
   entities:
-  - uid: 588
+  - uid: 137
     components:
-    - pos: -3.5,-15.5
+    - type: Transform
+      pos: -2.5,-15.5
       parent: 1
-      type: Transform
 - proto: VendingMachineSeedsUnlocked
   entities:
   - uid: 647
     components:
-    - pos: -15.5,-17.5
-      parent: 1
-      type: Transform
-- proto: VendingMachineSyndieDrobe
-  entities:
-  - uid: 786
-    components:
-    - pos: 13.5,-16.5
+    - type: Transform
+      pos: -15.5,-17.5
       parent: 1
-      type: Transform
 - proto: WallPlastitanium
   entities:
   - uid: 23
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,3.5
       parent: 1
-      type: Transform
   - uid: 26
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 1
-      type: Transform
   - uid: 28
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-0.5
       parent: 1
-      type: Transform
   - uid: 29
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 31
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 32
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 33
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 34
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 35
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-1.5
-      parent: 1
-      type: Transform
   - uid: 36
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-4.5
       parent: 1
-      type: Transform
   - uid: 37
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-4.5
       parent: 1
-      type: Transform
   - uid: 38
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-4.5
       parent: 1
-      type: Transform
   - uid: 39
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-4.5
       parent: 1
-      type: Transform
-  - uid: 40
+  - uid: 64
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-4.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 41
+  - uid: 65
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-2.5
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 6.5,-0.5
       parent: 1
-      type: Transform
-  - uid: 42
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 43
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-5.5
-      parent: 1
-      type: Transform
-  - uid: 44
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,-6.5
-      parent: 1
-      type: Transform
-  - uid: 46
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 48
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,-8.5
-      parent: 1
-      type: Transform
-  - uid: 49
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-8.5
-      parent: 1
-      type: Transform
-  - uid: 51
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-7.5
-      parent: 1
-      type: Transform
-  - uid: 53
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 1
-      type: Transform
-  - uid: 54
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-5.5
-      parent: 1
-      type: Transform
-  - uid: 55
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-4.5
-      parent: 1
-      type: Transform
-  - uid: 56
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-3.5
-      parent: 1
-      type: Transform
-  - uid: 57
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
-      parent: 1
-      type: Transform
-  - uid: 58
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 59
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 60
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 61
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 62
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
-      parent: 1
-      type: Transform
-  - uid: 64
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 5.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 65
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,-0.5
-      parent: 1
-      type: Transform
   - uid: 67
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-4.5
       parent: 1
-      type: Transform
   - uid: 68
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-4.5
       parent: 1
-      type: Transform
   - uid: 69
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-4.5
       parent: 1
-      type: Transform
   - uid: 70
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-4.5
       parent: 1
-      type: Transform
   - uid: 190
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-7.5
       parent: 1
-      type: Transform
   - uid: 191
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-7.5
       parent: 1
-      type: Transform
   - uid: 192
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-7.5
       parent: 1
-      type: Transform
   - uid: 193
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 12.5,-7.5
       parent: 1
-      type: Transform
   - uid: 194
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-7.5
       parent: 1
-      type: Transform
   - uid: 195
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 14.5,-7.5
       parent: 1
-      type: Transform
   - uid: 196
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-7.5
       parent: 1
-      type: Transform
   - uid: 197
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 16.5,-7.5
       parent: 1
-      type: Transform
   - uid: 198
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-7.5
       parent: 1
-      type: Transform
   - uid: 199
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-7.5
       parent: 1
-      type: Transform
   - uid: 200
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-7.5
       parent: 1
-      type: Transform
   - uid: 201
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 20.5,-7.5
       parent: 1
-      type: Transform
   - uid: 202
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 20.5,-11.5
       parent: 1
-      type: Transform
   - uid: 203
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-11.5
       parent: 1
-      type: Transform
   - uid: 204
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-11.5
       parent: 1
-      type: Transform
   - uid: 205
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-11.5
       parent: 1
-      type: Transform
   - uid: 206
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 16.5,-11.5
       parent: 1
-      type: Transform
   - uid: 207
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-11.5
       parent: 1
-      type: Transform
   - uid: 208
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 14.5,-11.5
       parent: 1
-      type: Transform
   - uid: 209
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 213
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-11.5
       parent: 1
-      type: Transform
   - uid: 214
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-11.5
       parent: 1
-      type: Transform
   - uid: 215
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-11.5
       parent: 1
-      type: Transform
   - uid: 216
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-12.5
       parent: 1
-      type: Transform
   - uid: 217
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-13.5
       parent: 1
-      type: Transform
   - uid: 218
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-14.5
       parent: 1
-      type: Transform
   - uid: 219
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-15.5
       parent: 1
-      type: Transform
-  - uid: 220
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 221
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 222
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 223
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 224
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-15.5
-      parent: 1
-      type: Transform
-  - uid: 225
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-15.5
-      parent: 1
-      type: Transform
   - uid: 226
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-14.5
       parent: 1
-      type: Transform
   - uid: 227
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 16.5,-14.5
       parent: 1
-      type: Transform
   - uid: 228
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-14.5
       parent: 1
-      type: Transform
   - uid: 229
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-13.5
       parent: 1
-      type: Transform
   - uid: 230
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-13.5
       parent: 1
-      type: Transform
   - uid: 231
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-13.5
       parent: 1
-      type: Transform
   - uid: 232
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-12.5
       parent: 1
-      type: Transform
   - uid: 234
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-14.5
       parent: 1
-      type: Transform
   - uid: 235
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,-14.5
       parent: 1
-      type: Transform
   - uid: 236
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-14.5
       parent: 1
-      type: Transform
   - uid: 237
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-14.5
       parent: 1
-      type: Transform
   - uid: 238
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-14.5
       parent: 1
-      type: Transform
   - uid: 239
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-14.5
       parent: 1
-      type: Transform
   - uid: 240
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-14.5
       parent: 1
-      type: Transform
   - uid: 241
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-14.5
       parent: 1
-      type: Transform
   - uid: 242
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-14.5
       parent: 1
-      type: Transform
   - uid: 243
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-14.5
       parent: 1
-      type: Transform
   - uid: 244
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-14.5
       parent: 1
-      type: Transform
   - uid: 245
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-14.5
       parent: 1
-      type: Transform
   - uid: 246
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-14.5
       parent: 1
-      type: Transform
   - uid: 247
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-14.5
       parent: 1
-      type: Transform
   - uid: 249
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-14.5
       parent: 1
-      type: Transform
   - uid: 250
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-13.5
       parent: 1
-      type: Transform
   - uid: 251
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-12.5
       parent: 1
-      type: Transform
   - uid: 252
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-11.5
       parent: 1
-      type: Transform
   - uid: 253
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-11.5
       parent: 1
-      type: Transform
   - uid: 254
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,-11.5
       parent: 1
-      type: Transform
   - uid: 258
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-7.5
       parent: 1
-      type: Transform
   - uid: 259
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-7.5
       parent: 1
-      type: Transform
   - uid: 260
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,-7.5
       parent: 1
-      type: Transform
   - uid: 261
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -12.5,-7.5
       parent: 1
-      type: Transform
   - uid: 262
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-7.5
       parent: 1
-      type: Transform
   - uid: 263
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -14.5,-7.5
       parent: 1
-      type: Transform
   - uid: 264
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -15.5,-7.5
       parent: 1
-      type: Transform
   - uid: 265
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -16.5,-7.5
       parent: 1
-      type: Transform
   - uid: 266
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -17.5,-7.5
       parent: 1
-      type: Transform
   - uid: 267
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -18.5,-7.5
       parent: 1
-      type: Transform
   - uid: 268
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -19.5,-7.5
       parent: 1
-      type: Transform
   - uid: 269
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-7.5
       parent: 1
-      type: Transform
   - uid: 273
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-11.5
       parent: 1
-      type: Transform
   - uid: 274
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -19.5,-11.5
       parent: 1
-      type: Transform
   - uid: 275
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -18.5,-11.5
       parent: 1
-      type: Transform
   - uid: 276
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -17.5,-11.5
       parent: 1
-      type: Transform
   - uid: 277
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -16.5,-11.5
       parent: 1
-      type: Transform
   - uid: 278
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -15.5,-11.5
       parent: 1
-      type: Transform
   - uid: 279
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -14.5,-11.5
       parent: 1
-      type: Transform
   - uid: 280
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-11.5
       parent: 1
-      type: Transform
   - uid: 380
     components:
-    - pos: -9.5,-15.5
+    - type: Transform
+      pos: -9.5,-15.5
       parent: 1
-      type: Transform
   - uid: 381
     components:
-    - pos: -10.5,-15.5
+    - type: Transform
+      pos: -10.5,-15.5
       parent: 1
-      type: Transform
   - uid: 382
     components:
-    - pos: -11.5,-15.5
+    - type: Transform
+      pos: -11.5,-15.5
       parent: 1
-      type: Transform
   - uid: 383
     components:
-    - pos: -12.5,-15.5
+    - type: Transform
+      pos: -12.5,-15.5
       parent: 1
-      type: Transform
   - uid: 384
     components:
-    - pos: -13.5,-15.5
+    - type: Transform
+      pos: -13.5,-15.5
       parent: 1
-      type: Transform
   - uid: 385
     components:
-    - pos: -14.5,-15.5
+    - type: Transform
+      pos: -14.5,-15.5
       parent: 1
-      type: Transform
   - uid: 386
     components:
-    - pos: -15.5,-15.5
+    - type: Transform
+      pos: -15.5,-15.5
       parent: 1
-      type: Transform
   - uid: 387
     components:
-    - pos: -15.5,-14.5
+    - type: Transform
+      pos: -15.5,-14.5
       parent: 1
-      type: Transform
   - uid: 388
     components:
-    - pos: -16.5,-14.5
+    - type: Transform
+      pos: -16.5,-14.5
       parent: 1
-      type: Transform
   - uid: 389
     components:
-    - pos: -17.5,-14.5
+    - type: Transform
+      pos: -17.5,-14.5
       parent: 1
-      type: Transform
   - uid: 390
     components:
-    - pos: -17.5,-13.5
+    - type: Transform
+      pos: -17.5,-13.5
       parent: 1
-      type: Transform
   - uid: 391
     components:
-    - pos: -18.5,-13.5
+    - type: Transform
+      pos: -18.5,-13.5
       parent: 1
-      type: Transform
   - uid: 392
     components:
-    - pos: -19.5,-13.5
+    - type: Transform
+      pos: -19.5,-13.5
       parent: 1
-      type: Transform
   - uid: 393
     components:
-    - pos: -19.5,-12.5
+    - type: Transform
+      pos: -19.5,-12.5
       parent: 1
-      type: Transform
   - uid: 408
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -15.5,-12.5
       parent: 1
-      type: Transform
   - uid: 409
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -15.5,-13.5
       parent: 1
-      type: Transform
   - uid: 417
     components:
-    - pos: 15.5,-12.5
+    - type: Transform
+      pos: 15.5,-12.5
       parent: 1
-      type: Transform
   - uid: 418
     components:
-    - pos: 15.5,-13.5
+    - type: Transform
+      pos: 15.5,-13.5
       parent: 1
-      type: Transform
   - uid: 425
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-15.5
       parent: 1
-      type: Transform
   - uid: 426
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-16.5
       parent: 1
-      type: Transform
   - uid: 427
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-17.5
       parent: 1
-      type: Transform
   - uid: 428
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-18.5
       parent: 1
-      type: Transform
   - uid: 432
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-23.5
       parent: 1
-      type: Transform
   - uid: 433
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.5,-24.5
       parent: 1
-      type: Transform
   - uid: 434
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-24.5
       parent: 1
-      type: Transform
   - uid: 435
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-24.5
       parent: 1
-      type: Transform
   - uid: 436
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -8.5,-24.5
       parent: 1
-      type: Transform
   - uid: 437
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-24.5
       parent: 1
-      type: Transform
   - uid: 438
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,-24.5
       parent: 1
-      type: Transform
   - uid: 439
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -12.5,-24.5
       parent: 1
-      type: Transform
   - uid: 440
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-24.5
       parent: 1
-      type: Transform
   - uid: 441
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -14.5,-24.5
       parent: 1
-      type: Transform
   - uid: 442
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -15.5,-24.5
       parent: 1
-      type: Transform
   - uid: 443
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -16.5,-24.5
       parent: 1
-      type: Transform
   - uid: 444
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -17.5,-24.5
       parent: 1
-      type: Transform
   - uid: 445
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -18.5,-24.5
       parent: 1
-      type: Transform
   - uid: 446
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -19.5,-24.5
       parent: 1
-      type: Transform
   - uid: 447
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-24.5
       parent: 1
-      type: Transform
   - uid: 448
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-28.5
       parent: 1
-      type: Transform
   - uid: 449
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -20.5,-28.5
       parent: 1
-      type: Transform
   - uid: 450
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -19.5,-28.5
       parent: 1
-      type: Transform
   - uid: 451
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -18.5,-28.5
       parent: 1
-      type: Transform
   - uid: 452
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -17.5,-28.5
       parent: 1
-      type: Transform
   - uid: 453
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -16.5,-28.5
       parent: 1
-      type: Transform
   - uid: 454
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -15.5,-28.5
       parent: 1
-      type: Transform
   - uid: 455
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -14.5,-28.5
       parent: 1
-      type: Transform
   - uid: 456
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-28.5
       parent: 1
-      type: Transform
   - uid: 457
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -12.5,-28.5
       parent: 1
-      type: Transform
   - uid: 458
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,-28.5
       parent: 1
-      type: Transform
   - uid: 459
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-28.5
       parent: 1
-      type: Transform
   - uid: 460
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-28.5
       parent: 1
-      type: Transform
   - uid: 462
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-28.5
       parent: 1
-      type: Transform
   - uid: 463
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-28.5
       parent: 1
-      type: Transform
   - uid: 464
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-28.5
       parent: 1
-      type: Transform
   - uid: 465
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-28.5
       parent: 1
-      type: Transform
   - uid: 466
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 467
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-29.5
       parent: 1
-      type: Transform
   - uid: 468
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-30.5
       parent: 1
-      type: Transform
   - uid: 469
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-31.5
       parent: 1
-      type: Transform
   - uid: 470
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-32.5
       parent: 1
-      type: Transform
   - uid: 471
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -2.5,-33.5
       parent: 1
-      type: Transform
   - uid: 472
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,-33.5
       parent: 1
-      type: Transform
   - uid: 473
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -4.5,-33.5
       parent: 1
-      type: Transform
   - uid: 474
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-33.5
       parent: 1
-      type: Transform
   - uid: 475
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-33.5
       parent: 1
-      type: Transform
   - uid: 476
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-32.5
       parent: 1
-      type: Transform
   - uid: 477
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,-32.5
       parent: 1
-      type: Transform
   - uid: 478
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -8.5,-32.5
       parent: 1
-      type: Transform
   - uid: 479
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-32.5
       parent: 1
-      type: Transform
   - uid: 480
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-31.5
       parent: 1
-      type: Transform
   - uid: 481
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -10.5,-31.5
       parent: 1
-      type: Transform
   - uid: 482
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,-31.5
       parent: 1
-      type: Transform
   - uid: 483
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -12.5,-31.5
       parent: 1
-      type: Transform
   - uid: 484
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-31.5
       parent: 1
-      type: Transform
   - uid: 485
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-29.5
       parent: 1
-      type: Transform
   - uid: 486
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -13.5,-30.5
       parent: 1
-      type: Transform
   - uid: 487
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-33.5
       parent: 1
-      type: Transform
   - uid: 488
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-32.5
       parent: 1
-      type: Transform
   - uid: 489
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-31.5
       parent: 1
-      type: Transform
   - uid: 490
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-30.5
       parent: 1
-      type: Transform
   - uid: 491
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-29.5
       parent: 1
-      type: Transform
   - uid: 492
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-28.5
       parent: 1
-      type: Transform
   - uid: 493
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-28.5
       parent: 1
-      type: Transform
   - uid: 494
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-28.5
       parent: 1
-      type: Transform
   - uid: 495
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-28.5
       parent: 1
-      type: Transform
   - uid: 496
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-28.5
       parent: 1
-      type: Transform
   - uid: 497
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-28.5
       parent: 1
-      type: Transform
   - uid: 499
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-28.5
       parent: 1
-      type: Transform
   - uid: 500
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-28.5
       parent: 1
-      type: Transform
   - uid: 501
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-28.5
       parent: 1
-      type: Transform
   - uid: 502
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 12.5,-28.5
       parent: 1
-      type: Transform
   - uid: 503
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-28.5
       parent: 1
-      type: Transform
   - uid: 504
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 14.5,-28.5
       parent: 1
-      type: Transform
   - uid: 505
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 15.5,-28.5
       parent: 1
-      type: Transform
   - uid: 506
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 16.5,-28.5
       parent: 1
-      type: Transform
   - uid: 507
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-28.5
       parent: 1
-      type: Transform
   - uid: 508
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-28.5
       parent: 1
-      type: Transform
   - uid: 509
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-28.5
       parent: 1
-      type: Transform
   - uid: 510
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-24.5
       parent: 1
-      type: Transform
   - uid: 511
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-24.5
       parent: 1
-      type: Transform
   - uid: 512
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-24.5
       parent: 1
-      type: Transform
   - uid: 513
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-24.5
       parent: 1
-      type: Transform
-  - uid: 514
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 515
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 516
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 517
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 518
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 519
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-24.5
-      parent: 1
-      type: Transform
-  - uid: 520
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 10.5,-24.5
-      parent: 1
-      type: Transform
   - uid: 521
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-24.5
       parent: 1
-      type: Transform
   - uid: 522
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 8.5,-24.5
       parent: 1
-      type: Transform
   - uid: 523
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-24.5
       parent: 1
-      type: Transform
   - uid: 524
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-24.5
       parent: 1
-      type: Transform
   - uid: 525
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-24.5
       parent: 1
-      type: Transform
   - uid: 526
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-24.5
       parent: 1
-      type: Transform
   - uid: 527
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-24.5
       parent: 1
-      type: Transform
   - uid: 528
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,-24.5
       parent: 1
-      type: Transform
   - uid: 529
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-29.5
       parent: 1
-      type: Transform
   - uid: 530
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-30.5
       parent: 1
-      type: Transform
   - uid: 531
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-31.5
       parent: 1
-      type: Transform
   - uid: 532
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 12.5,-31.5
       parent: 1
-      type: Transform
   - uid: 533
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 11.5,-31.5
       parent: 1
-      type: Transform
   - uid: 534
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 10.5,-31.5
       parent: 1
-      type: Transform
   - uid: 535
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-31.5
       parent: 1
-      type: Transform
   - uid: 536
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-32.5
       parent: 1
-      type: Transform
   - uid: 537
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 8.5,-32.5
       parent: 1
-      type: Transform
   - uid: 538
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-32.5
       parent: 1
-      type: Transform
   - uid: 539
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-32.5
       parent: 1
-      type: Transform
   - uid: 540
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,-33.5
       parent: 1
-      type: Transform
   - uid: 541
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,-33.5
       parent: 1
-      type: Transform
   - uid: 542
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,-33.5
       parent: 1
-      type: Transform
   - uid: 543
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,-33.5
       parent: 1
-      type: Transform
   - uid: 549
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-15.5
       parent: 1
-      type: Transform
   - uid: 558
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-16.5
       parent: 1
-      type: Transform
   - uid: 559
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-17.5
       parent: 1
-      type: Transform
   - uid: 560
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-18.5
       parent: 1
-      type: Transform
   - uid: 561
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,-22.5
       parent: 1
-      type: Transform
   - uid: 598
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-17.5
       parent: 1
-      type: Transform
   - uid: 599
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -6.5,-18.5
       parent: 1
-      type: Transform
   - uid: 608
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-17.5
       parent: 1
-      type: Transform
   - uid: 611
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-20.5
       parent: 1
-      type: Transform
   - uid: 612
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-22.5
       parent: 1
-      type: Transform
   - uid: 613
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-23.5
       parent: 1
-      type: Transform
   - uid: 614
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-23.5
       parent: 1
-      type: Transform
   - uid: 615
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-23.5
       parent: 1
-      type: Transform
   - uid: 616
     components:
-    - pos: -16.5,-23.5
+    - type: Transform
+      pos: -16.5,-23.5
       parent: 1
-      type: Transform
   - uid: 617
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -16.5,-22.5
       parent: 1
-      type: Transform
   - uid: 618
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -14.5,-20.5
       parent: 1
-      type: Transform
   - uid: 619
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-20.5
       parent: 1
-      type: Transform
   - uid: 620
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -16.5,-20.5
       parent: 1
-      type: Transform
   - uid: 621
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -17.5,-20.5
       parent: 1
-      type: Transform
   - uid: 622
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -18.5,-20.5
       parent: 1
-      type: Transform
   - uid: 623
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -17.5,-21.5
       parent: 1
-      type: Transform
   - uid: 624
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -16.5,-21.5
       parent: 1
-      type: Transform
   - uid: 625
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -18.5,-19.5
       parent: 1
-      type: Transform
   - uid: 626
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -19.5,-19.5
       parent: 1
-      type: Transform
   - uid: 627
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -19.5,-18.5
       parent: 1
-      type: Transform
   - uid: 628
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -19.5,-17.5
       parent: 1
-      type: Transform
   - uid: 629
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -18.5,-17.5
       parent: 1
-      type: Transform
   - uid: 630
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -17.5,-17.5
       parent: 1
-      type: Transform
   - uid: 631
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -17.5,-16.5
       parent: 1
-      type: Transform
   - uid: 632
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -16.5,-16.5
       parent: 1
-      type: Transform
   - uid: 633
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -15.5,-16.5
       parent: 1
-      type: Transform
   - uid: 674
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-22.5
       parent: 1
-      type: Transform
   - uid: 675
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-15.5
       parent: 1
-      type: Transform
   - uid: 676
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-16.5
       parent: 1
-      type: Transform
   - uid: 677
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-17.5
       parent: 1
-      type: Transform
   - uid: 678
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,-18.5
       parent: 1
-      type: Transform
   - uid: 680
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-16.5
       parent: 1
-      type: Transform
   - uid: 681
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-17.5
       parent: 1
-      type: Transform
   - uid: 682
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-18.5
       parent: 1
-      type: Transform
   - uid: 683
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-19.5
       parent: 1
-      type: Transform
   - uid: 684
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-20.5
       parent: 1
-      type: Transform
   - uid: 685
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-21.5
       parent: 1
-      type: Transform
   - uid: 687
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-23.5
       parent: 1
-      type: Transform
-  - uid: 688
-    components:
-    - pos: 16.5,-20.5
-      parent: 1
-      type: Transform
   - uid: 689
     components:
-    - pos: 18.5,-18.5
-      parent: 1
-      type: Transform
-  - uid: 690
-    components:
-    - pos: 17.5,-18.5
-      parent: 1
-      type: Transform
-  - uid: 691
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 11.5,-19.5
+    - type: Transform
+      pos: 18.5,-18.5
       parent: 1
-      type: Transform
-  - uid: 696
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 13.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 697
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 12.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 698
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 14.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 699
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 700
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 701
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 17.5,-19.5
-      parent: 1
-      type: Transform
   - uid: 702
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-19.5
       parent: 1
-      type: Transform
   - uid: 703
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-19.5
       parent: 1
-      type: Transform
   - uid: 704
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-17.5
       parent: 1
-      type: Transform
   - uid: 705
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 19.5,-18.5
       parent: 1
-      type: Transform
   - uid: 706
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-17.5
       parent: 1
-      type: Transform
-  - uid: 707
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 17.5,-17.5
-      parent: 1
-      type: Transform
-  - uid: 708
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 17.5,-16.5
-      parent: 1
-      type: Transform
-  - uid: 709
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-16.5
-      parent: 1
-      type: Transform
-  - uid: 710
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 15.5,-16.5
-      parent: 1
-      type: Transform
   - uid: 711
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 18.5,-20.5
       parent: 1
-      type: Transform
   - uid: 712
     components:
-    - pos: 17.5,-20.5
+    - type: Transform
+      pos: 17.5,-20.5
       parent: 1
-      type: Transform
   - uid: 713
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 17.5,-21.5
       parent: 1
-      type: Transform
-  - uid: 714
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-21.5
-      parent: 1
-      type: Transform
-  - uid: 715
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 16.5,-22.5
-      parent: 1
-      type: Transform
-  - uid: 717
-    components:
-    - pos: 16.5,-23.5
-      parent: 1
-      type: Transform
   - uid: 721
     components:
-    - pos: 1.5,-19.5
+    - type: Transform
+      pos: 1.5,-19.5
       parent: 1
-      type: Transform
   - uid: 752
     components:
-    - pos: 3.5,-21.5
+    - type: Transform
+      pos: 3.5,-21.5
       parent: 1
-      type: Transform
   - uid: 753
     components:
-    - pos: 4.5,-21.5
-      parent: 1
-      type: Transform
-  - uid: 759
-    components:
-    - pos: 10.5,-16.5
+    - type: Transform
+      pos: 4.5,-21.5
       parent: 1
-      type: Transform
-  - uid: 760
-    components:
-    - pos: 10.5,-17.5
-      parent: 1
-      type: Transform
-  - uid: 762
-    components:
-    - pos: 10.5,-19.5
-      parent: 1
-      type: Transform
-  - uid: 763
-    components:
-    - pos: 10.5,-20.5
-      parent: 1
-      type: Transform
-  - uid: 766
-    components:
-    - pos: 10.5,-23.5
-      parent: 1
-      type: Transform
   - uid: 1198
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,8.5
       parent: 1
-      type: Transform
   - uid: 1416
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,8.5
       parent: 1
-      type: Transform
 - proto: WallPlastitaniumDiagonal
   entities:
   - uid: 9
     components:
-    - pos: -4.5,3.5
+    - type: Transform
+      pos: -4.5,3.5
       parent: 1
-      type: Transform
   - uid: 10
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -4.5,2.5
       parent: 1
-      type: Transform
   - uid: 11
     components:
-    - pos: -6.5,2.5
+    - type: Transform
+      pos: -6.5,2.5
       parent: 1
-      type: Transform
   - uid: 12
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,3.5
       parent: 1
-      type: Transform
   - uid: 13
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 4.5,2.5
       parent: 1
-      type: Transform
   - uid: 14
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,2.5
       parent: 1
-      type: Transform
   - uid: 27
     components:
-    - pos: -7.5,-0.5
+    - type: Transform
+      pos: -7.5,-0.5
       parent: 1
-      type: Transform
   - uid: 45
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 3.5,-7.5
       parent: 1
-      type: Transform
   - uid: 47
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-8.5
       parent: 1
-      type: Transform
   - uid: 50
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,-8.5
       parent: 1
-      type: Transform
   - uid: 52
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -3.5,-7.5
       parent: 1
-      type: Transform
   - uid: 66
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 7.5,-0.5
       parent: 1
-      type: Transform
   - uid: 182
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -7.5,-5.5
       parent: 1
-      type: Transform
   - uid: 183
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -8.5,-6.5
       parent: 1
-      type: Transform
   - uid: 184
     components:
-    - pos: -8.5,-5.5
+    - type: Transform
+      pos: -8.5,-5.5
       parent: 1
-      type: Transform
   - uid: 185
     components:
-    - pos: -9.5,-6.5
+    - type: Transform
+      pos: -9.5,-6.5
       parent: 1
-      type: Transform
   - uid: 186
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-5.5
       parent: 1
-      type: Transform
   - uid: 187
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,-6.5
       parent: 1
-      type: Transform
   - uid: 188
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 8.5,-5.5
       parent: 1
-      type: Transform
   - uid: 189
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 9.5,-6.5
       parent: 1
-      type: Transform
+- proto: WallPlastitaniumIndestructible
+  entities:
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 3.5,-6.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 2.5,-7.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -3.5,-6.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: -3.5,-4.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 10.5,-15.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 11.5,-15.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 12.5,-15.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 13.5,-15.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: 14.5,-15.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 15.5,-15.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 11.5,-24.5
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: 12.5,-24.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: 13.5,-24.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 14.5,-24.5
+      parent: 1
+  - uid: 688
+    components:
+    - type: Transform
+      pos: 15.5,-24.5
+      parent: 1
+  - uid: 690
+    components:
+    - type: Transform
+      pos: 16.5,-24.5
+      parent: 1
+  - uid: 691
+    components:
+    - type: Transform
+      pos: 16.5,-23.5
+      parent: 1
+  - uid: 696
+    components:
+    - type: Transform
+      pos: 16.5,-20.5
+      parent: 1
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 17.5,-18.5
+      parent: 1
+  - uid: 698
+    components:
+    - type: Transform
+      pos: 11.5,-19.5
+      parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      pos: 13.5,-19.5
+      parent: 1
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 12.5,-19.5
+      parent: 1
+  - uid: 701
+    components:
+    - type: Transform
+      pos: 14.5,-19.5
+      parent: 1
+  - uid: 707
+    components:
+    - type: Transform
+      pos: 15.5,-19.5
+      parent: 1
+  - uid: 708
+    components:
+    - type: Transform
+      pos: 16.5,-19.5
+      parent: 1
+  - uid: 709
+    components:
+    - type: Transform
+      pos: 17.5,-19.5
+      parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: 17.5,-17.5
+      parent: 1
+  - uid: 714
+    components:
+    - type: Transform
+      pos: 17.5,-16.5
+      parent: 1
+  - uid: 715
+    components:
+    - type: Transform
+      pos: 16.5,-16.5
+      parent: 1
+  - uid: 717
+    components:
+    - type: Transform
+      pos: 15.5,-16.5
+      parent: 1
+  - uid: 759
+    components:
+    - type: Transform
+      pos: 16.5,-21.5
+      parent: 1
+  - uid: 760
+    components:
+    - type: Transform
+      pos: 10.5,-20.5
+      parent: 1
+  - uid: 761
+    components:
+    - type: Transform
+      pos: 10.5,-24.5
+      parent: 1
+  - uid: 762
+    components:
+    - type: Transform
+      pos: 10.5,-16.5
+      parent: 1
+  - uid: 764
+    components:
+    - type: Transform
+      pos: 10.5,-19.5
+      parent: 1
+  - uid: 765
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 1
+  - uid: 766
+    components:
+    - type: Transform
+      pos: 16.5,-22.5
+      parent: 1
 - proto: WarpPoint
   entities:
   - uid: 1628
     components:
-    - pos: -0.5,-25.5
+    - type: Transform
+      pos: -0.5,-25.5
       parent: 1
-      type: Transform
-    - location: Data Carrier
-      type: WarpPoint
+    - type: WarpPoint
+      location: Data Carrier
 - proto: WaterTankHighCapacity
   entities:
   - uid: 645
     components:
-    - pos: -18.5,-18.5
+    - type: Transform
+      pos: -18.5,-18.5
       parent: 1
-      type: Transform
-- proto: WeaponAntiqueLaser
+- proto: WeaponTurretHostile
   entities:
-  - uid: 758
+  - uid: 798
     components:
-    - pos: 5.513977,-15.515732
+    - type: Transform
+      pos: 1.5,-7.5
       parent: 1
-      type: Transform
-- proto: WeaponSubMachineGunWt550
-  entities:
-  - uid: 179
+  - uid: 799
     components:
-    - pos: 2.4845977,-3.368145
+    - type: Transform
+      pos: -1.5,-1.5
       parent: 1
-      type: Transform
-- proto: WeaponTurretHostile
-  entities:
   - uid: 1509
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -4.5,13.5
       parent: 1
-      type: Transform
   - uid: 1510
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 3.5,13.5
       parent: 1
-      type: Transform
 - proto: WeaponTurretSyndicateBroken
   entities:
   - uid: 1613
     components:
-    - pos: 18.5,-26.5
+    - type: Transform
+      pos: 18.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1622
     components:
-    - pos: -19.5,-26.5
+    - type: Transform
+      pos: -19.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1623
     components:
-    - pos: -0.5,-26.5
+    - type: Transform
+      pos: -0.5,-26.5
       parent: 1
-      type: Transform
   - uid: 1624
     components:
-    - pos: 0.5,-26.5
+    - type: Transform
+      pos: 0.5,-26.5
       parent: 1
-      type: Transform
 - proto: WindoorSecure
   entities:
   - uid: 1478
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-20.5
       parent: 1
-      type: Transform
   - uid: 1479
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-21.5
       parent: 1
-      type: Transform
 - proto: WindowDirectional
   entities:
   - uid: 404
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -10.5,-14.5
       parent: 1
-      type: Transform
   - uid: 405
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 10.5,-14.5
       parent: 1
-      type: Transform
   - uid: 410
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 411
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -13.5,-13.5
       parent: 1
-      type: Transform
   - uid: 420
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-12.5
       parent: 1
-      type: Transform
   - uid: 421
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 13.5,-13.5
       parent: 1
-      type: Transform
 ...
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
index ae01828a0ed..4cbef46386f 100644
--- a/Resources/Maps/_NF/Outpost/frontier.yml
+++ b/Resources/Maps/_NF/Outpost/frontier.yml
@@ -4527,7 +4527,7 @@ entities:
     - type: Transform
       pos: -5.5,25.5
       parent: 2173
-- proto: AirlockAtmosphericsGlassLocked
+- proto: AirlockFrontierCommandAtmosphericsGlassLocked
   entities:
   - uid: 4082
     components:
@@ -4551,7 +4551,7 @@ entities:
     - type: Transform
       pos: 0.5,35.5
       parent: 2173
-- proto: AirlockEngineeringGlassLocked
+- proto: AirlockFrontierCommandEngineeringGlassLocked
   entities:
   - uid: 4079
     components:
@@ -4568,7 +4568,7 @@ entities:
     - type: Transform
       pos: -40.5,10.5
       parent: 2173
-- proto: AirlockEngineeringLocked
+- proto: AirlockFrontierCommandEngineeringLocked
   entities:
   - uid: 4136
     components:
@@ -5576,7 +5576,7 @@ entities:
     - type: Transform
       pos: 49.5,12.5
       parent: 2173
-- proto: AirlockMaintEngiLocked
+- proto: AirlockMaintFrontierBridgeLocked
   entities:
   - uid: 4131
     components:
@@ -41648,7 +41648,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 52.5,16.5
       parent: 2173
-- proto: WindoorSecureEngineeringLocked
+- proto: WindoorSecureFrontierCommandLocked
   entities:
   - uid: 2128
     components:
@@ -41671,7 +41671,7 @@ entities:
     - type: Transform
       pos: -33.5,6.5
       parent: 2173
-- proto: WindoorSecureHeadOfPersonnelLocked
+- proto: WindoorSecureFrontierCommandLocked
   entities:
   - uid: 2642
     components:
diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
index b4adf4a0ad9..00654063fa1 100644
--- a/Resources/Maps/_NF/POI/cove.yml
+++ b/Resources/Maps/_NF/POI/cove.yml
@@ -89,8 +89,8 @@ entities:
     - type: Broadphase
     - type: Physics
       bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
+      angularDamping: 999999
+      linearDamping: 999999
       fixedRotation: False
       bodyType: Dynamic
     - type: Fixtures
@@ -1073,16 +1073,6 @@ entities:
       - 171
       - 974
       - 973
-- proto: AirCanister
-  entities:
-  - uid: 901
-    components:
-    - type: Transform
-      anchored: True
-      pos: 8.5,11.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: AirlockFreezer
   entities:
   - uid: 345
@@ -2352,6 +2342,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 1
+- proto: BoxBeanbag
+  entities:
+  - uid: 2078
+    components:
+    - type: Transform
+      pos: -3.469921,8.8195715
+      parent: 1
 - proto: BoxCardboard
   entities:
   - uid: 1993
@@ -2399,12 +2396,12 @@ entities:
   - uid: 1136
     components:
     - type: Transform
-      pos: -3.6354046,8.857361
+      pos: -5.3925104,5.652456
       parent: 1
   - uid: 1137
     components:
     - type: Transform
-      pos: -3.3854048,8.732361
+      pos: -5.600844,5.8334475
       parent: 1
 - proto: BrokenBottle
   entities:
@@ -4062,27 +4059,27 @@ entities:
       parent: 1
 - proto: CannonBallGlassshot
   entities:
-  - uid: 681
+  - uid: 604
     components:
     - type: Transform
-      pos: -2.3322191,11.64659
+      pos: -2.308549,11.819694
       parent: 1
-  - uid: 684
+  - uid: 682
     components:
     - type: Transform
-      pos: -2.5926356,11.792424
+      pos: -2.6314654,11.913444
       parent: 1
 - proto: CannonBallGrapeshot
   entities:
-  - uid: 682
+  - uid: 2069
     components:
     - type: Transform
-      pos: -3.3530524,11.698674
+      pos: -2.6731322,11.705111
       parent: 1
-  - uid: 687
+  - uid: 2070
     components:
     - type: Transform
-      pos: -3.5926356,11.813257
+      pos: -2.3606322,11.673861
       parent: 1
 - proto: CargoPallet
   entities:
@@ -4209,6 +4206,12 @@ entities:
     - type: Transform
       pos: -5.5,13.5
       parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,11.5
+      parent: 1
   - uid: 115
     components:
     - type: Transform
@@ -4265,12 +4268,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,12.5
       parent: 1
-  - uid: 604
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,11.5
-      parent: 1
   - uid: 627
     components:
     - type: Transform
@@ -5150,6 +5147,13 @@ entities:
           showEnts: False
           occludes: True
           ent: null
+- proto: CrateFunHoverbikeNFPirate
+  entities:
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 1
 - proto: CrateFunParty
   entities:
   - uid: 125
@@ -5596,6 +5600,20 @@ entities:
     - type: Transform
       pos: 10.652694,21.650824
       parent: 1
+- proto: DoubleEmergencyNitrogenTankFilled
+  entities:
+  - uid: 2065
+    components:
+    - type: Transform
+      pos: 10.366604,23.616253
+      parent: 1
+- proto: DoubleEmergencyOxygenTankFilled
+  entities:
+  - uid: 2066
+    components:
+    - type: Transform
+      pos: 10.72077,23.605837
+      parent: 1
 - proto: Dresser
   entities:
   - uid: 1697
@@ -5921,7 +5939,7 @@ entities:
       pos: 7.5,28.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -2234.199
+      secondsUntilStateChange: -3553.7524
       state: Opening
 - proto: FenceWoodSmallCorner
   entities:
@@ -7039,6 +7057,19 @@ entities:
     - type: Transform
       pos: 2.4884746,-4.2928896
       parent: 1
+- proto: GasMixerFlipped
+  entities:
+  - uid: 901
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,11.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 1285
@@ -7310,14 +7341,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 944
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 945
     components:
     - type: Transform
@@ -7431,6 +7454,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 687
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 717
     components:
     - type: Transform
@@ -7863,13 +7894,26 @@ entities:
     - type: Transform
       pos: 3.5,12.5
       parent: 1
-- proto: LessLethalVendingMachine
+- proto: LiquidNitrogenCanister
   entities:
-  - uid: 2056
+  - uid: 2068
     components:
     - type: Transform
-      pos: -14.5,23.5
+      anchored: True
+      pos: 7.5,10.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: LiquidOxygenCanister
+  entities:
+  - uid: 2067
+    components:
+    - type: Transform
+      anchored: True
+      pos: 8.5,11.5
       parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: LuxuryPen
   entities:
   - uid: 955
@@ -7884,6 +7928,20 @@ entities:
     - type: Transform
       pos: 2.5,10.5
       parent: 1
+- proto: MagazineBoxRifleBig
+  entities:
+  - uid: 1193
+    components:
+    - type: Transform
+      pos: -14.385674,21.644907
+      parent: 1
+- proto: MagazineBoxRifleBigRubber
+  entities:
+  - uid: 2077
+    components:
+    - type: Transform
+      pos: -14.5940075,21.832407
+      parent: 1
 - proto: Mattress
   entities:
   - uid: 2023
@@ -8006,6 +8064,13 @@ entities:
     - type: Transform
       pos: -8.6548395,9.638229
       parent: 1
+- proto: PaperWrittenPirateScribbles
+  entities:
+  - uid: 2080
+    components:
+    - type: Transform
+      pos: -0.80706465,2.5555282
+      parent: 1
 - proto: PianoInstrument
   entities:
   - uid: 276
@@ -8381,11 +8446,6 @@ entities:
     - type: Transform
       pos: -3.5,13.5
       parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -3.5,11.5
-      parent: 1
   - uid: 111
     components:
     - type: Transform
@@ -8427,12 +8487,37 @@ entities:
     - type: Transform
       pos: -1.5,13.5
       parent: 1
+  - uid: 944
+    components:
+    - type: Transform
+      pos: -14.5,23.5
+      parent: 1
+  - uid: 1066
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 1
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 10.5,23.5
+      parent: 1
   - uid: 2059
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,21.5
       parent: 1
+  - uid: 2064
+    components:
+    - type: Transform
+      pos: -14.5,22.5
+      parent: 1
+  - uid: 2079
+    components:
+    - type: Transform
+      pos: -14.5,21.5
+      parent: 1
 - proto: Railing
   entities:
   - uid: 3
@@ -8850,11 +8935,6 @@ entities:
       parent: 1
 - proto: RandomStalagmiteOrCrystal
   entities:
-  - uid: 1066
-    components:
-    - type: Transform
-      pos: -13.5,21.5
-      parent: 1
   - uid: 1067
     components:
     - type: Transform
@@ -9479,6 +9559,30 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
+- proto: SpeedLoaderRifleHeavy
+  entities:
+  - uid: 2075
+    components:
+    - type: Transform
+      pos: -14.530999,22.55163
+      parent: 1
+  - uid: 2076
+    components:
+    - type: Transform
+      pos: -14.426833,22.67663
+      parent: 1
+- proto: SpeedLoaderRifleHeavyRubber
+  entities:
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: -14.318903,23.622427
+      parent: 1
+  - uid: 2073
+    components:
+    - type: Transform
+      pos: -14.48557,23.487011
+      parent: 1
 - proto: StairStageWood
   entities:
   - uid: 1599
@@ -10013,13 +10117,6 @@ entities:
     - type: Transform
       pos: -5.323082,7.791107
       parent: 1
-- proto: VendingMachineTankDispenserEVA
-  entities:
-  - uid: 1193
-    components:
-    - type: Transform
-      pos: 10.5,23.5
-      parent: 1
 - proto: WallmountTelevisionFrame
   entities:
   - uid: 737
@@ -12755,6 +12852,13 @@ entities:
       parent: 1875
     - type: Physics
       canCollide: False
+- proto: WeaponEmpEmitter
+  entities:
+  - uid: 681
+    components:
+    - type: Transform
+      pos: -3.471903,11.63687
+      parent: 1
 - proto: WeaponGrapplingGun
   entities:
   - uid: 2063
@@ -12799,6 +12903,20 @@ entities:
           showEnts: False
           occludes: True
           ent: null
+- proto: WeaponRevolverArgenti
+  entities:
+  - uid: 2074
+    components:
+    - type: Transform
+      pos: -14.541416,22.73913
+      parent: 1
+- proto: WeaponRevolverArgentiNonlethal
+  entities:
+  - uid: 2071
+    components:
+    - type: Transform
+      pos: -14.495986,23.716177
+      parent: 1
 - proto: WeaponRifleBB
   entities:
   - uid: 1695
@@ -12806,6 +12924,13 @@ entities:
     - type: Transform
       pos: 23.56418,24.946178
       parent: 1
+- proto: WeaponShotgunDoubleBarreledRubber
+  entities:
+  - uid: 2081
+    components:
+    - type: Transform
+      pos: -3.574088,8.4966545
+      parent: 1
 - proto: WeldingFuelTankHighCapacity
   entities:
   - uid: 395
diff --git a/Resources/Maps/_NF/Shuttles/ceres.yml b/Resources/Maps/_NF/Shuttles/ceres.yml
index 95074bd496e..695e02d5b38 100644
--- a/Resources/Maps/_NF/Shuttles/ceres.yml
+++ b/Resources/Maps/_NF/Shuttles/ceres.yml
@@ -43,19 +43,19 @@ entities:
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADXgAAAAADPwAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAADfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAZwAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAZgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAABeQAAAAADeQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAAAeQAAAAADeQAAAAABfQAAAAAALgAAAAADAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIwAAAAADIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABIgAAAAABIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACIgAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAIgAAAAABIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAIwAAAAADIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAACXgAAAAAAXgAAAAAAfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAACXgAAAAADXgAAAAADXgAAAAADPwAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAABXgAAAAADfQAAAAAAPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAZwAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfQAAAAAAawAAAAAAawAAAAAAawAAAAAAZgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAABeQAAAAADeQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAeQAAAAAAeQAAAAADeQAAAAABfQAAAAAALgAAAAADAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIwAAAAADIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABIgAAAAABIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACIgAAAAADIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAIgAAAAABIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAIwAAAAADIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: PwAAAAAAfQAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAADbwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAdAAAAAACcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAfQAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAADbwAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAdAAAAAADdAAAAAABfQAAAAAAdAAAAAADdAAAAAAAdAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABIgAAAAAAHgAAAAADHgAAAAABIwAAAAACIwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABLgAAAAABLgAAAAACIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAADHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAABIwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAACIgAAAAABHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIwAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: PwAAAAAAfQAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAADbwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAdAAAAAACcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPwAAAAAAfQAAAAAAbwAAAAADbwAAAAADbwAAAAADbwAAAAADbwAAAAACbwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAdAAAAAADdAAAAAABfQAAAAAAdAAAAAADdAAAAAAAdAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAAAXAAAAAAAXAAAAAACXAAAAAABIgAAAAAAHgAAAAADHgAAAAABIwAAAAACIwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABLgAAAAABLgAAAAACIwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXAAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAADHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAABIwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAIgAAAAABIgAAAAACHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAACIgAAAAABHgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIwAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAIwAAAAAAIwAAAAABIwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADHgAAAAABHgAAAAADHgAAAAACfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABHgAAAAABfQAAAAAAZwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAHgAAAAACZwAAAAABXgAAAAADXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAIwAAAAAAIwAAAAABIwAAAAADIgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADHgAAAAABHgAAAAADHgAAAAACIgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABHgAAAAABfQAAAAAAZwAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAHgAAAAACZwAAAAABXgAAAAADXgAAAAABXgAAAAACXgAAAAACXgAAAAADXgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAXgAAAAACXgAAAAAAXgAAAAADXgAAAAABXgAAAAAAXgAAAAABXgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAXgAAAAADXgAAAAADXgAAAAACXgAAAAACXgAAAAADXgAAAAACXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXgAAAAABXgAAAAACXgAAAAAAXgAAAAAAXgAAAAACXgAAAAABXgAAAAAC
           version: 6
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACZwAAAAADbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACdAAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACfQAAAAAAbwAAAAADbwAAAAADbwAAAAAAbwAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACbwAAAAABcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABbwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAABbwAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAADbwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACZwAAAAADbwAAAAACbwAAAAACbwAAAAADbwAAAAAAbwAAAAACdAAAAAAALQAAAAAALQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACfQAAAAAAbwAAAAADbwAAAAADbwAAAAAAbwAAAAACbwAAAAABfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAACbwAAAAABcAAAAAABcAAAAAAAcAAAAAABcAAAAAAAcAAAAAABbwAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAABbwAAAAABcAAAAAACcAAAAAAAcAAAAAADcAAAAAABcAAAAAADbwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -83,15 +83,15 @@ entities:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            162: 8,-10
-            163: 8,-11
+            152: 8,-10
+            153: 8,-11
         - node:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            159: 7,-11
-            168: -3,-12
-            169: -2,-12
+            151: 7,-11
+            154: -3,-12
+            155: -2,-12
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkCornerNe
@@ -120,12 +120,12 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileDarkEndE
           decals:
-            112: 7,-10
+            110: 7,-10
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkEndW
           decals:
-            113: 6,-10
+            111: 6,-10
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
@@ -198,37 +198,37 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerNe
           decals:
-            115: 3,-12
+            113: 3,-12
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerNw
           decals:
-            121: 0,-12
+            119: 0,-12
         - node:
             color: '#80C71FFF'
             id: BrickTileWhiteInnerSe
           decals:
-            133: -1,-7
+            126: -1,-7
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteInnerSw
           decals:
-            117: 5,-10
+            115: 5,-10
         - node:
             color: '#80C71FFF'
             id: BrickTileWhiteInnerSw
           decals:
-            134: 1,-7
+            127: 1,-7
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSw
           decals:
-            130: 0,-10
+            123: 0,-10
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineE
           decals:
-            114: 3,-11
+            112: 3,-11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineE
@@ -239,7 +239,7 @@ entities:
             color: '#80C71FFF'
             id: BrickTileWhiteLineN
           decals:
-            135: 0,-9
+            128: 0,-9
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineN
@@ -251,7 +251,7 @@ entities:
             color: '#80C71FFF'
             id: BrickTileWhiteLineS
           decals:
-            132: 0,-7
+            125: 0,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineS
@@ -263,12 +263,12 @@ entities:
             color: '#334E6DC8'
             id: BrickTileWhiteLineW
           decals:
-            116: 5,-11
+            114: 5,-11
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
           decals:
-            120: 0,-11
+            118: 0,-11
         - node:
             color: '#FFFFFFFF'
             id: BrickTileWhiteLineW
@@ -328,72 +328,72 @@ entities:
             color: '#474F52D3'
             id: Dirt
           decals:
-            142: -7,-23
-            143: -9,-21
+            135: -7,-23
+            136: -9,-21
         - node:
             cleanable: True
             color: '#474F52B7'
             id: DirtHeavyMonotile
           decals:
-            144: -9,-22
+            137: -9,-22
         - node:
             cleanable: True
             color: '#474F52DF'
             id: DirtHeavyMonotile
           decals:
-            140: -8,-23
-            141: -9,-20
+            133: -8,-23
+            134: -9,-20
         - node:
             cleanable: True
             color: '#474F52F2'
             id: DirtHeavyMonotile
           decals:
-            145: -6,-23
+            138: -6,-23
         - node:
             cleanable: True
             color: '#474F527F'
             id: DirtLight
           decals:
-            150: -8,-21
+            143: -8,-21
         - node:
             cleanable: True
             color: '#474F5295'
             id: DirtLight
           decals:
-            146: -8,-22
-            149: -7,-22
+            139: -8,-22
+            142: -7,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            137: 1,-12
-            138: 0,-10
-            139: 2,-11
-            151: -6,-20
+            130: 1,-12
+            131: 0,-10
+            132: 2,-11
+            144: -6,-20
         - node:
             cleanable: True
             color: '#474F529E'
             id: DirtMedium
           decals:
-            147: -8,-20
+            140: -8,-20
         - node:
             cleanable: True
             color: '#474F52D6'
             id: DirtMedium
           decals:
-            148: -6,-22
+            141: -6,-22
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            136: 0,-12
+            129: 0,-12
         - node:
             color: '#334E6DC8'
             id: MiniTileCheckerAOverlay
           decals:
-            118: 4,-11
+            116: 4,-11
         - node:
             color: '#80C71FFF'
             id: MiniTileCheckerAOverlay
@@ -418,45 +418,45 @@ entities:
             17: -2,-4
             18: -2,-3
             19: -1,-4
-            131: 0,-8
+            124: 0,-8
         - node:
             color: '#EFB34196'
             id: MiniTileCheckerBOverlay
           decals:
-            119: -1,-11
+            117: -1,-11
         - node:
             color: '#791500FF'
             id: MiniTileWhiteInnerNe
           decals:
-            157: -3,-17
+            150: -3,-17
         - node:
             color: '#791500FF'
             id: MiniTileWhiteLineE
           decals:
-            124: -3,-14
-            152: -3,-15
-            153: -3,-16
+            122: -3,-14
+            145: -3,-15
+            146: -3,-16
         - node:
             color: '#791500FF'
             id: MiniTileWhiteLineN
           decals:
-            154: -2,-17
-            155: -1,-17
-            156: 0,-17
+            147: -2,-17
+            148: -1,-17
+            149: 0,-17
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
             54: 2,-13
             55: 3,-13
-            122: -6,-12
+            120: -6,-12
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
             52: 2,-13
             53: 3,-13
-            123: -6,-12
+            121: -6,-12
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
@@ -501,107 +501,92 @@ entities:
       version: 2
       data:
         tiles:
+          0,-1:
+            0: 14335
           0,0:
-            0: 3
             1: 4
           -1,0:
             1: 4
-            0: 8
-          -1,-2:
-            1: 276
-            0: 65256
           -1,-1:
-            0: 61183
-            1: 256
-          0,-2:
-            0: 65523
-            1: 4
-          0,-1:
-            0: 65535
-          1,-2:
-            1: 2418
-            0: 4236
-          1,-1:
-            0: 17
+            0: 36078
             1: 256
           -3,-3:
             1: 8
-            0: 34944
+          -2,-3:
+            0: 30580
           -3,-2:
-            0: 8
             1: 128
-          -2,-4:
-            0: 65535
-          -2,-3:
-            0: 65535
           -2,-2:
-            0: 55
-            1: 968
+            0: 3
+            2: 968
+          -2,-4:
+            0: 28398
+          -2,-5:
+            0: 61167
           -1,-4:
-            0: 65535
+            0: 3067
           -1,-3:
-            0: 36863
-            1: 20480
-          0,-4:
+            0: 247
+            1: 4096
+            2: 16384
+          -1,-2:
+            2: 276
+            0: 60544
+          -1,-5:
             0: 65535
+          0,-4:
+            0: 52733
           0,-3:
-            0: 16383
-            1: 16384
+            0: 4607
+            2: 16384
+          0,-2:
+            0: 63281
+            2: 4
+          0,-5:
+            0: 65503
           1,-4:
-            0: 65535
-          1,-3:
             0: 61439
+          1,-3:
+            0: 52976
             1: 4096
-          2,-4:
-            0: 4369
+          1,-2:
+            2: 2418
+            0: 8
+          1,-1:
+            1: 256
+          1,-5:
+            0: 65407
           2,-3:
-            0: 13105
+            0: 4368
             1: 2
           2,-2:
-            0: 19
-            1: 288
-          -2,-5:
-            0: 65535
+            0: 1
+            2: 256
+            1: 32
+          -3,-6:
+            1: 72
+            0: 35840
+          -3,-5:
+            0: 12
+            1: 64
+            2: 2048
           -2,-6:
-            0: 65527
-            1: 8
+            0: 24565
           -1,-6:
-            0: 61671
-            1: 3856
-          -1,-5:
-            0: 65535
+            1: 1
+            2: 3616
           0,-6:
-            0: 61692
-            1: 3840
-          0,-5:
-            0: 65535
+            2: 3968
           1,-6:
-            0: 65261
-            1: 274
-          1,-5:
-            0: 65535
-          2,-5:
-            0: 4407
-            1: 576
-          -2,-7:
-            0: 65024
-          -1,-7:
-            0: 29440
-          0,-7:
-            0: 51200
-          1,-7:
-            0: 65280
-          2,-7:
-            0: 4096
+            1: 1
+            0: 3808
           2,-6:
-            0: 30513
+            0: 13072
             1: 66
-          -3,-6:
-            1: 72
-            0: 52352
-          -3,-5:
-            0: 140
-            1: 2112
+          2,-5:
+            0: 3
+            2: 512
+            1: 64
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -633,6 +618,21 @@ 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
@@ -652,7 +652,7 @@ entities:
       - 775
       - 419
       - 382
-      - 677
+      - 685
       - 566
       - 417
       - 418
@@ -666,8 +666,6 @@ entities:
       - 590
       - 299
       - 774
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 494
     components:
     - type: Transform
@@ -677,9 +675,7 @@ entities:
       devices:
       - 241
       - 301
-      - 458
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 459
   - uid: 495
     components:
     - type: Transform
@@ -691,8 +687,6 @@ entities:
       - 646
       - 698
       - 771
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 585
     components:
     - type: Transform
@@ -700,12 +694,10 @@ entities:
       parent: 2
     - type: DeviceList
       devices:
-      - 283
+      - 284
       - 265
       - 299
       - 769
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 588
     components:
     - type: Transform
@@ -715,7 +707,7 @@ entities:
       devices:
       - 180
       - 382
-      - 422
+      - 423
       - 416
       - 415
       - 419
@@ -726,18 +718,17 @@ entities:
       - 529
       - 496
       - 396
-      - 677
-    - type: AtmosDevice
-      joinedGrid: 2
+      - 685
 - proto: AirCanister
   entities:
-  - uid: 802
+  - uid: 803
     components:
     - type: Transform
+      anchored: True
       pos: 7.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
+    - type: Physics
+      bodyType: Static
 - proto: AirlockCommand
   entities:
   - uid: 130
@@ -778,12 +769,12 @@ entities:
     - type: Transform
       pos: 0.5,-7.5
       parent: 2
-  - uid: 546
+  - uid: 547
     components:
     - type: Transform
       pos: 1.5,-19.5
       parent: 2
-  - uid: 671
+  - uid: 677
     components:
     - type: Transform
       pos: 1.5,-14.5
@@ -859,6 +850,22 @@ entities:
     - type: Transform
       pos: 8.5,-21.5
       parent: 2
+- proto: AlwaysPoweredlightGreen
+  entities:
+  - uid: 818
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,-6.5
+      parent: 2
+- proto: AlwaysPoweredlightRed
+  entities:
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-6.5
+      parent: 2
 - proto: APCBasic
   entities:
   - uid: 457
@@ -956,36 +963,26 @@ entities:
     - type: Transform
       pos: 2.5,-21.5
       parent: 2
-  - uid: 531
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 2
   - uid: 533
     components:
     - type: Transform
       pos: -0.5,-21.5
       parent: 2
-  - uid: 573
+  - uid: 572
     components:
     - type: Transform
-      pos: -3.5,-21.5
+      pos: -3.5,-23.5
       parent: 2
-  - uid: 580
+  - uid: 575
     components:
     - type: Transform
-      pos: 4.5,-21.5
+      pos: 4.5,-23.5
       parent: 2
   - uid: 581
     components:
     - type: Transform
       pos: 5.5,-23.5
       parent: 2
-  - uid: 582
-    components:
-    - type: Transform
-      pos: -4.5,-23.5
-      parent: 2
   - uid: 583
     components:
     - type: Transform
@@ -1014,7 +1011,7 @@ entities:
   - uid: 696
     components:
     - type: Transform
-      pos: -3.5,-22.5
+      pos: 3.5,-22.5
       parent: 2
   - uid: 703
     components:
@@ -1041,6 +1038,11 @@ entities:
     - type: Transform
       pos: 9.5,-23.5
       parent: 2
+  - uid: 729
+    components:
+    - type: Transform
+      pos: -2.5,-22.5
+      parent: 2
   - uid: 747
     components:
     - type: Transform
@@ -1141,9 +1143,29 @@ entities:
     - type: Transform
       pos: -3.5,-1.5
       parent: 2
+- proto: BenchSofaLeft
+  entities:
+  - uid: 739
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-22.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: BenchSofaRight
+  entities:
+  - uid: 286
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-21.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: BoozeDispenser
   entities:
-  - uid: 228
+  - uid: 229
     components:
     - type: Transform
       pos: -0.5,-13.5
@@ -1155,6 +1177,50 @@ entities:
     - type: Transform
       pos: -0.73503387,-5.6378756
       parent: 2
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 578
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-6.5
+      parent: 2
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 1.5,-13.5
+      parent: 2
+  - uid: 582
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-18.5
+      parent: 2
+  - uid: 654
+    components:
+    - type: Transform
+      pos: 6.5,-7.5
+      parent: 2
+  - uid: 813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-20.5
+      parent: 2
+- proto: ButtonFrameGrey
+  entities:
+  - uid: 640
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
+      parent: 2
+  - uid: 649
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
+      parent: 2
 - proto: CableApcExtension
   entities:
   - uid: 100
@@ -1182,20 +1248,15 @@ entities:
     - type: Transform
       pos: -7.5,-19.5
       parent: 2
-  - uid: 127
-    components:
-    - type: Transform
-      pos: -2.5,-14.5
-      parent: 2
   - uid: 128
     components:
     - type: Transform
-      pos: -3.5,-14.5
+      pos: -2.5,-14.5
       parent: 2
   - uid: 129
     components:
     - type: Transform
-      pos: -5.5,-14.5
+      pos: -3.5,-14.5
       parent: 2
   - uid: 148
     components:
@@ -1205,14 +1266,19 @@ entities:
   - uid: 149
     components:
     - type: Transform
-      pos: -1.5,-14.5
+      pos: -5.5,-14.5
       parent: 2
   - uid: 158
     components:
     - type: Transform
-      pos: -0.5,-14.5
+      pos: -1.5,-14.5
       parent: 2
   - uid: 167
+    components:
+    - type: Transform
+      pos: -0.5,-14.5
+      parent: 2
+  - uid: 168
     components:
     - type: Transform
       pos: -0.5,-15.5
@@ -1644,12 +1710,12 @@ entities:
       parent: 2
 - proto: CableHV
   entities:
-  - uid: 119
+  - uid: 127
     components:
     - type: Transform
       pos: -3.5,-11.5
       parent: 2
-  - uid: 229
+  - uid: 234
     components:
     - type: Transform
       pos: -1.5,-11.5
@@ -1659,19 +1725,19 @@ entities:
     - type: Transform
       pos: -1.5,-11.5
       parent: 2
-  - uid: 539
+  - uid: 545
     components:
     - type: Transform
       pos: -3.5,-10.5
       parent: 2
-  - uid: 709
+  - uid: 770
     components:
     - type: Transform
       pos: -2.5,-11.5
       parent: 2
 - proto: CableMV
   entities:
-  - uid: 168
+  - uid: 176
     components:
     - type: Transform
       pos: -2.5,-10.5
@@ -1686,7 +1752,7 @@ entities:
     - type: Transform
       pos: 2.5,-10.5
       parent: 2
-  - uid: 238
+  - uid: 240
     components:
     - type: Transform
       pos: -3.5,-10.5
@@ -1761,39 +1827,39 @@ entities:
     - type: Transform
       pos: 1.5,-12.5
       parent: 2
-  - uid: 570
+  - uid: 571
     components:
     - type: Transform
       pos: 2.5,-16.5
       parent: 2
-  - uid: 794
+  - uid: 795
     components:
     - type: Transform
       pos: 0.5,-16.5
       parent: 2
-  - uid: 795
+  - uid: 796
     components:
     - type: Transform
       pos: -0.5,-16.5
       parent: 2
-  - uid: 796
+  - uid: 797
     components:
     - type: Transform
       pos: -1.5,-16.5
       parent: 2
-  - uid: 797
+  - uid: 798
     components:
     - type: Transform
       pos: -2.5,-16.5
       parent: 2
-  - uid: 798
+  - uid: 799
     components:
     - type: Transform
       pos: -3.5,-16.5
       parent: 2
 - proto: CableTerminal
   entities:
-  - uid: 179
+  - uid: 182
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1886,7 +1952,7 @@ entities:
       parent: 2
 - proto: ChairFolding
   entities:
-  - uid: 460
+  - uid: 464
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2006,14 +2072,14 @@ entities:
       parent: 2
 - proto: ClosetChefFilled
   entities:
-  - uid: 799
+  - uid: 800
     components:
     - type: Transform
       pos: 4.5,-18.5
       parent: 2
 - proto: ComputerShuttle
   entities:
-  - uid: 437
+  - uid: 458
     components:
     - type: Transform
       pos: 7.5,-7.5
@@ -2028,7 +2094,7 @@ entities:
       parent: 2
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 338
+  - uid: 339
     components:
     - type: Transform
       pos: 1.5,-15.5
@@ -2146,11 +2212,15 @@ entities:
   entities:
   - uid: 621
     components:
+    - type: MetaData
+      name: transport to botany
     - type: Transform
       pos: 4.5,-13.5
       parent: 2
   - uid: 622
     components:
+    - type: MetaData
+      name: transport to kitchen
     - type: Transform
       pos: 1.5,-6.5
       parent: 2
@@ -2163,7 +2233,7 @@ entities:
       parent: 2
 - proto: Dropper
   entities:
-  - uid: 472
+  - uid: 474
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2171,7 +2241,7 @@ entities:
       parent: 2
 - proto: EmergencyLight
   entities:
-  - uid: 1
+  - uid: 3
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2343,7 +2413,7 @@ entities:
     - type: Transform
       pos: 1.5,-14.5
       parent: 2
-  - uid: 677
+  - uid: 685
     components:
     - type: Transform
       pos: 1.5,-17.5
@@ -2370,19 +2440,19 @@ entities:
       fixtures: {}
 - proto: FoodCartCold
   entities:
-  - uid: 656
+  - uid: 414
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 8.5,-22.5
+      pos: 7.5,-22.5
       parent: 2
 - proto: FoodCartHot
   entities:
-  - uid: 640
+  - uid: 684
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 7.5,-22.5
+      pos: 6.5,-22.5
       parent: 2
 - proto: FoodContainerEgg
   entities:
@@ -2422,8 +2492,6 @@ entities:
     - type: Transform
       pos: -1.5,-8.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeBend
@@ -2451,7 +2519,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 284
+  - uid: 287
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2459,7 +2527,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 297
+  - uid: 298
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2475,14 +2543,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 394
+  - uid: 397
     components:
     - type: Transform
       pos: -3.5,-15.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 411
+  - uid: 412
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2515,7 +2583,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 547
+  - uid: 570
     components:
     - type: Transform
       pos: 2.5,-16.5
@@ -2524,14 +2592,6 @@ entities:
       color: '#990000FF'
 - proto: GasPipeStraight
   entities:
-  - uid: 3
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-13.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 73
     components:
     - type: Transform
@@ -2540,6 +2600,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 74
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-13.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 131
     components:
     - type: Transform
@@ -2719,7 +2787,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 282
+  - uid: 283
     components:
     - type: Transform
       pos: 2.5,-18.5
@@ -2747,7 +2815,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 292
+  - uid: 297
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2755,7 +2823,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 303
+  - uid: 304
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2763,14 +2831,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 304
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-16.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 308
     components:
     - type: Transform
@@ -2805,8 +2865,8 @@ entities:
   - uid: 316
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-19.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-16.5
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -2845,22 +2905,22 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 340
+  - uid: 338
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-14.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-19.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 341
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,-16.5
+      pos: -1.5,-14.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 342
     components:
     - type: Transform
@@ -2870,6 +2930,14 @@ entities:
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 346
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-16.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 347
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2877,7 +2945,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 347
+  - uid: 349
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2885,7 +2953,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 349
+  - uid: 350
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2893,7 +2961,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 350
+  - uid: 351
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2901,7 +2969,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 351
+  - uid: 352
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -2909,7 +2977,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 352
+  - uid: 353
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2917,7 +2985,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 353
+  - uid: 355
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -2925,7 +2993,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 358
+  - uid: 383
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2933,14 +3001,14 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 383
+  - uid: 394
     components:
     - type: Transform
       pos: 3.5,-13.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 402
+  - uid: 403
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2948,7 +3016,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 403
+  - uid: 411
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -3126,7 +3194,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 273
+  - uid: 274
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -3134,7 +3202,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 287
+  - uid: 292
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3142,7 +3210,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 339
+  - uid: 340
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -3150,7 +3218,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 355
+  - uid: 358
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -3166,7 +3234,7 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 513
+  - uid: 539
     components:
     - type: Transform
       pos: -0.5,-16.5
@@ -3183,29 +3251,25 @@ entities:
       color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 412
+  - uid: 422
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasPressurePump
   entities:
-  - uid: 267
+  - uid: 273
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentPump
   entities:
-  - uid: 283
+  - uid: 284
     components:
     - type: Transform
       pos: 5.5,-9.5
@@ -3213,8 +3277,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 585
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 323
@@ -3222,8 +3284,6 @@ entities:
     - type: Transform
       pos: -5.5,-9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 426
@@ -3232,11 +3292,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 458
+  - uid: 459
     components:
     - type: Transform
       pos: -1.5,-10.5
@@ -3244,8 +3302,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 494
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 496
@@ -3254,8 +3310,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 590
@@ -3263,8 +3317,6 @@ entities:
     - type: Transform
       pos: 3.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 633
@@ -3273,8 +3325,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-15.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 646
@@ -3282,8 +3332,6 @@ entities:
     - type: Transform
       pos: 1.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 727
@@ -3292,8 +3340,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-21.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -3304,8 +3350,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 265
@@ -3314,8 +3358,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 300
@@ -3324,8 +3366,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 322
@@ -3333,8 +3373,6 @@ entities:
     - type: Transform
       pos: -6.5,-9.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 344
@@ -3343,11 +3381,9 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 422
+  - uid: 423
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -3356,8 +3392,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 588
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 529
@@ -3366,8 +3400,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 591
@@ -3376,8 +3408,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 698
@@ -3385,8 +3415,6 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -3548,15 +3576,15 @@ entities:
     - type: Transform
       pos: 8.5,-15.5
       parent: 2
-  - uid: 274
+  - uid: 276
     components:
     - type: Transform
-      pos: -1.5,-15.5
+      pos: 8.5,-23.5
       parent: 2
-  - uid: 276
+  - uid: 282
     components:
     - type: Transform
-      pos: 8.5,-23.5
+      pos: -1.5,-15.5
       parent: 2
   - uid: 302
     components:
@@ -3598,11 +3626,6 @@ entities:
     - type: Transform
       pos: 10.5,-20.5
       parent: 2
-  - uid: 655
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 2
   - uid: 669
     components:
     - type: Transform
@@ -3613,23 +3636,25 @@ entities:
     - type: Transform
       pos: -0.5,-20.5
       parent: 2
-  - uid: 741
+  - uid: 751
     components:
     - type: Transform
-      pos: -4.5,-22.5
+      pos: -9.5,-20.5
       parent: 2
-  - uid: 751
+  - uid: 761
     components:
     - type: Transform
-      pos: -9.5,-20.5
+      pos: -3.5,-22.5
       parent: 2
 - proto: Gyroscope
   entities:
-  - uid: 266
+  - uid: 267
     components:
     - type: Transform
       pos: 8.5,-9.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 490
@@ -3811,7 +3836,7 @@ entities:
       parent: 2
 - proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 176
+  - uid: 179
     components:
     - type: Transform
       pos: -2.5,-11.5
@@ -3820,7 +3845,7 @@ entities:
       on: False
     - type: Physics
       bodyType: Static
-  - uid: 234
+  - uid: 235
     components:
     - type: Transform
       pos: -1.5,-11.5
@@ -3841,7 +3866,7 @@ entities:
     - type: Transform
       pos: -8.5,-20.5
       parent: 2
-  - uid: 226
+  - uid: 228
     components:
     - type: Transform
       pos: 0.5,-18.5
@@ -3858,12 +3883,6 @@ entities:
       parent: 2
 - proto: Poweredlight
   entities:
-  - uid: 106
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,-6.5
-      parent: 2
   - uid: 201
     components:
     - type: Transform
@@ -3875,12 +3894,6 @@ entities:
     - type: Transform
       pos: 0.5,-21.5
       parent: 2
-  - uid: 389
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-6.5
-      parent: 2
   - uid: 390
     components:
     - type: Transform
@@ -3926,12 +3939,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-12.5
       parent: 2
-  - uid: 578
+  - uid: 573
     components:
     - type: Transform
       pos: 9.5,-19.5
       parent: 2
-  - uid: 662
+  - uid: 671
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -3955,6 +3968,18 @@ entities:
     - type: Transform
       pos: -6.5,-21.5
       parent: 2
+  - uid: 661
+    components:
+    - type: Transform
+      pos: 6.5,-21.5
+      parent: 2
+- proto: Rack
+  entities:
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 8.5,-22.5
+      parent: 2
 - proto: Railing
   entities:
   - uid: 153
@@ -4007,7 +4032,7 @@ entities:
       parent: 2
 - proto: RandomPainting
   entities:
-  - uid: 236
+  - uid: 238
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -4050,13 +4075,41 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 2
+- proto: ServiceTechFab
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 7.5,-12.5
+      parent: 2
+- proto: SheetGlass
+  entities:
+  - uid: 820
+    components:
+    - type: Transform
+      pos: 7.63264,-13.474377
+      parent: 2
 - proto: SheetPlasma
   entities:
-  - uid: 697
+  - uid: 709
     components:
     - type: Transform
       pos: -2,-10.5
       parent: 2
+- proto: SheetPlastic
+  entities:
+  - uid: 817
+    components:
+    - type: Transform
+      pos: 7.3556504,-13.585793
+      parent: 2
+- proto: SheetSteel
+  entities:
+  - uid: 819
+    components:
+    - type: Transform
+      pos: 7.38264,-13.422256
+      parent: 2
 - proto: ShuttersNormalOpen
   entities:
   - uid: 293
@@ -4067,7 +4120,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 294
     components:
     - type: Transform
@@ -4076,7 +4129,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 295
     components:
     - type: Transform
@@ -4085,7 +4138,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 296
     components:
     - type: Transform
@@ -4093,7 +4146,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 311
     components:
     - type: Transform
@@ -4102,7 +4155,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 312
     components:
     - type: Transform
@@ -4111,7 +4164,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 360
     components:
     - type: Transform
@@ -4119,7 +4172,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 361
     components:
     - type: Transform
@@ -4127,7 +4180,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 413
     components:
     - type: Transform
@@ -4136,7 +4189,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 239
+      - 814
   - uid: 540
     components:
     - type: Transform
@@ -4144,7 +4197,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 414
+      - 812
   - uid: 639
     components:
     - type: Transform
@@ -4152,7 +4205,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 414
+      - 812
   - uid: 652
     components:
     - type: Transform
@@ -4160,7 +4213,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 653
     components:
     - type: Transform
@@ -4168,7 +4221,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 414
+      - 812
   - uid: 659
     components:
     - type: Transform
@@ -4176,7 +4229,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 663
     components:
     - type: Transform
@@ -4184,7 +4237,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 690
     components:
     - type: Transform
@@ -4193,7 +4246,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 414
+      - 812
   - uid: 720
     components:
     - type: Transform
@@ -4202,7 +4255,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 729
+      - 811
   - uid: 721
     components:
     - type: Transform
@@ -4211,7 +4264,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 729
+      - 811
   - uid: 722
     components:
     - type: Transform
@@ -4220,7 +4273,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 729
+      - 811
   - uid: 723
     components:
     - type: Transform
@@ -4228,7 +4281,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 729
+      - 811
   - uid: 724
     components:
     - type: Transform
@@ -4236,7 +4289,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 729
+      - 811
   - uid: 731
     components:
     - type: Transform
@@ -4244,7 +4297,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 730
+      - 815
   - uid: 732
     components:
     - type: Transform
@@ -4252,7 +4305,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 730
+      - 815
   - uid: 733
     components:
     - type: Transform
@@ -4261,7 +4314,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 730
+      - 815
   - uid: 734
     components:
     - type: Transform
@@ -4270,7 +4323,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 730
+      - 815
   - uid: 735
     components:
     - type: Transform
@@ -4279,7 +4332,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 730
+      - 815
   - uid: 737
     components:
     - type: Transform
@@ -4288,7 +4341,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 414
+      - 812
   - uid: 753
     components:
     - type: Transform
@@ -4296,7 +4349,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 758
     components:
     - type: Transform
@@ -4304,7 +4357,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 759
     components:
     - type: Transform
@@ -4312,7 +4365,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 760
     components:
     - type: Transform
@@ -4320,15 +4373,15 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
   - uid: 762
     components:
     - type: Transform
-      pos: -4.5,-22.5
+      pos: -3.5,-22.5
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 670
+      - 816
 - proto: ShuttersWindowOpen
   entities:
   - uid: 313
@@ -4339,7 +4392,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 744
+      - 655
   - uid: 385
     components:
     - type: Transform
@@ -4347,7 +4400,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 387
+      - 810
   - uid: 386
     components:
     - type: Transform
@@ -4355,8 +4408,8 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 387
-  - uid: 466
+      - 810
+  - uid: 472
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -4364,7 +4417,7 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       links:
-      - 744
+      - 655
 - proto: ShuttleWindow
   entities:
   - uid: 85
@@ -4517,7 +4570,7 @@ entities:
     - type: Transform
       pos: 8.5,-16.5
       parent: 2
-  - uid: 401
+  - uid: 402
     components:
     - type: Transform
       pos: -1.5,-15.5
@@ -4567,11 +4620,6 @@ entities:
     - type: Transform
       pos: 6.5,-23.5
       parent: 2
-  - uid: 684
-    components:
-    - type: Transform
-      pos: -2.5,-20.5
-      parent: 2
   - uid: 688
     components:
     - type: Transform
@@ -4582,57 +4630,71 @@ entities:
     - type: Transform
       pos: 10.5,-21.5
       parent: 2
+  - uid: 730
+    components:
+    - type: Transform
+      pos: -3.5,-22.5
+      parent: 2
   - uid: 752
     components:
     - type: Transform
       pos: -9.5,-20.5
       parent: 2
-  - uid: 761
+- proto: SignalButton
+  entities:
+  - uid: 810
     components:
+    - type: MetaData
+      name: bar shutter button
     - type: Transform
-      pos: -4.5,-22.5
+      pos: 1.5,-13.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        386:
+        - Pressed: Toggle
+        385:
+        - Pressed: Toggle
 - proto: SignalButtonDirectional
   entities:
-  - uid: 239
+  - uid: 655
     components:
+    - type: MetaData
+      name: kitchen shutter button
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -1.5,-6.5
+      pos: 1.5,-18.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        294:
-        - Pressed: Toggle
-        293:
-        - Pressed: Toggle
-        413:
-        - Pressed: Toggle
-        360:
-        - Pressed: Toggle
-        361:
-        - Pressed: Toggle
-        296:
-        - Pressed: Toggle
-        311:
-        - Pressed: Toggle
-        312:
+        472:
         - Pressed: Toggle
-        295:
+        313:
         - Pressed: Toggle
-  - uid: 387
+  - uid: 811
     components:
+    - type: MetaData
+      name: shutter button
     - type: Transform
-      pos: 0.5,-12.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-8.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        386:
+        724:
         - Pressed: Toggle
-        385:
+        723:
         - Pressed: Toggle
-  - uid: 414
+        720:
+        - Pressed: Toggle
+        721:
+        - Pressed: Toggle
+        722:
+        - Pressed: Toggle
+  - uid: 812
     components:
+    - type: MetaData
+      name: shutter button
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-20.5
@@ -4649,50 +4711,38 @@ entities:
         - Pressed: Toggle
         639:
         - Pressed: Toggle
-  - uid: 670
+  - uid: 814
     components:
+    - type: MetaData
+      name: shutter button
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-20.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-6.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        758:
+        294:
         - Pressed: Toggle
-        652:
+        293:
         - Pressed: Toggle
-        663:
+        413:
         - Pressed: Toggle
-        759:
+        360:
         - Pressed: Toggle
-        753:
+        361:
         - Pressed: Toggle
-        760:
+        296:
         - Pressed: Toggle
-        659:
+        311:
         - Pressed: Toggle
-        762:
+        312:
         - Pressed: Toggle
-  - uid: 729
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-8.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        722:
-        - Pressed: Toggle
-        721:
-        - Pressed: Toggle
-        720:
-        - Pressed: Toggle
-        723:
-        - Pressed: Toggle
-        724:
-        - Pressed: Toggle
-  - uid: 730
+        295:
+        - Pressed: Toggle
+  - uid: 815
     components:
+    - type: MetaData
+      name: shutter button
     - type: Transform
       pos: 6.5,-7.5
       parent: 2
@@ -4708,37 +4758,63 @@ entities:
         - Pressed: Toggle
         735:
         - Pressed: Toggle
-  - uid: 744
+  - uid: 816
     components:
+    - type: MetaData
+      name: dock shutter button
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-18.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-20.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        313:
+        758:
+        - Pressed: Toggle
+        652:
+        - Pressed: Toggle
+        663:
+        - Pressed: Toggle
+        759:
+        - Pressed: Toggle
+        753:
         - Pressed: Toggle
-        466:
+        760:
+        - Pressed: Toggle
+        659:
+        - Pressed: Toggle
+        762:
         - Pressed: Toggle
 - proto: SignBar
   entities:
-  - uid: 545
+  - uid: 387
     components:
     - type: Transform
-      pos: -1.5,-13.5
+      pos: -3.5,-21.5
       parent: 2
-  - uid: 800
+  - uid: 546
     components:
     - type: Transform
-      pos: -4.5,-21.5
+      pos: -1.5,-13.5
       parent: 2
-  - uid: 803
+  - uid: 804
     components:
     - type: Transform
       pos: -7.5,-18.5
       parent: 2
 - proto: SignDirectionalFood
   entities:
+  - uid: 88
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-22.5
+      parent: 2
+  - uid: 94
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-23.5
+      parent: 2
   - uid: 607
     components:
     - type: Transform
@@ -4754,7 +4830,7 @@ entities:
       parent: 2
 - proto: SignElectricalMed
   entities:
-  - uid: 801
+  - uid: 802
     components:
     - type: Transform
       pos: -0.5,-11.5
@@ -4769,14 +4845,14 @@ entities:
       parent: 2
 - proto: SMESBasic
   entities:
-  - uid: 459
+  - uid: 460
     components:
     - type: Transform
       pos: -3.5,-11.5
       parent: 2
 - proto: soda_dispenser
   entities:
-  - uid: 235
+  - uid: 236
     components:
     - type: Transform
       pos: 0.5,-13.5
@@ -4795,20 +4871,6 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 2
-- proto: SpawnPointBotanist
-  entities:
-  - uid: 575
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 2
-- proto: SpawnPointChef
-  entities:
-  - uid: 572
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 650
@@ -4816,20 +4878,6 @@ entities:
     - type: Transform
       pos: 1.5,-10.5
       parent: 2
-- proto: SpawnPointPilot
-  entities:
-  - uid: 661
-    components:
-    - type: Transform
-      pos: 7.5,-9.5
-      parent: 2
-- proto: SpawnPointServiceWorker
-  entities:
-  - uid: 626
-    components:
-    - type: Transform
-      pos: 0.5,-14.5
-      parent: 2
 - proto: SprayBottleSpaceCleaner
   entities:
   - uid: 766
@@ -4839,7 +4887,7 @@ entities:
       parent: 2
 - proto: SubstationBasic
   entities:
-  - uid: 510
+  - uid: 513
     components:
     - type: Transform
       pos: -3.5,-10.5
@@ -4865,12 +4913,12 @@ entities:
     - type: Transform
       pos: 8.5,-8.5
       parent: 2
-  - uid: 182
+  - uid: 226
     components:
     - type: Transform
       pos: 2.5,-18.5
       parent: 2
-  - uid: 240
+  - uid: 266
     components:
     - type: Transform
       pos: 3.5,-18.5
@@ -4928,19 +4976,19 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-16.5
       parent: 2
-  - uid: 464
+  - uid: 466
     components:
     - type: Transform
       pos: 1.5,-17.5
       parent: 2
 - proto: TableCounterWood
   entities:
-  - uid: 770
+  - uid: 793
     components:
     - type: Transform
       pos: 0.5,-15.5
       parent: 2
-  - uid: 793
+  - uid: 794
     components:
     - type: Transform
       pos: -0.5,-15.5
@@ -4964,7 +5012,7 @@ entities:
     - type: Transform
       pos: -6.5,-9.5
       parent: 2
-  - uid: 397
+  - uid: 401
     components:
     - type: Transform
       pos: 0.5,-13.5
@@ -5004,7 +5052,7 @@ entities:
     - type: Transform
       pos: -3.5,-14.5
       parent: 2
-  - uid: 509
+  - uid: 510
     components:
     - type: Transform
       pos: -0.5,-13.5
@@ -5017,46 +5065,62 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-17.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 224
     components:
     - type: Transform
       pos: -6.5,-5.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 225
     components:
     - type: Transform
       pos: 7.5,-5.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 259
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,-17.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 486
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-5.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 544
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,-5.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 756
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -2.5,-21.5
+      pos: -1.5,-21.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
   - uid: 757
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-21.5
+      pos: 2.5,-21.5
       parent: 2
+    - type: Thruster
+      originalPowerLoad: 1500
 - proto: VariantCubeBox
   entities:
   - uid: 233
@@ -5073,10 +5137,10 @@ entities:
       parent: 2
 - proto: VendingMachineChefDrobe
   entities:
-  - uid: 689
+  - uid: 714
     components:
     - type: Transform
-      pos: 6.5,-21.5
+      pos: 5.5,-21.5
       parent: 2
 - proto: VendingMachineChefvend
   entities:
@@ -5087,24 +5151,17 @@ entities:
       parent: 2
 - proto: VendingMachineCondiments
   entities:
-  - uid: 571
+  - uid: 626
     components:
     - type: Transform
       pos: -0.5,-15.5
       parent: 2
-- proto: VendingMachineDinnerware
-  entities:
-  - uid: 388
-    components:
-    - type: Transform
-      pos: 7.5,-12.5
-      parent: 2
 - proto: VendingMachineHydrobe
   entities:
-  - uid: 739
+  - uid: 159
     components:
     - type: Transform
-      pos: 6.5,-22.5
+      pos: 5.5,-22.5
       parent: 2
 - proto: VendingMachineNutri
   entities:
@@ -5113,6 +5170,27 @@ entities:
     - type: Transform
       pos: -1.5,-5.5
       parent: 2
+- proto: VendingMachineRestockBooze
+  entities:
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 8.2885895,-22.483995
+      parent: 2
+- proto: VendingMachineRestockChefvend
+  entities:
+  - uid: 689
+    components:
+    - type: Transform
+      pos: 8.642728,-22.360958
+      parent: 2
+- proto: VendingMachineRestockCondimentStation
+  entities:
+  - uid: 809
+    components:
+    - type: Transform
+      pos: 8.6115055,-22.640354
+      parent: 2
 - proto: VendingMachineSeedsUnlocked
   entities:
   - uid: 145
@@ -5297,11 +5375,6 @@ entities:
     - type: Transform
       pos: 0.5,-12.5
       parent: 2
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 1.5,-18.5
-      parent: 2
   - uid: 75
     components:
     - type: Transform
@@ -5352,6 +5425,11 @@ entities:
     - type: Transform
       pos: 2.5,-20.5
       parent: 2
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 1.5,-18.5
+      parent: 2
   - uid: 121
     components:
     - type: Transform
@@ -5367,36 +5445,26 @@ entities:
     - type: Transform
       pos: 4.5,-20.5
       parent: 2
-  - uid: 159
-    components:
-    - type: Transform
-      pos: 0.5,-20.5
-      parent: 2
   - uid: 166
     components:
     - type: Transform
       pos: -3.5,-20.5
       parent: 2
-  - uid: 285
+  - uid: 230
     components:
     - type: Transform
-      pos: 1.5,-12.5
+      pos: -4.5,-7.5
       parent: 2
-  - uid: 286
+  - uid: 285
     components:
     - type: Transform
-      pos: 5.5,-21.5
+      pos: 1.5,-12.5
       parent: 2
-  - uid: 298
+  - uid: 303
     components:
     - type: Transform
       pos: 1.5,-13.5
       parent: 2
-  - uid: 307
-    components:
-    - type: Transform
-      pos: 5.5,-22.5
-      parent: 2
   - uid: 356
     components:
     - type: Transform
@@ -5417,10 +5485,10 @@ entities:
     - type: Transform
       pos: -4.5,-20.5
       parent: 2
-  - uid: 474
+  - uid: 388
     components:
     - type: Transform
-      pos: 1.5,-15.5
+      pos: 5.5,-7.5
       parent: 2
   - uid: 489
     components:
@@ -5432,6 +5500,16 @@ entities:
     - type: Transform
       pos: 3.5,-9.5
       parent: 2
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 1.5,-15.5
+      parent: 2
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 0.5,-20.5
+      parent: 2
   - uid: 541
     components:
     - type: Transform
@@ -5457,6 +5535,11 @@ entities:
     - type: Transform
       pos: -6.5,-20.5
       parent: 2
+  - uid: 656
+    components:
+    - type: Transform
+      pos: -4.5,-23.5
+      parent: 2
   - uid: 658
     components:
     - type: Transform
@@ -5472,21 +5555,41 @@ entities:
     - type: Transform
       pos: 10.5,-19.5
       parent: 2
-  - uid: 685
+  - uid: 693
     components:
     - type: Transform
-      pos: -1.5,-13.5
+      pos: -2.5,-20.5
       parent: 2
-  - uid: 693
+  - uid: 697
     components:
     - type: Transform
-      pos: -4.5,-21.5
+      pos: -1.5,-13.5
       parent: 2
   - uid: 725
     components:
     - type: Transform
       pos: 8.5,-18.5
       parent: 2
+  - uid: 741
+    components:
+    - type: Transform
+      pos: -3.5,-21.5
+      parent: 2
+  - uid: 744
+    components:
+    - type: Transform
+      pos: 5.5,-23.5
+      parent: 2
+  - uid: 807
+    components:
+    - type: Transform
+      pos: 4.5,-21.5
+      parent: 2
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 4.5,-22.5
+      parent: 2
 - proto: WallShuttleDiagonal
   entities:
   - uid: 24
@@ -5547,12 +5650,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-6.5
       parent: 2
-  - uid: 88
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-7.5
-      parent: 2
   - uid: 90
     components:
     - type: Transform
@@ -5570,11 +5667,6 @@ entities:
     - type: Transform
       pos: 6.5,-6.5
       parent: 2
-  - uid: 94
-    components:
-    - type: Transform
-      pos: 5.5,-7.5
-      parent: 2
   - uid: 95
     components:
     - type: Transform
@@ -5597,12 +5689,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,-23.5
       parent: 2
-  - uid: 230
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-21.5
-      parent: 2
   - uid: 343
     components:
     - type: Transform
@@ -5621,17 +5707,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,-18.5
       parent: 2
-  - uid: 649
+  - uid: 662
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-23.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-21.5
       parent: 2
-  - uid: 654
+  - uid: 670
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-21.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-21.5
       parent: 2
   - uid: 674
     components:
@@ -5639,12 +5725,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-22.5
       parent: 2
-  - uid: 714
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-23.5
-      parent: 2
   - uid: 743
     components:
     - type: Transform
@@ -5656,6 +5736,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-22.5
       parent: 2
+  - uid: 801
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-23.5
+      parent: 2
+  - uid: 806
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-23.5
+      parent: 2
 - proto: WarpPointShip
   entities:
   - uid: 584
@@ -5672,7 +5764,7 @@ entities:
       parent: 2
 - proto: WindoorSecure
   entities:
-  - uid: 423
+  - uid: 437
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -5680,7 +5772,7 @@ entities:
       parent: 2
 - proto: Wrench
   entities:
-  - uid: 804
+  - uid: 805
     components:
     - type: Transform
       pos: 7.5,-10.5
diff --git a/Resources/Maps/_NF/Shuttles/crown.yml b/Resources/Maps/_NF/Shuttles/crown.yml
new file mode 100644
index 00000000000..c56f519efac
--- /dev/null
+++ b/Resources/Maps/_NF/Shuttles/crown.yml
@@ -0,0 +1,1783 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  30: FloorDark
+  1: FloorGlass
+  57: FloorHull
+  65: FloorMetalDiamond
+  107: FloorTechMaint
+  124: Lattice
+  125: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+      name: grid
+    - type: Transform
+      parent: invalid
+    - type: MapGrid
+      chunks:
+        0,0:
+          ind: 0,0
+          tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABOQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACOQAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAABHgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAHgAAAAACHgAAAAADHgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAawAAAAAAHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA
+          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
+    - type: Shuttle
+    - type: GridPathfinding
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#5E7C1696'
+            id: CheckerNESW
+          decals:
+            31: 0,-6
+            32: 1,-5
+            33: 0,-5
+            34: 1,-6
+            35: 2,-5
+            36: 2,-4
+            37: 2,-6
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            38: 0,-5
+            39: 0,-6
+            40: 1,-6
+            41: 1,-5
+            42: 2,-5
+            43: 2,-6
+            55: -1,3
+            56: -1,4
+            57: -1,3
+            70: 1,3
+        - node:
+            cleanable: True
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            44: 0,-5
+        - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            45: 1,-5
+        - node:
+            cleanable: True
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            46: -2,-6
+            47: -2,-5
+        - node:
+            cleanable: True
+            angle: 6.283185307179586 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            48: -2,-6
+        - node:
+            cleanable: True
+            angle: 7.853981633974483 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            49: -1,-6
+            50: -1,-5
+        - node:
+            cleanable: True
+            angle: 9.42477796076938 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavy
+          decals:
+            51: -2,-6
+            52: -1,-6
+            53: -2,-5
+            54: 0,-5
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            58: 0,4
+            59: 1,4
+            60: 1,5
+            61: 0,5
+            62: -1,5
+            71: -1,1
+            72: -1,1
+            73: -1,1
+            74: 0,1
+            75: 0,1
+            76: 1,1
+            77: 1,1
+            78: -2,-1
+            79: -1,-1
+            81: 1,-1
+            82: 2,-1
+            83: 2,-1
+            84: 1,-1
+            87: -1,-1
+            88: -2,-1
+            89: 1,-1
+            90: 1,-1
+            91: 2,-1
+            92: 2,-1
+            93: 1,-1
+            96: 0,-1
+            97: 0,-1
+        - node:
+            cleanable: True
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            98: 0,-1
+            99: 0,-1
+        - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            100: 1,-1
+            101: 1,-1
+            102: 0,-1
+            103: 0,-1
+            107: -2,-3
+            108: -1,-3
+            109: -2,-3
+            110: -1,-3
+            111: 1,-3
+            112: 1,-3
+            113: 2,-3
+            114: 1,-3
+            115: 0,-3
+            116: -1,-3
+            117: -1,-3
+        - node:
+            cleanable: True
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            104: 0,-5
+            105: 1,-5
+            106: 1,-5
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtMedium
+          decals:
+            63: 0,3
+            64: -1,3
+            65: 0,4
+            66: 0,4
+            67: 1,4
+            68: 1,3
+            69: 1,3
+        - node:
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            30: 0,1
+        - node:
+            color: '#5E7C1696'
+            id: QuarterTileOverlayGreyscale270
+          decals:
+            4: -1,-4
+            5: 1,-4
+            6: -1,2
+            7: -1,4
+            8: -1,5
+            9: 0,5
+            10: 1,5
+            11: 1,4
+            12: 1,3
+            13: 1,2
+            14: 0,2
+            24: -1,3
+            27: 0,3
+            28: 0,4
+        - node:
+            color: '#5E7C1696'
+            id: QuarterTileOverlayGreyscale90
+          decals:
+            2: -1,-4
+            3: 1,-4
+            15: -1,4
+            16: -1,5
+            17: 0,5
+            18: 1,5
+            19: 1,4
+            20: 1,3
+            21: 1,2
+            22: 0,2
+            23: -1,2
+            25: -1,3
+            26: 0,3
+            29: 0,4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineE
+          decals:
+            1: 2,-1
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineS
+          decals:
+            0: -2,-1
+    - type: GridAtmosphere
+      version: 2
+      data:
+        tiles:
+          0,0:
+            0: 12593
+            1: 136
+          0,-1:
+            0: 29041
+            1: 34816
+          -1,0:
+            0: 32896
+            1: 4403
+          0,1:
+            0: 51
+            1: 64
+          -1,1:
+            0: 137
+            1: 64
+          1,0:
+            1: 4369
+          1,-1:
+            1: 4368
+            0: 1
+          1,1:
+            0: 1
+          0,-2:
+            1: 34928
+            0: 30592
+          -1,-2:
+            1: 13248
+            0: 52256
+          -1,-1:
+            0: 49345
+            1: 13072
+          1,-2:
+            1: 4352
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 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
+    - type: BecomesStation
+      id: Crown
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 201
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
+      parent: 1
+- proto: AirlockMercenary
+  entities:
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+- proto: APCBasic
+  entities:
+  - uid: 112
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
+      parent: 1
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 8
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+- proto: Bed
+  entities:
+  - uid: 224
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: BedsheetUSA
+  entities:
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: BlastDoorOpen
+  entities:
+  - uid: 160
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 35
+  - uid: 165
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+    - type: DeviceLinkSink
+      links:
+      - 35
+- proto: Bucket
+  entities:
+  - uid: 196
+    components:
+    - type: Transform
+      pos: -0.7327081,-4.212652
+      parent: 1
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 7
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 0.5,-4.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+- proto: CableMV
+  entities:
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 3.5,-0.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-1.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 94
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,0.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-2.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-3.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,2.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+- proto: ChairPilotSeat
+  entities:
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+- proto: ClosetWall
+  entities:
+  - uid: 189
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-6.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 191
+          - 190
+- proto: ComputerFrame
+  entities:
+  - uid: 145
+    components:
+    - type: Transform
+      pos: -0.5,5.5
+      parent: 1
+- proto: ComputerShuttle
+  entities:
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+- proto: ComputerStationRecords
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 171
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+- proto: FaxMachineShip
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+- proto: GasPassiveVent
+  entities:
+  - uid: 62
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 63
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeFourway
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeStraight
+  entities:
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 67
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 69
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 178
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 179
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 181
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 182
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 183
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 184
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 198
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 218
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 219
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 220
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 227
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeTJunction
+  entities:
+  - uid: 70
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 197
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPort
+  entities:
+  - uid: 151
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+- proto: GasPressurePump
+  entities:
+  - uid: 139
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentPump
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 192
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 193
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 185
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 186
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 56
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+- proto: Gyroscope
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-4.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+- proto: IntercomCommon
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 1
+- proto: LockerMercenaryFilled
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+- proto: PortableGeneratorPacmanShuttle
+  entities:
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
+    - type: FuelGenerator
+      on: False
+    - type: Physics
+      bodyType: Static
+- proto: PosterLegitEnlist
+  entities:
+  - uid: 152
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+- proto: PoweredLEDSmallLight
+  entities:
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
+      parent: 1
+- proto: Poweredlight
+  entities:
+  - uid: 6
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+- proto: PoweredlightColoredRed
+  entities:
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+- proto: PoweredlightExterior
+  entities:
+  - uid: 214
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,4.5
+      parent: 1
+- proto: PoweredlightRed
+  entities:
+  - uid: 166
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+- proto: PoweredlightSodium
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-5.5
+      parent: 1
+- proto: RandomPosterLegit
+  entities:
+  - uid: 153
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+- proto: ReinforcedWindow
+  entities:
+  - uid: 5
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: -2.5,-4.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 3.5,-4.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 1
+- proto: SheetPlasma
+  entities:
+  - uid: 191
+    components:
+    - type: Transform
+      parent: 189
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+- proto: SignalButton
+  entities:
+  - uid: 35
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        165:
+        - Pressed: Toggle
+        160:
+        - Pressed: Toggle
+- proto: SinkStemlessWater
+  entities:
+  - uid: 195
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-5.5
+      parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 149
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+- proto: SubstationWallBasic
+  entities:
+  - uid: 157
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+- proto: SuitStorageWallmountEVAPrisoner
+  entities:
+  - uid: 87
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-6.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+- proto: SuitStorageWallmountMercenary
+  entities:
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+    - type: Physics
+      canCollide: False
+- proto: TableReinforced
+  entities:
+  - uid: 169
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,3.5
+      parent: 1
+- proto: Thruster
+  entities:
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 93
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-5.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 117
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-4.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 118
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-4.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+  - uid: 221
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-5.5
+      parent: 1
+    - type: Thruster
+      originalPowerLoad: 1500
+- proto: WallReinforced
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 1.5,-6.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: -2.5,-1.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: -1.5,-1.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 2.5,5.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 1.5,-3.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      anchored: False
+      pos: 4.5,3.5
+      parent: 1
+    - type: Physics
+      bodyType: Dynamic
+  - uid: 206
+    components:
+    - type: Transform
+      anchored: False
+      pos: -3.5,3.5
+      parent: 1
+    - type: Physics
+      bodyType: Dynamic
+- proto: WallReinforcedDiagonal
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-6.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-6.5
+      parent: 1
+- proto: WarpPointShip
+  entities:
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+- proto: WindoorSecureMercenaryLocked
+  entities:
+  - uid: 148
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 1
+    - type: DeviceLinkSource
+      lastSignals:
+        DoorStatus: True
+    - type: Door
+      secondsUntilStateChange: -1327.9542
+      state: Opening
+- proto: WindowReinforcedDirectional
+  entities:
+  - uid: 187
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 190
+    components:
+    - type: Transform
+      parent: 189
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
+...
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index dd47e1f015d..db359351e79 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -20,7 +20,6 @@
   - Mail # Frontier
   - Medical
   - Mercenary # Frontier
-  - Pilot # Frontier
   - Quartermaster
   - Salvage
   - Cargo
diff --git a/Resources/Prototypes/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
index 7440428bd49..1cc80ff6e2f 100644
--- a/Resources/Prototypes/Catalog/Jukebox/Standard.yml
+++ b/Resources/Prototypes/Catalog/Jukebox/Standard.yml
@@ -38,4 +38,4 @@
   id: sunset
   name: PigeonBeans - Sunset
   path:
-    path: /Audio/Jukebox/sunset.ogg
+    path: /Audio/Jukebox/sunset.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
index 447e2037996..26f71911eb7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml
@@ -7,16 +7,17 @@
     WeaponSniperRepeater: 10
     MagazineBoxLightRifle: 10
     MagazineBoxLightRiflePractice: 10
-#    MagazineBoxLightRifleRubber: 15 # Frontier - TODO: Restore Rubber
+    MagazineBoxLightRifleRubber: 15
     WeaponShotgunDoubleBarreled: 10
+    WeaponRevolverArgenti: 10
     BoxShotgunSlug: 10
     BoxLethalshot: 10
     BoxBeanbag: 10
     BoxShotgunPractice: 10
-    WeaponRevolverArgenti: 10
     MagazineBoxRifle: 10
-#    MagazineBoxRifleRubber: 15 # Frontier - TODO: Restore Rubber
-    MagazineBoxRiflePractice: 10
+    MagazineBoxRifleRubber: 15
     MagazineBoxMagnum: 10
+    SpeedLoaderRifleHeavy: 10
+    SpeedLoaderRifleHeavyRubber: 10
   emaggedInventory:
     WeaponPistolViper: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index 11e48f830ee..fd858263b1d 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -25,3 +25,4 @@
     DrinkMugOne: 1
     DrinkMugRainbow: 2
     DrinkMugRed: 2
+    ServiceSelectiveDropper: 2
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
index 9acf9740191..cbe7fea8475 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BB Gun
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable] # Frontier
   id: WeaponRifleBB
   description: The classic Red Ryder BB gun. Don't shoot your eye out.
   components:
@@ -39,4 +39,4 @@
         ents: []
   - type: Appearance
   - type: StaticPrice
-    price: 2750
+    price: 500
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
index fb0895f62cb..70d4b958258 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -3,21 +3,15 @@
   id: WindoorMailLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]] # Frontier - Service<Mail
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMailCarrier ] # Frontier - Service<Mail
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureMailLocked
   suffix: Mail, Locked
   components:
-  - type: AccessReader
-    access: [["Mail"]] # Frontier - Service<Mail
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorSecureParamedicLocked
-  suffix: Paramedic, Locked
-  components:
-  - type: AccessReader
-    access: [["Paramedic"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMailCarrier ] # Frontier - Service<Mail
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index 02cf0ab6f67..5053c27598f 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -43,4 +43,4 @@
   components:
   - type: Fiber
     fiberMaterial: fibers-synthetic
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
index 8b7300670d3..0b5b2e3fe79 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml
@@ -300,7 +300,7 @@
   name: insulated gloves
   description: These gloves will protect the wearer from electric shocks.
   components:
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
   - type: Sprite
     sprite: Clothing/Hands/Gloves/Color/yellow.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index d3b42a0661f..a15d3f22355 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -24,7 +24,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-red
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
   - type: Tag
     tags:
     - Kangaroo
@@ -44,7 +44,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-blue
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsGlovesBoxingRed
@@ -60,7 +60,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-green
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsGlovesBoxingRed
@@ -76,7 +76,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-yellow
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsGlovesBoxingBlue
@@ -109,7 +109,7 @@
   - type: Fiber
     fiberMaterial: fibers-durathread
     fiberColor: fibers-regal-blue
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsBase
@@ -128,7 +128,7 @@
     modifiers:
       coefficients:
         Slash: 0.95
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 #### Medical
 - type: entity
@@ -143,7 +143,7 @@
     sprite: Clothing/Hands/Gloves/latex.rsi
   - type: Fiber
     fiberMaterial: fibers-latex
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsButcherable
@@ -157,7 +157,7 @@
     sprite: Clothing/Hands/Gloves/nitrile.rsi
   - type: Fiber
     fiberMaterial: fibers-nitrile
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 ####
 - type: entity
   parent: ClothingHandsButcherable
@@ -174,7 +174,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-brown
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsBase
@@ -188,7 +188,7 @@
     sprite: Clothing/Hands/Gloves/powerglove.rsi
   - type: Fiber
     fiberMaterial: fibers-nanomachines
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsButcherable
@@ -203,7 +203,7 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-black
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
 
 - type: entity
   parent: ClothingHandsBase
@@ -335,7 +335,8 @@
   - type: Thieving
     stripTimeReduction: 1.5
     stealthy: true
-  - type: Contraband #frontier
+  - type: FingerprintMask # Frontier
+  - type: Contraband # Frontier
 
 - type: entity
   parent: ClothingHandsGlovesColorWhite
@@ -412,4 +413,4 @@
   - type: Fiber
     fiberMaterial: fibers-rubber
     fiberColor: fibers-yellow
-  - type: FingerprintMask
+#  - type: FingerprintMask # Frontier
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index c58577722c2..76260bb9e83 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -89,6 +89,12 @@
     speedModifierThresholds:
       250: 0.7
       400: 0.5
+  # disable taking damage from fire, since its a fire breathing dragon
+  - type: Flammable
+    damage:
+      types: {}
+  - type: Temperature
+    heatDamageThreshold: 800
   - type: Metabolizer
     solutionOnBody: false
     updateInterval: 0.25
@@ -134,15 +140,37 @@
 - type: entity
   parent: BaseMobDragon
   id: MobDragon
+  suffix: No role or objectives
   components:
   - type: Dragon
     spawnRiftAction: ActionSpawnRift
-  # - type: GenericAntag
-    # rule: Dragon
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
   - type: GuideHelp
     guides:
     - MinorAntagonists
 
+- type: entity
+  noSpawn: true
+  id: DragonsBreathGun
+  name: dragon's lung
+  description: For dragon's breathing
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 5
+    rechargeSound:
+      path: /Audio/Animals/space_dragon_roar.ogg
+  - type: BasicEntityAmmoProvider
+    proto: ProjectileDragonsBreath
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Animals/space_dragon_roar.ogg
+    soundEmpty: null
+    projectileSpeed: 5
+
 - type: entity
   parent: BaseMobDragon
   id: MobDragonDungeon
@@ -181,6 +209,7 @@
       state: icon
     event: !type:DragonSpawnRiftActionEvent
     useDelay: 1
+    priority: 3
 
 - type: entity
   id: ActionDevour
@@ -192,3 +221,18 @@
     icon: { sprite : Interface/Actions/devour.rsi, state: icon }
     iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
     event: !type:DevourActionEvent
+    priority: 1
+
+- type: entity
+  noSpawn: true
+  id: ActionDragonsBreath
+  name: "[color=orange]Dragon's Breath[/color]"
+  description: Spew out flames at anyone foolish enough to attack you!
+  components:
+  - type: WorldTargetAction
+    # TODO: actual sprite
+    icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ce0e0b629a3..b1fd4abf6de 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -374,6 +374,39 @@
     - Syringe
     - Trash
 
+- type: entity
+  parent: Dropper
+  description: Used to transfer small amounts of chemical a specified reagent between containers.
+  name: Service Selective Dropper
+  id: ServiceSelectiveDropper
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Chemistry/dropper.rsi
+    layers:
+      - state: dropper
+      - state: dropper1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Item
+    sprite: _NF/Objects/Specific/Chemistry/dropper.rsi
+  - type: Injector
+    transferAmount: 5
+    toggleState: Draw
+  - type: Tag
+    tags:
+    - Syringe
+  - type: UserInterface
+    interfaces:
+      enum.ReagentWhitelistChangeUIKey.Key:
+        type: ChangeReagentWhitelistBoundUserInterface
+  - type: ReagentWhitelistChange
+    allowedReagentGroup:
+      - Foods
+      - Botanical
+      - Drinks
+  - type: StaticPrice
+    price: 30
+
 - type: entity
   parent: BaseSyringe
   id: PrefilledSyringe
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 65c958c16af..0c06c4d6e3d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -44,7 +44,6 @@
       - Maintenance
       - Medical
       - Mercenary # Frontier
-      - Pilot # Frontier
       - Quartermaster
       - Research
       - ResearchDirector
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 d5fb4360a82..3241a892262 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
@@ -102,4 +102,4 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
-    - state: uranium
+    - state: uranium
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
index a35a42d8c2a..73f29189864 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -43,3 +43,4 @@
       - state: tip
         map: [ "enum.AmmoVisualLayers.Tip" ]
         color: "#dbdbdb"
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
index 741f0a4e1a0..5ce0bf82fe9 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml
@@ -19,3 +19,14 @@
     damage:
       types:
         Blunt: 2
+
+- type: entity
+  id: BulletCaselessRifleRubber
+  name: bullet (.25 caseless rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index c6a4808b77b..3a0df2ac6c7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletLightRifleRubber
+  name: bullet (.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletLightRifleIncendiary
   parent: BaseBulletIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 798de9fa853..1b5cf7890ba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -20,6 +20,19 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BulletMagnumRubber
+  name: bullet (.45 magnum rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+  - type: StaminaDamageOnCollide
+    damage: 35 # 3 hits to stun cuz revolver
+
 - type: entity
   id: BulletMagnumIncendiary
   parent: BaseBulletIncendiary
@@ -31,7 +44,7 @@
       types:
         Blunt: 3
         Heat: 32
-
+        
 - type: entity
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index 3cfcc0cf206..086a8dc914f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletPistolRubber
+  name: bullet (.35 auto rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletPistolIncendiary
   parent: BaseBulletIncendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 6f6fa0f9077..2113916cf52 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -20,6 +20,17 @@
       types:
         Blunt: 2
 
+- type: entity
+  id: BulletRifleRubber
+  name: bullet (0.20 rifle rubber)
+  parent: BaseBulletRubber
+  noSpawn: true
+  components:
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+
 - type: entity
   id: BulletRifleIncendiary
   parent: BaseBulletIncendiary
@@ -31,7 +42,7 @@
       types:
         Blunt: 2
         Heat: 15
-
+  
 - type: entity
   id: BulletRifleUranium
   parent: BaseBulletUranium
@@ -43,4 +54,4 @@
       types:
         Radiation: 7
         Piercing: 8
-
+        
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
new file mode 100644
index 00000000000..cf858e17374
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wieldable.yml
@@ -0,0 +1,12 @@
+# A basic inheritable template for a gun that is wieldable and has the standard inaccuracy.
+- type: entity
+  id: BaseGunWieldable
+  abstract: true
+  components:
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -20
+    maxAngle: -30
+  - type: Gun
+    minAngle: 21
+    maxAngle: 32   
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 576545f8e86..642447b49e5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -204,7 +204,7 @@
 
 - type: entity
   name: laser rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponLaserCarbine
   description: A simple civilian grade laser carbine, the workhorse of many private security organizations.
   components:
@@ -271,7 +271,7 @@
 
 - type: entity
   name: pulse carbine
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponPulseCarbine
   description: A high tech energy carbine favoured by the NT-ERT operatives. On the handle is a label that says 'for authorized use only.'
   components:
@@ -302,7 +302,7 @@
 
 - type: entity
   name: pulse rifle
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponPulseRifle
   description: A weapon that is almost as infamous as its users. On the handle is a label that says 'for authorized use only.'
   components:
@@ -329,7 +329,7 @@
 
 - type: entity
   name: laser cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponLaserCannon
   description: A heavy duty, high powered laser weapon. On the handle is a label that says 'for authorized use only.'
   components:
@@ -388,7 +388,7 @@
 
 - type: entity
   name: x-ray cannon
-  parent: BaseWeaponBattery
+  parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponXrayCannon
   description: An illegal and experimental weapon that uses concentrated x-ray energy against its target.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 9f94ed2c52b..82a36357455 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -22,7 +22,7 @@
 
 - type: entity
   name: china lake
-  parent: BaseWeaponLauncher
+  parent: [BaseWeaponLauncher, BaseGunWieldable]
   id: WeaponLauncherChinaLake
   description: PLOOP
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 3556d1c8f8b..d6adcd614e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -30,6 +30,39 @@
   - type: IgniteOnCollide
     fireStacks: 0.35
 
+- type: entity
+  noSpawn: true
+  parent: BaseBulletTrigger
+  id: ProjectileDragonsBreath
+  name: dragon's breath
+  description: Try not to get toasted.
+  components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 3.0
+    energy: 5.0
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: fireball
+      shader: unshaded
+  - type: IgnitionSource
+    temperature: 1000
+    ignited: true
+  - type: RepeatingTrigger
+    delay: 0.5 # line of fire as well as if it hits something
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
+    intensitySlope: 1
+    maxIntensity: 3
+    canCreateVacuum: false
+    deleteAfterExplosion: false
+    repeatable: true
+  - type: TimedDespawn
+    lifetime: 5
+
 - type: entity
   id: ProjectileAnomalyFireball
   name: fireball
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 60121fde792..7f9ce36f2bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -104,6 +104,25 @@
       types:
         Blunt: 1
 
+- type: entity
+  id: BaseBulletRubber
+  name: base bullet rubber
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+    - state: rubber
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 3
+    soundHit:
+      path: /Audio/Weapons/Guns/Hits/snap.ogg
+  - type: StaminaDamageOnCollide
+    damage: 22 # 5 hits to stun sounds reasonable
+
 - type: entity
   id: BaseBulletIncendiary
   name: base bullet incendiary
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index ef83e6c5722..50d8ca7c597 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: BaseWeaponRifle
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
   id: BaseWeaponRifle
   description: A rooty tooty point and shooty.
   abstract: true
@@ -186,3 +186,4 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 45be47f79c0..852aaa7c8b8 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -20,7 +20,7 @@
     maxAngle: 16
     fireRate: 8
     angleIncrease: 3
-    angleDecay: 16
+    angleDecay: 16  
     selectedMode: FullAuto
     availableModes:
     - SemiAuto
@@ -80,7 +80,7 @@
 
 - type: entity
   name: C-20r sub machine gun
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
   id: WeaponSubMachineGunC20r
   description: An illegal firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
   components:
@@ -94,6 +94,8 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
   - type: Gun
+    minAngle: 21
+    maxAngle: 32  
     shotsPerBurst: 5
     availableModes:
     - SemiAuto
@@ -112,7 +114,7 @@
 
 - type: entity
   name: Drozd
-  parent: BaseWeaponSubMachineGun
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG. An illegal firearm often used by Syndicate agents.
   components:
@@ -126,6 +128,8 @@
     - type: Clothing
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     - type: Gun
+      minAngle: 21
+      maxAngle: 32  
       fireRate: 6
       selectedMode: FullAuto
       soundGunshot:
@@ -231,7 +235,7 @@
     minAngle: 1
     maxAngle: 6
     angleIncrease: 1.5
-    angleDecay: 6
+    angleDecay: 6  
     selectedMode: FullAuto
     shotsPerBurst: 5
     availableModes:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index bce85aac322..a8ab8a8e41c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -46,7 +46,7 @@
 - type: entity
   name: Bulldog
   # Don't parent to BaseWeaponShotgun because it differs significantly
-  parent: BaseItem
+  parent: [BaseItem, BaseGunWieldable]
   id: WeaponShotgunBulldog
   description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. An illegal firearm often used by Syndicate agents.
   components:
@@ -66,6 +66,7 @@
     - Back
     - suitStorage
   - type: AmmoCounter
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
     selectedMode: FullAuto
@@ -102,7 +103,7 @@
 
 - type: entity
   name: double-barreled shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunDoubleBarreled
   description: An immortal classic. A civilian grade shotgun. Uses .50 shotgun shells.
   components:
@@ -112,8 +113,8 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: db
+    sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -137,7 +138,7 @@
 
 - type: entity
   name: Enforcer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunEnforcer
   description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. On the receiver is a label that says 'for authorized use only.'
   components:
@@ -146,9 +147,9 @@
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
   - type: Item
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: enforcer
+    sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi
   - type: BallisticAmmoProvider
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
 
 - type: entity
   parent: WeaponShotgunEnforcer
@@ -160,7 +161,7 @@
 
 - type: entity
   name: Kammerer
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunKammerer
   description: When an old Remington design meets modern materials, this is the result. A civilian grade shotgun, favored by militia forces throughout many worlds. Uses .50 shotgun shells.
   components:
@@ -168,12 +169,12 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: pump
+    sprite: Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
   - type: Clothing
     sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: BallisticAmmoProvider
     capacity: 4
   - type: Tag
@@ -192,8 +193,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
   - type: Item
     size: Small
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: sawn
+    sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi
   - type: Gun
     fireRate: 4
   - type: BallisticAmmoProvider
@@ -241,7 +241,7 @@
 
 - type: entity
   name: blunderbuss
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunBlunderbuss
   suffix: Pirate
   description: Deadly at close range, an illegal shotgun often found at the side of a pirate.
@@ -252,6 +252,7 @@
     - 0,0,4,0
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 2
   - type: BallisticAmmoProvider
@@ -261,7 +262,7 @@
 
 - type: entity
   name: improvised shotgun
-  parent: BaseWeaponShotgun
+  parent: [BaseWeaponShotgun, BaseGunWieldable]
   id: WeaponShotgunImprovised
   description: A shitty, but legal, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber.
   components:
@@ -273,8 +274,8 @@
     size: Normal
     shape:
     - 0,0,4,0
-    sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
-    heldPrefix: improvised
+    sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi
+  - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
     fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways.
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index a45924fd4c5..9c9a8c77e57 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -40,7 +40,7 @@
 
 - type: entity
   name: Kardashev-Mosin
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperMosin
   description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
   components:
@@ -51,7 +51,7 @@
 
 - type: entity
   name: Hristov
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperHristov
   description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. On the receiver is a label that says 'for authorized use only.'
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index cd0ba89b3b5..ad0fa9702d1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -191,6 +191,8 @@
       - ShellTranquilizer
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - SpeedLoaderRifleHeavy # Frontier
+      - SpeedLoaderRifleHeavyEmpty # Frontier
     emagDynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -221,6 +223,8 @@
       - PowerCageSmall
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
+      - SpeedLoaderRifleHeavyIncendiary # Frontier
+      - SpeedLoaderRifleHeavyUranium # Frontier
 
 - type: entity
   id: AutolatheHyperConvection
@@ -764,6 +768,8 @@
       - RiotShield
       - SpeedLoaderMagnum
       - SpeedLoaderMagnumEmpty
+      - SpeedLoaderRifleHeavy # Frontier
+      - SpeedLoaderRifleHeavyEmpty # Frontier
       - Stunbaton
       - TargetClown
       - TargetHuman
@@ -822,6 +828,8 @@
       - SignalTrigger
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
+      - SpeedLoaderRifleHeavyIncendiary # Frontier
+      - SpeedLoaderRifleHeavyUranium # Frontier
       - TelescopicShield
       - TimerTrigger
       - Truncheon
@@ -883,6 +891,8 @@
         - ShellTranquilizer
         - SpeedLoaderMagnum
         - SpeedLoaderMagnumEmpty
+        - SpeedLoaderRifleHeavy # Frontier
+        - SpeedLoaderRifleHeavyEmpty # Frontier
     - type: MaterialStorage
       whitelist:
         tags:
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 316082562ba..7d9aedee1fd 100644
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -75,8 +75,12 @@
   groups:
   - LawyerNeck
   - LawyerJumpsuit
-  - LawyerBackpack
+  - ContractorBackpack
   - ContractorGlasses
+  - ContractorFace
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -87,9 +91,12 @@
   - ChaplainMask
   - ChaplainNeck
   - ChaplainJumpsuit
-  - ChaplainBackpack
+  - ContractorBackpack
   - ChaplainOuterClothing
   - ContractorGlasses
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -99,9 +106,13 @@
   - JanitorHead
   - JanitorJumpsuit
   - JanitorGloves
-  - CommonBackpack
+  - ContractorBackpack
   - JanitorOuterClothing
+  - ContractorFace
   - ContractorGlasses
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index 2f51bd3517c..08184b550a9 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -88,7 +88,7 @@
     board: ServiceTechFabCircuitboard
   - type: Lathe
     idleState: icon
-    runningState: icon    
+    runningState: icon
     staticRecipes: #Frontier
       - MailCapsule #Frontier
       - SprayBottle #Frontier, moved some recipes from dynamicRecipes, so the service fab wouldn't need a server for the basic stuff
@@ -120,6 +120,7 @@
       - ServiceFoodPlateSmall
       - ServiceFoodPlateTin
       - ServiceFoodKebabSkewer
+      - ServiceSelectiveDropper
       - ClothingOuterSuitEmergency
       - ClothingHeadHelmetEVA
       - ClothingOuterHardsuitEVA
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
index 34a0a75ee5d..b0d447b4d0c 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
@@ -18,7 +18,5 @@
 - type: startingGear
   id: PrisonerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPrisoner
     shoes: ClothingShoesColorBlack
-    id: PrisonerPDA
     ears: ClothingHeadsetGrey
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index c8cee57de2b..5aed3aa6aaa 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -33,6 +33,7 @@
   - MagazinePistolIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
+  - SpeedLoaderRifleHeavyIncendiary # Frontier
   - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
@@ -80,6 +81,7 @@
   - MagazinePistolUranium
   - MagazineLightRifleUranium
   - SpeedLoaderMagnumUranium
+  - SpeedLoaderRifleHeavyUranium # Frontier
   - MagazineBoxPistolUranium
   - MagazineBoxMagnumUranium
   - MagazineBoxLightRifleUranium
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
index 677449cfac8..5395e9ed861 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -22,3 +22,5 @@
     shoes: ClothingShoesColorBlack
     id: ChaplainPDA
     ears: ClothingHeadsetService
+    pocket1: Bible # Frontier
+    pocket2: RubberStampChaplain # Frontier
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index 347f4185df1..b2bf348ebde 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -16,10 +16,10 @@
 - type: startingGear
   id: LawyerGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitLawyerBlack  # TODO change jumpsuit to randomiser of the 4 variants
-    back: ClothingBackpackLawyerFilled # Frontier
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetNfsdGreen # Frontier ClothingHeadsetSecurity<ClothingHeadsetNfsdGreen
+    # TODO add copy of space law
+    pocket1: RubberStampLawyer # Frontier
   inhand:
-    - BriefcaseBrownFilled
+    - BriefcaseBrownFilled
\ No newline at end of file
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
index d16be5c350a..46c2f320b18 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
@@ -6,6 +6,6 @@
   canBeAntag: false
   icon: JobIconVisitor
   setPreference: false
-  overrideConsoleVisibility: true
+#  overrideConsoleVisibility: true # Frontier
   access:
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index 3a9383dbd18..4b9ba13d4fc 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -205,7 +205,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -222,7 +222,7 @@
     id: ERTSecurityPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
     pocket2: FlashlightSeclite
 
 - type: startingGear
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 977f85e644c..c697f5845c4 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -29,7 +29,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampSr
       - id: DoorRemoteCommand
@@ -48,7 +47,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -65,7 +63,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -79,7 +76,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -91,7 +87,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 7cd9a36399e..b82c84b9116 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -15,7 +15,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampHop
       - id: DoorRemoteCommand
@@ -29,7 +28,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -46,7 +44,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -60,7 +57,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -72,7 +68,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index d1f8ec0f642..91b30c6dd59 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -15,7 +15,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvival
       - id: Flash
       - id: RubberStampSr
       - id: DoorRemoteCommand
@@ -29,7 +28,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: FrontierUplinkCoin10
@@ -46,7 +44,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: ForensicPad
       - id: MagazinePistol
@@ -60,7 +57,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: BaseSecurityUplinkRadioOfficer
@@ -72,7 +68,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: BoxSurvivalNfsd
       - id: Flash
       - id: MagazinePistol
       - id: RubberStampSheriff
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
index e90776df4d2..efaab9c4058 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag_npc_loot.yml
@@ -1,4 +1,4 @@
-# Duffel bag - gift box
+# BASE
 - type: entity
   parent: BaseItem
   id: SyndieDuffelGiftBox
@@ -23,16 +23,95 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate NPCs Loot
-# Syndicate Naval Captain Loot
 - type: entity
   parent: SyndieDuffelGiftBox
-  id: ClothingBackpackSyndicateCaptainLootA
+  id: SyndieMessengerGiftBox
+  name: syndicate naval operative bundle
+  description: Loot boxes? Here?
+  abstract: true
   noSpawn: true
+  suffix: NPC Loot
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#424242"
+    - state: icon-sling
+      color: "#7f0101"
+    - state: icon-clasp
+      color: "#7f0101"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#424242"
+      - state: sling-equipped-BACKPACK
+        color: "#7f0101"
+      - state: clasp-equipped-BACKPACK
+        color: "#7f0101"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#424242"
+      - state: clasp-inhand-left
+        color: "#7f0101"
+      right:
+      - state: base-inhand-right
+        color: "#424242"
+      - state: clasp-inhand-right
+        color: "#7f0101"
+
+- type: entity
+  parent: SyndieMessengerGiftBox
+  id: CultistMessengerGiftBox
+  name: blood cultist bundle
+  description: Loot boxes? Here?
+  abstract: true
+  noSpawn: true
+  suffix: NPC Loot
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#562f2f"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#562f2f"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#562f2f"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#562f2f"
+      - state: clasp-inhand-right
+        color: "#96907c"
+
+# SYNDICATE NPC LOOT
+## Captain
+- type: entity
+  parent: SyndieMessengerGiftBox
+  id: ClothingBackpackSyndicateCaptainLootA
+  noSpawn: true
+  components:
   - type: SpawnItemsOnUse
     items:
       - id: WeaponRevolverPythonAP
@@ -79,7 +158,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Second Officer Loot
+## Second Officer
 - type: entity
   parent: ClothingBackpackSyndicateCaptainLootA
   id: ClothingBackpackSyndicateSecondOfficerLootA
@@ -131,15 +210,12 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Commander Loot
+## Commander
 - type: entity
-  parent: SyndieDuffelGiftBox
+  parent: SyndieMessengerGiftBox
   id: ClothingBackpackSyndicateCommanderLootA
   noSpawn: true
   components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
   - type: SpawnItemsOnUse
     items:
       - id: WeaponRifleAk
@@ -187,7 +263,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Security Operative Loot
+## Operative
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateOperativeLootA
@@ -243,7 +319,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Deckhand Loot
+## Deckhand
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateDeckhandLootA
@@ -295,44 +371,28 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Saboteur Loot
+## Saboteur
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootA
   id: ClothingBackpackSyndicateSaboteurLootA
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootB
   id: ClothingBackpackSyndicateSaboteurLootB
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootC
   id: ClothingBackpackSyndicateSaboteurLootC
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
 - type: entity
   parent: ClothingBackpackSyndicateDeckhandLootD
   id: ClothingBackpackSyndicateSaboteurLootD
   noSpawn: true
-  components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
-    state: icon
 
-# Syndicate Naval Medic Loot
+## Medic
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateMedicLootA
@@ -394,7 +454,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Engineer Loot
+## Engineer
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateEngineerLootA
@@ -449,7 +509,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Chemwarrior
+## Chemwarrior
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateChemwarriorLootA
@@ -504,7 +564,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Syndicate Naval Grenadier
+## Grenadier
 - type: entity
   parent: SyndieDuffelGiftBox
   id: ClothingBackpackSyndicateGrenadierLootA
@@ -557,17 +617,14 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Blood Cult NPCs Loot
-# Blood Cultist Zealot (Ranged) Loot
+# BLOOD CULT NPC LOOT
+## Zealot (Ranged) Loot
 - type: entity
-  parent: SyndieDuffelGiftBox
+  parent: CultistMessengerGiftBox
   id: ClothingBackpackBloodCultZealotLootA
   name: cultist gear bundle
   noSpawn: true
   components:
-  - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi
-    state: icon
   - type: SpawnItemsOnUse
     items:
     - id: CrossbowImprovised
@@ -612,7 +669,7 @@
     sound:
       path: /Audio/Items/jumpsuit_equip.ogg
 
-# Blood Cultist: generic cash rewards
+## Generic rewards
 - type: entity
   parent: ClothingBackpackBloodCultZealotLootA
   id: ClothingBackpackBloodCultLootA
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml
new file mode 100644
index 00000000000..d047b1ab548
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/ammunition.yml
@@ -0,0 +1,69 @@
+# CaselessRifle
+- type: entity
+  name: box of .25 caseless (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineCaselessRifleRubber
+  description: A box full of
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineCaselessRifleRubber
+        amount: 4
+
+# LightRifle
+- type: entity
+  name: box of .30 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineLightRifleRubber
+  description: A box full of .30 rifle (practice) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineLightRifleRubber
+        amount: 4
+
+- type: entity
+  name: box of Vector (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineMagnumSubMachineGunRubber
+  description: A box full of Vector (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineMagnumSubMachineGunRubber
+        amount: 3
+
+# Pistol
+- type: entity
+  name: box of pistol .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolRubber
+  description: A box full of pistol .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolRubber
+        amount: 4
+
+- type: entity
+  name: box of SMG .35 auto (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazinePistolSubMachineGunRubber
+  description: A box full of SMG .35 auto (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGunRubber
+        amount: 3
+
+# Rifle
+- type: entity
+  name: box of .20 rifle (rubber) magazines
+  parent: BoxMagazine
+  id: BoxMagazineRifleRubber
+  description: A box full of .20 rifle (rubber) magazines.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazineRifleRubber
+        amount: 4
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
index a536418880f..91d56e64c37 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/emergency.yml
@@ -1,3 +1,79 @@
+- type: entity
+  name: oxygen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFOxygen
+  description: It's a box with basic oxygen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyOxygenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: Flare
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: nitrogen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFNitrogen
+  description: It's a box with basic nitrogen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: EmergencyNitrogenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: Flare
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: emergencytank
+
+- type: entity
+  name: extended-oxygen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFOxygenExtended
+  description: It's a box with extended internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: CrowbarRed
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: extendedtank
+
+- type: entity
+  name: extended-nitrogen survival box
+  parent: BoxCardboard
+  id: BoxSurvivalNFNitrogenExtended
+  description: It's a box with extended nitrogen internals inside.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: SpaceMedipen
+      - id: EmergencyMedipen
+      - id: FoodPSB
+      - id: DrinkWaterBottleFull
+      - id: CrowbarRed
+  - type: Sprite
+    layers:
+      - state: internals
+      - state: extendedtank
+
 - type: entity
   name: survival box
   parent: BoxSurvivalSecurity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml
index 05e62163cd1..995fe0bfbf9 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/fun.yml
@@ -37,3 +37,15 @@
     contents:
       - id: VehicleHoverbikeNF
       - id: VehicleKeyHoverbikeNF
+
+- type: entity
+  id: CrateFunHoverbikeNFPirate
+  parent: CrateLivestock
+  name: hoverbike crate
+  suffix: Pirate
+  description: Harder, better, faster, stronger? No, just faster, faster, faster.
+  components:
+  - type: StorageFill
+    contents:
+      - id: VehicleHoverbikePirate
+      - id: VehicleKeyHoverbikeNF
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
new file mode 100644
index 00000000000..718eda96d06
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/briefcases.yml
@@ -0,0 +1,85 @@
+- type: entity
+  parent: BaseItem
+  id: SpaceCashExpedition
+  name: syndicate naval operative bundle
+  abstract: true
+  noSpawn: true
+  suffix: Money
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Storage/Briefcases/briefcase_brown.rsi
+  - type: CargoSellBlacklist # We dont want this to be sold by mistake, and so you cannot sell this on a cargo depo
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash5000Expedition
+  name: spesos (5000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash5000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 5000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash10000Expedition
+  name: spesos (10000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash10000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 10000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash15000Expedition
+  name: spesos (15000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash15000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 15000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash20000Expedition
+  name: spesos (20000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash20000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 20000
+
+- type: entity
+  parent: SpaceCashExpedition
+  id: SpaceCash25000Expedition
+  name: spesos (25000)
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: SpaceCash25000
+    sound:
+      collection: storageRustle
+  - type: StaticPrice # Require since you can still sell a ship that have it on it
+    price: 25000
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
index 5cbddced502..d7cd5b79acb 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
@@ -45,16 +45,16 @@
       - id: WeaponRevolverArgenti
       - id: MagazineBoxRifle
 
-# WeaponRevolverArgentiNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponRevolverArgentiNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponRevolverArgentiNonlethal
-      # - id: MagazineBoxRifleRubber
+# WeaponRevolverArgentiNonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponRevolverArgentiNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverArgentiNonlethal
+      - id: MagazineBoxRifleRubber
 
 # WeaponSniperMosin
 - type: entity
@@ -67,16 +67,16 @@
       - id: WeaponSniperMosin
       - id: MagazineBoxLightRifle
 
-# Kardashev-MosinNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseLongShuttle
-  # id: ShuttleKardashev-MosinNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: Kardashev-MosinNonlethal
-      # - id: MagazineBoxLightRifleRubber
+# Kardashev-MosinNonlethal
+- type: entity
+  parent: WeaponCaseLongShuttle
+  id: ShuttleKardashev-MosinNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: Kardashev-MosinNonlethal
+      - id: MagazineBoxLightRifleRubber
 
 # T2:
 # WeaponPistolMk58lethal
@@ -90,16 +90,16 @@
       - id: WeaponPistolMk58
       - id: MagazinePistol
 
-# WeaponPistolMk58Nonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponPistolMk58Nonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponPistolMk58Nonlethal
-      # - id: MagazinePistolRubber
+# WeaponPistolMk58Nonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponPistolMk58Nonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistolRubber
 
 # WeaponRevolverDeckard
 - type: entity
@@ -112,16 +112,16 @@
       - id: WeaponRevolverDeckard
       - id: SpeedLoaderMagnum
 
-# WeaponRevolverDeckardNonlethal # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseShortShuttle
-  # id: ShuttleWeaponRevolverDeckardNonlethal
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponRevolverDeckardNonlethal
-      # - id: SpeedLoaderMagnumRubber
+# WeaponRevolverDeckardNonlethal
+- type: entity
+  parent: WeaponCaseShortShuttle
+  id: ShuttleWeaponRevolverDeckardNonlethal
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponRevolverDeckardNonlethal
+      - id: SpeedLoaderMagnumRubber
 
 # WeaponShotgunDoubleBarreled
 - type: entity
@@ -134,16 +134,16 @@
       - id: WeaponShotgunDoubleBarreled
       - id: BoxLethalshot
 
-# WeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore this later
-# - type: entity
-  # parent: WeaponCaseLongShuttle
-  # id: ShuttleWeaponShotgunDoubleBarreledRubber
-  # noSpawn: true
-  # components:
-  # - type: StorageFill
-    # contents:
-      # - id: WeaponShotgunDoubleBarreledRubber
-      # - id: BoxBeanbag
+# WeaponShotgunDoubleBarreledRubber
+- type: entity
+  parent: WeaponCaseLongShuttle
+  id: ShuttleWeaponShotgunDoubleBarreledRubber
+  noSpawn: true
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponShotgunDoubleBarreledRubber
+      - id: BoxBeanbag
 
 # WeaponShotgunSawn
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
index b3eb7f240a0..5ba572fe688 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/guns.yml
@@ -26,15 +26,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-1
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-1
+      prob: 0.1
     # T1-2
     - id: ShuttleWeaponLaserGun
       orGroup: T1-2
@@ -45,15 +45,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-2
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-2
+      prob: 0.1
     # T1 Melee
     - id: BaseBallBat
       orGroup: Melee
@@ -90,15 +90,15 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-1
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-1
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-1
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-1
+      prob: 0.1
     # T1-2
     - id: ShuttleWeaponLaserGun
       orGroup: T1-2
@@ -109,40 +109,40 @@
     - id: ShuttleWeaponRevolverArgenti
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverArgentiNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverArgentiNonlethal
+      orGroup: T1-2
+      prob: 0.1
     - id: ShuttleWeaponSniperMosin
       orGroup: T1-2
       prob: 0.1
-#    - id: ShuttleKardashev-MosinNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T1-2
-#      prob: 0.1
+    - id: ShuttleKardashev-MosinNonlethal
+      orGroup: T1-2
+      prob: 0.1
     # T2-1
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-1
+      prob: 0.1
     # T2 Melee
     - id: SpearReinforced
       orGroup: Melee
@@ -167,52 +167,52 @@
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-1
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-1
+      prob: 0.1
     # T2-2
     - id: ShuttleWeaponPistolMk58
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponPistolMk58Nonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponPistolMk58Nonlethal
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponRevolverDeckard
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponRevolverDeckardNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponRevolverDeckardNonlethal
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponShotgunDoubleBarreled
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponShotgunDoubleBarreledRubber # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunDoubleBarreledRubber
+      orGroup: T2-2
+      prob: 0.1
     - id: ShuttleWeaponShotgunSawn
       orGroup: T2-2
       prob: 0.1
-#    - id: ShuttleWeaponShotgunSawnNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T2-2
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunSawnNonlethal
+      orGroup: T2-2
+      prob: 0.1
     # T3-1
     - id: ShuttleWeaponEnergyGun
       orGroup: T3-1
@@ -220,9 +220,9 @@
     - id: ShuttleWeaponShotgunKammerer
       orGroup: T3-1
       prob: 0.1
-#    - id: ShuttleWeaponShotgunKammererNonlethal # Frontier - TODO: Restore rubber
-#      orGroup: T3-1
-#      prob: 0.1
+    - id: ShuttleWeaponShotgunKammererNonlethal
+      orGroup: T3-1
+      prob: 0.1
     # T3 Melee
     - id: KukriKnife
       orGroup: Melee
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 33c87d26605..8d39c5ced1c 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -111,7 +111,6 @@
         - id: JetpackMiniFilled
         - id: HandheldGPSBasic
   - type: AccessReader
-    access: [["Captain"], ["Pilot"]]
 
 #Clown hardsuit
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml
new file mode 100644
index 00000000000..5e272148571
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/misc.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: PaperWrittenPirateScribbles
+  suffix: pirate scribbles
+  parent: Paper
+  components:
+  - type: Paper
+    content: book-text-pirate-scribbles
diff --git a/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
new file mode 100644
index 00000000000..ff70d41b379
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Jukebox/Standard.yml
@@ -0,0 +1,5 @@
+- type: jukebox
+  id: lateraligator
+  name: Silverman Sound Studios - Later Alligator
+  path:
+    path: /Audio/_NF/Jukebox/lateraligator.ogg
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
index 6e71c4db23d..b8a4f7be09f 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/arcadiadrobe.yml
@@ -4,6 +4,7 @@
     ClothingBackpackArcadia: 3
     ClothingBackpackDuffelArcadia: 3
     ClothingBackpackSatchelArcadia: 3
+    ClothingBackpackMessengerArcadia: 3
     ClothingBeltArcadia: 3
     ClothingEyesArcadiaVisor: 3
     ClothingHandsGlovesArcadiaCombat: 3
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
index 1167ce4c3cc..25abbe278a9 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
@@ -2,18 +2,20 @@
   id: LessLethalVendInventory
   startingInventory:
     WeaponDisabler: 10
-    # Kardashev-MosinNonlethal: 10 # Frontier - TODO: Restore Rubber
-    # WeaponRevolverArgentiNonlethal: 10 # Frontier - TODO: Restore Rubber
-    # WeaponShotgunDoubleBarreledRubber: 10 # Frontier - TODO: Restore Rubber
+    Kardashev-MosinNonlethal: 10
+    WeaponRevolverArgentiNonlethal: 10
+    WeaponShotgunDoubleBarreledRubber: 10
     WeaponFlareGun: 20
     BoxDonkSoftBox: 10
     BoxCartridgeCap: 10
-    # MagazineBoxPistolRubber: 10 # Frontier - TODO: Restore Rubber
-    # MagazineBoxMagnumRubber: 10 # Frontier - TODO: Restore Rubber
+    MagazineBoxPistolRubber: 10
+    MagazineBoxMagnumRubber: 10
     BoxBeanbag: 8
-    # MagazineBoxRifleRubber: 8 # Frontier - TODO: Restore Rubber
-    # MagazineBoxLightRifleRubber: 4 # Frontier - TODO: Restore Rubber
-    # MagazineBoxCaselessRifleRubber: 4 # Frontier - TODO: Restore Rubber
+    MagazineBoxRifleRubber: 8
+    MagazineBoxLightRifleRubber: 4
+    MagazineBoxCaselessRifleRubber: 4
+    SpeedLoaderRifleHeavy: 10
+    SpeedLoaderRifleHeavyRubber: 10
   contrabandInventory:
     WeaponRifleBB: 2
     BoxCartridgeBB: 10
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
index ef06b89ce91..4ae47f78b8f 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
@@ -1,3 +1,42 @@
+# BASE
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackMessengerContractor
+  name: contractor messenger bag
+  description: A trendy looking messenger bag in tasteful colors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#777b83"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#777b83"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#777b83"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#777b83"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
 - type: entity
   parent: ClothingBackpack
   id: ClothingBackpackMessenger
@@ -7,15 +46,85 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/messenger.rsi
 
+# DEPARTMENTAL
+## Command
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerEngineering
-  name: engineering messenger bag
-  description: A tough messenger bag with extra pockets.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerCaptain
+  name: captain's messenger bag
+  description: An exclusive messenger bag for Nanotrasen officers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3c6381"
+    - state: icon-sling
+      color: "#d6a033"
+    - state: icon-clasp
+      color: "#f6d56a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3c6381"
+      - state: sling-equipped-BACKPACK
+        color: "#d6a033"
+      - state: clasp-equipped-BACKPACK
+        color: "#f6d56a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3c6381"
+      - state: clasp-inhand-left
+        color: "#f6d56a"
+      right:
+      - state: base-inhand-right
+        color: "#3c6381"
+      - state: clasp-inhand-right
+        color: "#f6d56a"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSr
+  name: station representative's messenger bag
+  description: An exclusive messenger bag for Nanotrasen officers.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/engineering.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#2c6a30"
+    - state: icon-sling
+      color: "#fbe6b8"
+    - state: icon-clasp
+      color: "#eca615"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#2c6a30"
+      - state: sling-equipped-BACKPACK
+        color: "#fbe6b8"
+      - state: clasp-equipped-BACKPACK
+        color: "#eca615"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#2c6a30"
+      - state: clasp-inhand-left
+        color: "#eca615"
+      right:
+      - state: base-inhand-right
+        color: "#2c6a30"
+      - state: clasp-inhand-right
+        color: "#eca615"
 
+## Engineering
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerAtmospherics
@@ -26,17 +135,183 @@
     sprite: _NF/Clothing/Back/Messenger/atmospherics.rsi
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerClown
-  name: clown messenger bag
-  description: For fast running from security.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerEngineering
+  name: engineering messenger bag
+  description: A tough messenger bag with extra pockets.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/clown.rsi
-  - type: Storage
-    storageOpenSound:
-      collection: BikeHorn
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#c9a569"
+    - state: icon-base-top
+      color: "#f4af73"
+    - state: icon-decor-accent
+      color: "#ffde15"
+    - state: icon-sling
+      color: "#67593f"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#c9a569"
+      - state: base-top-equipped-BACKPACK
+        color: "#f4af73"
+      - state: decor-accent-equipped-BACKPACK
+        color: "#f4af73"
+      - state: sling-equipped-BACKPACK
+        color: "#67593f"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#c9a569"
+      - state: base-top-inhand-left
+        color: "#f4af73"
+      - state: decor-accent-inhand-left
+        color: "#ffde15"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#c9a569"
+      - state: base-top-inhand-right
+        color: "#f4af73"
+      - state: decor-accent-inhand-right
+        color: "#ffde15"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerChiefEngineer
+  name: chief engineer's messenger bag
+  description: A tough messenger bag with extra pockets.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#a48965"
+    - state: icon-sling
+      color: "#e78c2e"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#a48965"
+      - state: sling-equipped-BACKPACK
+        color: "#e78c2e"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#a48965"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#a48965"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+## Supply
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerCargo
+  name: cargo messenger bag
+  description: A robust messenger bag for stealing cargo's loot.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#d9b744"
+    - state: icon-base-top
+      color: "#aaaaaa"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#d9b744"
+      - state: base-top-equipped-BACKPACK
+        color: "#aaaaaa"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#d9b744"
+      - state: base-top-inhand-left
+        color: "#aaaaaa"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#d9b744"
+      - state: base-top-inhand-right
+        color: "#aaaaaa"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSalvage
+  name: salvage messenger bag
+  description: A robust messenger bag for stashing your loot.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#766245"
+    - state: icon-sling
+      color: "#5f539a"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#766245"
+      - state: sling-equipped-BACKPACK
+        color: "#5f539a"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#766245"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#766245"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
+## Medical
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerMedical
@@ -73,6 +348,7 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/genetics.rsi
 
+## Science
 - type: entity
   parent: ClothingBackpackMessenger
   id: ClothingBackpackMessengerScience
@@ -82,131 +358,849 @@
   - type: Sprite
     sprite: _NF/Clothing/Back/Messenger/science.rsi
 
+## Civilian
 - type: entity
   parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerCaptain
-  name: captain's messenger bag
-  description: An exclusive messenger bag for Nanotrasen officers.
+  id: ClothingBackpackMessengerClown
+  name: clown messenger bag
+  description: For fast running from security.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/captain.rsi
+    sprite: _NF/Clothing/Back/Messenger/clown.rsi
+  - type: Storage
+    storageOpenSound:
+      collection: BikeHorn
 
 - type: entity
   parent: ClothingBackpackMessenger
+  id: ClothingBackpackMessengerMime
+  name: mime messenger bag
+  description: A robust messenger bag for waging war against clowns.
+  components:
+    - type: Sprite
+      sprite: _NF/Clothing/Back/Messenger/mime.rsi
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerHydroponics
   name: hydroponics messenger bag
   description: A messenger bag made of all natural fibers.
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/hydroponics.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#548ddc"
+    - state: icon-base-top
+      color: "#69c05b"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#548ddc"
+      - state: base-top-equipped-BACKPACK
+        color: "#69c05b"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#548ddc"
+      - state: base-top-inhand-left
+        color: "#69c05b"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#548ddc"
+      - state: base-top-inhand-right
+        color: "#69c05b"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerCargo
-  name: cargo messenger bag
-  description: A robust messenger bag for stealing cargo's loot.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerJanitor
+  name: janitor messenger bag
+  description: A robust messenger bag for waging war against dirt.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/cargo.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#ebdc36"
+    - state: icon-sling
+      color: "#8c347f"
+    - state: icon-clasp
+      color: "#8c347f"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#ebdc36"
+      - state: sling-equipped-BACKPACK
+        color: "#8c347f"
+      - state: clasp-equipped-BACKPACK
+        color: "#8c347f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#ebdc36"
+      - state: clasp-inhand-left
+        color: "#8c347f"
+      right:
+      - state: base-inhand-right
+        color: "#ebdc36"
+      - state: clasp-inhand-right
+        color: "#8c347f"
 
 - type: entity
   parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerSalvage
-  name: salvage messenger bag
-  description: A robust messenger bag for stashing your loot.
+  id: ClothingBackpackMessengerMailCarrier
+  name: mail carrier messenger bag
+  description: A robust messenger bag for waging war against mail.
   components:
     - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/salvage.rsi
+      sprite: _NF/Clothing/Back/Messenger/mailman.rsi
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerChaplain
+  name: chaplain messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#535353"
+    - state: icon-sling
+      color: "#535353"
+    - state: icon-clasp
+      color: "#f6d56a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#535353"
+      - state: sling-equipped-BACKPACK
+        color: "#535353"
+      - state: clasp-equipped-BACKPACK
+        color: "#f6d56a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#535353"
+      - state: clasp-inhand-left
+        color: "#f6d56a"
+      right:
+      - state: base-inhand-right
+        color: "#535353"
+      - state: clasp-inhand-right
+        color: "#f6d56a"
+
+## Wild cards
+- type: entity
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerPilot
   name: pilot messenger bag
   description: A robust messenger bag for shuttle parts.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/pilot.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e2516"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#3e2516"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#3e2516"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#3e2516"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerMercenary
   name: mercenary messenger bag
-  description: A robust messenger bag for war crimes.
+  description:  A robust messenger bag for war crimes.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mercenary.rsi
-
-- type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerSyndicate
-  name: syndicate messenger bag
-  description: A robust messenger bag for waging war against oppressors.
-  components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/syndicate.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#6a6a36"
+    - state: icon-sling
+      color: "#6a6a36"
+    - state: icon-clasp
+      color: "#bbbb7a"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: sling-equipped-BACKPACK
+        color: "#6a6a36"
+      - state: clasp-equipped-BACKPACK
+        color: "#bbbb7a"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#6a6a36"
+      - state: clasp-inhand-left
+        color: "#bbbb7a"
+      right:
+      - state: base-inhand-right
+        color: "#6a6a36"
+      - state: clasp-inhand-right
+        color: "#bbbb7a"
 
+## Holding
 - type: entity
   parent: ClothingBackpackHolding
   id: ClothingBackpackMessengerHolding
   name: messenger bag of holding
   description: A messenger bag that opens into a localized pocket of bluespace.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/holding.rsi
-      state: icon
-      layers:
-        - state: icon
-        - state: icon-unlit
-          shader: unshaded
-    - type: Clothing
-      equippedPrefix: holding
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/holding.rsi
+    state: icon
+    layers:
+    - state: icon
+    - state: icon-unlit
+      shader: unshaded
+  - type: Clothing
+    equippedPrefix: holding
 
+## Antagonists / Contraband
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerMailCarrier
-  name: mail carrier messenger bag
-  description: A robust messenger bag for waging war against mail.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSyndicate
+  name: syndicate messenger bag
+  description: A robust messenger bag for waging war against oppressors.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mailman.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#424242"
+    - state: icon-sling
+      color: "#7f0101"
+    - state: icon-clasp
+      color: "#7f0101"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#424242"
+      - state: sling-equipped-BACKPACK
+        color: "#7f0101"
+      - state: clasp-equipped-BACKPACK
+        color: "#7f0101"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#424242"
+      - state: clasp-inhand-left
+        color: "#7f0101"
+      right:
+      - state: base-inhand-right
+        color: "#424242"
+      - state: clasp-inhand-right
+        color: "#7f0101"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerJanitor
-  name: janitor messenger bag
-  description: A robust messenger bag for waging war against dirt.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerBloodCult
+  name: cultist messenger bag
+  description: A watertight messenger bag for loyal Nar'Sie followers.
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/janitor.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#562f2f"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#96907c"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#562f2f"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#96907c"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#562f2f"
+      - state: clasp-inhand-left
+        color: "#96907c"
+      right:
+      - state: base-inhand-right
+        color: "#562f2f"
+      - state: clasp-inhand-right
+        color: "#96907c"
 
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerMime
-  name: mime messenger bag
-  description: A robust messenger bag for waging war against clowns.
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerArcadia
+  name: arcadia messenger bag
   components:
-    - type: Sprite
-      sprite: _NF/Clothing/Back/Messenger/mime.rsi
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#bab0b0"
+    - state: icon-base-top
+      color: "#ffffff"
+    - state: icon-decor
+      color: "#c12d30"
+    - state: icon-sling
+      color: "#7d282c"
+    - state: icon-clasp
+      color: "#1f1f1f"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#bab0b0"
+      - state: base-top-equipped-BACKPACK
+        color: "#ffffff"
+      - state: decor-equipped-BACKPACK
+        color: "#c12d30"
+      - state: sling-equipped-BACKPACK
+        color: "#7d282c"
+      - state: clasp-equipped-BACKPACK
+        color: "#1f1f1f"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#bab0b0"
+      - state: base-top-inhand-left
+        color: "#ffffff"
+      - state: decor-inhand-left
+        color: "#c12d30"
+      - state: clasp-inhand-left
+        color: "#1f1f1f"
+      right:
+      - state: base-inhand-right
+        color: "#bab0b0"
+      - state: base-top-inhand-right
+        color: "#ffffff"
+      - state: decor-inhand-right
+        color: "#c12d30"
+      - state: clasp-inhand-right
+        color: "#1f1f1f"
 
+## NFSD
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerNfsdBrown
   name: nfsd messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/nfsd_brown.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#63492a"
+    - state: icon-base-top
+      color: "#c2ae98"
+    - state: icon-sling
+      color: "#47603b"
+    - state: icon-clasp
+      color: "#e1af4e"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#63492a"
+      - state: base-top-equipped-BACKPACK
+        color: "#c2ae98"
+      - state: sling-equipped-BACKPACK
+        color: "#47603b"
+      - state: clasp-equipped-BACKPACK
+        color: "#e1af4e"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#63492a"
+      - state: base-top-inhand-left
+        color: "#c2ae98"
+      - state: clasp-inhand-left
+        color: "#e1af4e"
+      right:
+      - state: base-inhand-right
+        color: "#63492a"
+      - state: base-top-inhand-right
+        color: "#c2ae98"
+      - state: clasp-inhand-right
+        color: "#e1af4e"
 
 - type: entity
-  parent: ClothingBackpackMessenger
+  parent: ClothingBackpackMessengerContractor
   id: ClothingBackpackMessengerNfsdCream
+  name: nfsd messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/nfsd_cream.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#c2ae98"
+    - state: icon-decor
+      color: "#47603b"
+    - state: icon-sling
+      color: "#47603b"
+    - state: icon-clasp
+      color: "#e1af4e"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#c2ae98"
+      - state: decor-equipped-BACKPACK
+        color: "#47603b"
+      - state: sling-equipped-BACKPACK
+        color: "#47603b"
+      - state: clasp-equipped-BACKPACK
+        color: "#e1af4e"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#c2ae98"
+      - state: decor-inhand-left
+        color: "#47603b"
+      - state: clasp-inhand-left
+        color: "#e1af4e"
+      right:
+      - state: base-inhand-right
+        color: "#c2ae98"
+      - state: decor-inhand-right
+        color: "#47603b"
+      - state: clasp-inhand-right
+        color: "#e1af4e"
 
+## Security
 - type: entity
-  parent: ClothingBackpackMessenger
-  id: ClothingBackpackMessengerBloodCult
-  name: cultist messenger bag
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerSecurity
+  name: security messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#6a6a6a"
+    - state: icon-decor
+      color: "#e6000d"
+    - state: icon-sling
+      color: "#bf0000"
+    - state: icon-clasp
+      color: "#cdcdcd"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#6a6a6a"
+      - state: decor-equipped-BACKPACK
+        color: "#e6000d"
+      - state: sling-equipped-BACKPACK
+        color: "#bf0000"
+      - state: clasp-equipped-BACKPACK
+        color: "#cdcdcd"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#6a6a6a"
+      - state: decor-inhand-left
+        color: "#e6000d"
+      - state: clasp-inhand-left
+        color: "#cdcdcd"
+      right:
+      - state: base-inhand-right
+        color: "#6a6a6a"
+      - state: decor-inhand-right
+        color: "#e6000d"
+      - state: clasp-inhand-right
+        color: "#cdcdcd"
+
+## Color variants (to match colored jumpsuits)
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBlack
+  name: black messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#535353"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#535353"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#535353"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#535353"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBlue
+  name: blue messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#0089EF"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#0089EF"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#0089EF"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#0089EF"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorGreen
+  name: green messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#5ABF2F"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#5ABF2F"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#5ABF2F"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#5ABF2F"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorOrange
+  name: orange messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#EF8100"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#EF8100"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#EF8100"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#EF8100"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorRed
+  name: red messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#940000"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#940000"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#940000"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#940000"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorPurple
+  name: purple messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#9C0DE1"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#9C0DE1"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#9C0DE1"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#9C0DE1"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBrownLight
+  name: light brown messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#C09F72"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#C09F72"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#C09F72"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#C09F72"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorBrown
+  name: brown messenger bag
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#723A02"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#eeeeee"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#723A02"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#eeeeee"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#723A02"
+      - state: clasp-inhand-left
+        color: "#eeeeee"
+      right:
+      - state: base-inhand-right
+        color: "#a17229"
+      - state: clasp-inhand-right
+        color: "#eeeeee"
+
+- type: entity
+  parent: ClothingBackpackMessengerContractor
+  id: ClothingBackpackMessengerColorWhite
+  name: white messenger bag
   components:
   - type: Sprite
-    sprite: _NF/Clothing/Back/Messenger/bloodcult.rsi
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffffff"
+    - state: icon-sling
+      color: "#776756"
+    - state: icon-clasp
+      color: "#776756"
+  - type: Clothing
+    sprite: _NF/Clothing/Back/Messenger/color.rsi
+    clothingVisuals:
+      back:
+      - state: base-equipped-BACKPACK
+        color: "#ffffff"
+      - state: sling-equipped-BACKPACK
+        color: "#776756"
+      - state: clasp-equipped-BACKPACK
+        color: "#776756"
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-inhand-left
+        color: "#ffffff"
+      - state: clasp-inhand-left
+        color: "#776756"
+      right:
+      - state: base-inhand-right
+        color: "#ffffff"
+      - state: clasp-inhand-right
+        color: "#776756"
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
index 6811021e8be..9c04c732558 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets.yml
@@ -27,6 +27,7 @@
 - type: entity
   parent: ClothingHeadset
   id: ClothingHeadsetNfsdBrown # Ask SR or Sheriff for keys
+  name: nfsd headset
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_brown.rsi
@@ -41,7 +42,6 @@
 - type: entity
   parent: ClothingHeadsetNfsdBrown
   id: ClothingHeadsetNfsdGreen # Ask SR or Sheriff for keys
-  name: nfsd headset
   components:
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_e_green.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
index cb3f8623cd3..f8705987b24 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
@@ -7,7 +7,6 @@
     containers:
       key_slots:
       - EncryptionKeyCommon
-      - EncryptionKeyMedical
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi
   - type: Clothing
@@ -22,7 +21,6 @@
     containers:
       key_slots:
       - EncryptionKeyCommon
-      - EncryptionKeyTraffic
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/pilot.rsi
   - type: Clothing
@@ -36,10 +34,9 @@
   - type: ContainerFill
     containers:
       key_slots:
-#      - EncryptionKeySecurity
-      - EncryptionKeyCommand
-      - EncryptionKeyNfsd
       - EncryptionKeyCommon
+      - EncryptionKeyNfsd
+      - EncryptionKeyCommand
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_h_green.rsi
   - type: Clothing
@@ -53,10 +50,9 @@
   - type: ContainerFill
     containers:
       key_slots:
-#      - EncryptionKeySecurity
-      - EncryptionKeyCommand
-      - EncryptionKeyNfsd
       - EncryptionKeyCommon
+      - EncryptionKeyNfsd
+      - EncryptionKeyCommand
   - type: Sprite
     sprite: _NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/_NF/Entities/Effects/portal.yml b/Resources/Prototypes/_NF/Entities/Effects/portal.yml
new file mode 100644
index 00000000000..fe2795bddd0
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Effects/portal.yml
@@ -0,0 +1,16 @@
+- type: entity
+  id: BasePortalAdmin
+  parent: BasePortal
+  abstract: true
+  description: This one looks more like a special bluespace portal.
+  components:
+  - type: Portal
+    canTeleportToOtherMaps: true
+
+- type: entity
+  id: PortalAdminStart
+  parent: [BasePortalAdmin, PortalArtifact]
+
+- type: entity
+  id: PortalAdminEnd
+  parent: [BasePortalAdmin, PortalArtifact]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
index 43f56a36b19..a5b7a7647b6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
@@ -1,18 +1,6 @@
-# Expedition rewards
-- type: entity
-  parent: SpaceCash5000
-  id: SpaceCash5000Expedition
-  name: "spesos (5000)"
-
-- type: entity
-  parent: SpaceCash10000
-  id: SpaceCash10000Expedition
-  name: "spesos (10000)"
-
 - type: entity
   parent: SpaceCash
-  id: SpaceCash15000Expedition
-  name: "spesos (15000)"
+  id: SpaceCash15000
   suffix: 15000
   components:
   - type: Icon
@@ -21,15 +9,10 @@
   - type: Stack
     count: 15000
 
-- type: entity
-  parent: SpaceCash20000
-  id: SpaceCash20000Expedition
-  name: "spesos (20000)"
-
 - type: entity
   parent: SpaceCash
-  id: SpaceCash25000Expedition
-  name: "spesos (25000)"
+  id: SpaceCash25000
+  suffix: 25000
   components:
   - type: Icon
     sprite: Objects/Economy/cash.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
index f6764e77dad..36dd79ce38f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Cartridges/pistol.yml
@@ -5,3 +5,18 @@
   components:
   - type: CartridgeAmmo
     proto: BulletPistolEmp
+
+- type: entity
+  id: CartridgePistolRubber
+  name: cartridge (.35 auto rubber)
+  parent: BaseCartridgePistol
+  components:
+  - type: CartridgeAmmo
+    proto: BulletPistolRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
index 53b0070605c..486a6ff5471 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Ammunition/Magazines/pistol.yml
@@ -11,3 +11,31 @@
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-1
       map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolRubber
+  name: pistol magazine (.35 auto rubber)
+  parent: BaseMagazinePistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolSubMachineGunRubber
+  name: SMG magazine (.35 auto rubber)
+  parent: BaseMagazinePistolSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
new file mode 100644
index 00000000000..d5d24f82b85
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleBigRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber-b
+  - type: MagazineVisuals
+    magState: magb
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleRubber
+  name: ammunition box (.25 caseless rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
new file mode 100644
index 00000000000..2c30951bc98
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxLightRifle
+  id: MagazineBoxLightRifleRubber
+  name: ammunition box (.30 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
new file mode 100644
index 00000000000..84625045327
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxMagnum
+  id: MagazineBoxMagnumRubber
+  name: ammunition box (.45 magnum rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
new file mode 100644
index 00000000000..5b3aba79f09
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: BaseMagazineBoxPistol
+  id: MagazineBoxPistolRubber
+  name: ammunition box (.35 auto rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
new file mode 100644
index 00000000000..67eb0fd869b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -0,0 +1,35 @@
+- type: entity
+  parent: BaseMagazineBoxRifle
+  id: MagazineBoxRifleBigRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeRiflePractice
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: practice-b
+  - type: MagazineVisuals
+    magState: magb
+    steps: 2
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineBoxRifle
+  id: MagazineBoxRifleRubber
+  name: ammunition box (.20 rifle rubber)
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+    - state: rubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
new file mode 100644
index 00000000000..304364fee41
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeCaselessRifleRubber
+  name: cartridge (.25 caseless rubber)
+  parent: BaseCartridgeCaselessRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletCaselessRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
new file mode 100644
index 00000000000..d1372f9334d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeLightRifleRubber
+  name: cartridge (.30 rifle rubber)
+  parent: BaseCartridgeLightRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletLightRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
new file mode 100644
index 00000000000..6d522b6e6f8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeMagnumRubber
+  name: cartridge (.45 magnum rubber)
+  parent: BaseCartridgeMagnum
+  components:
+  - type: CartridgeAmmo
+    proto: BulletMagnumRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
new file mode 100644
index 00000000000..aee8ab56851
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
@@ -0,0 +1,14 @@
+- type: entity
+  id: CartridgeRifleRubber
+  name: cartridge (.20 rifle rubber)
+  parent: BaseCartridgeRifle
+  components:
+  - type: CartridgeAmmo
+    proto: BulletRifleRubber
+  - type: Sprite
+    layers:
+      - state: base
+        map: [ "enum.AmmoVisualLayers.Base" ]
+      - state: tip
+        map: [ "enum.AmmoVisualLayers.Tip" ]
+        color: "#43c4f7"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
new file mode 100644
index 00000000000..a0b4ab40003
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -0,0 +1,48 @@
+- type: entity
+  id: MagazinePistolCaselessRifleRubber
+  name: "pistol magazine (.25 caseless rubber)"
+  parent: BaseMagazinePistolCaselessRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+    capacity: 10
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag
+    steps: 6
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: MagazineCaselessRifleRubber
+  name: "magazine (.25 caseless rubber)"
+  parent: BaseMagazineCaselessRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineCaselessRifleShortRubber
+  name: "short magazine (.25 caseless rubber)"
+  parent: BaseMagazineCaselessRifleShort
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeCaselessRifleRubber
+    capacity: 20
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
new file mode 100644
index 00000000000..0681df2dc86
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: MagazineLightRifleRubber
+  name: "magazine (.30 rifle rubber)"
+  parent: BaseMagazineLightRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeLightRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
new file mode 100644
index 00000000000..7cb9620abe8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -0,0 +1,27 @@
+- type: entity
+  id: MagazineMagnumRubber
+  name: pistol magazine (.45 magnum rubber)
+  parent: BaseMagazineMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazineMagnumSubMachineGunRubber
+  name: "Vector magazine (.45 magnum rubber)"
+  parent: BaseMagazineMagnumSubMachineGun
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
new file mode 100644
index 00000000000..32b8fe61e2a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: MagazineRifleRubber
+  name: "magazine (.20 rifle rubber)"
+  parent: BaseMagazineRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
new file mode 100644
index 00000000000..8f845f3adcb
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: SpeedLoaderMagnumRubber
+  name: "speed loader (.45 magnum rubber)"
+  parent: BaseSpeedLoaderMagnum
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeMagnumRubber
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-6
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
new file mode 100644
index 00000000000..99435076361
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
@@ -0,0 +1,18 @@
+- type: entity
+  id: SpeedLoaderPistolRubber
+  name: "speed loader (.35 auto rubber)"
+  parent: BaseSpeedLoaderPistol
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: rubber-6
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 7
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Basic/sawn_pka.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml
deleted file mode 100644
index 6db0b8468c2..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/revolvers.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-- type: entity
-  name: Argenti
-  parent: BaseWeaponRevolver
-  id: WeaponRevolverArgenti
-  description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
-  components:
-  - type: Sprite
-    sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi
-  - type: Clothing
-    sprite: _NF/Objects/Weapons/Argenti-Revolver.rsi
-  - type: Gun
-    fireRate: 2
-    resetOnHandSelected: false
-  - type: RevolverAmmoProvider
-    whitelist:
-      tags:
-        - CartridgeRifle
-    proto: CartridgeRifle
-    capacity: 6
-    chambers: [ True, True, True, True, True, True ]
-    ammoSlots: [ null, null, null, null, null, null ]
-  - type: StaticPrice
-    price: 200
-
-# - type: entity
-  # parent: WeaponRevolverArgenti
-  # id: WeaponRevolverArgentiNonlethal
-  # suffix: Non-lethal
-  # components:
-  # - type: RevolverAmmoProvider
-    # whitelist:
-      # tags:
-        # - CartridgeRifle
-    # proto: CartridgeRifleRubber
-    # capacity: 6
-    # chambers: [ True, True, True, True, True, True ]
-    # ammoSlots: [ null, null, null, null, null, null ]
-
-# - type: entity
-  # parent: WeaponRevolverDeckard
-  # id: WeaponRevolverDeckardNonlethal
-  # suffix: Non-lethal
-  # components:
-  # - type: RevolverAmmoProvider
-    # capacity: 5
-    # proto: CartridgeMagnumRubber
-    # chambers: [ True, True, True, True, True ]
-    # ammoSlots: [ null, null, null, null, null ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
deleted file mode 100644
index 128b1c91a6a..00000000000
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# - type: entity # Frontier - TODO: Restore Rubber
-  # id: Kardashev-MosinNonlethal
-  # parent: WeaponSniperMosin
-  # suffix: Non-lethal
-  # components:
-  # - type: BallisticAmmoProvider
-    # whitelist:
-      # tags:
-      # - CartridgeLightRifle
-    # capacity: 10
-    # proto: CartridgeLightRifleRubber
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
new file mode 100644
index 00000000000..c7e61a2dc14
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -0,0 +1,48 @@
+- type: entity
+  id: WeaponPistolMk58Nonlethal
+  parent: WeaponPistolMk58
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+
+- type: entity
+  name: N1984
+  parent: WeaponPistolN1984
+  id: WeaponPistolN1984Nonlethal
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineMagnumRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineMagnum
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeMagnumRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeMagnum
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
new file mode 100644
index 00000000000..5e4ba3173f9
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -0,0 +1,47 @@
+- type: entity
+  name: Argenti
+  parent: BaseWeaponRevolver
+  id: WeaponRevolverArgenti
+  description: The civilian grade Argenti Type 20 revolver. Manufactured by Silver Industries. While the design with expanded cylinder is quite ancient, the right gunslinger will know how to utilise it well. Uses .20 rifle ammo.
+  components:
+  - type: Sprite
+    scale: 0.75 , 0.75
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi
+  - type: Clothing
+    sprite: _NF/Objects/Weapons/Guns/Revolvers/argenti.rsi
+  - type: Gun
+    fireRate: 2.5
+    resetOnHandSelected: false
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeRifle
+        - SpeedLoaderRifleHeavy
+    capacity: 8
+    proto: CartridgeRifle
+    chambers: [ True, True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null, null ]
+  - type: StaticPrice
+    price: 200
+
+- type: entity
+  parent: WeaponRevolverArgenti
+  id: WeaponRevolverArgentiNonlethal
+  suffix: Non-lethal
+  components:
+  - type: RevolverAmmoProvider
+    capacity: 8
+    proto: CartridgeRifleRubber
+    chambers: [ True, True, True, True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null, null, null, null ]
+
+- type: entity
+  parent: WeaponRevolverDeckard
+  id: WeaponRevolverDeckardNonlethal
+  suffix: Non-lethal
+  components:
+  - type: RevolverAmmoProvider
+    capacity: 5
+    proto: CartridgeMagnumRubber
+    chambers: [ True, True, True, True, True ]
+    ammoSlots: [ null, null, null, null, null ]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
new file mode 100644
index 00000000000..24cfd29260f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -0,0 +1,24 @@
+- type: entity
+  name: Lecter
+  parent: WeaponRifleLecter
+  id: WeaponRifleLecterRubber
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineRifleRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeRifleRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeRifle
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
new file mode 100644
index 00000000000..a9b5c3c12bf
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -0,0 +1,25 @@
+# Rubber
+- type: entity
+  name: Drozd
+  parent: WeaponSubMachineGunDrozd
+  id: WeaponSubMachineGunDrozdRubber
+  suffix: Non-Lethal
+  components:
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGunRubber
+          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+          priority: 2
+          whitelist:
+            tags:
+              - MagazinePistolSubMachineGun
+        gun_chamber:
+          name: Chamber
+          startingItem: CartridgePistolRubber
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistol
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Shotguns/shotguns.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
similarity index 63%
rename from Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index 12cbbc255f4..d988c32f37f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Snipers/snipers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -1,6 +1,20 @@
+# Upstream
+- type: entity
+  id: Kardashev-MosinNonlethal
+  parent: WeaponSniperMosin
+  suffix: Non-lethal
+  components:
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+      - CartridgeLightRifle
+    capacity: 10
+    proto: CartridgeLightRifleRubber
+
+# Frontier
 - type: entity
   name: N2524 Pattern Repeater
-  parent: BaseWeaponSniper
+  parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperRepeater
   description: A civilian grade lever action firearm, favored by space cowboys across the Frontier for its reliability and stopping power. Uses .45 magnum ammo.
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
index 1f9e7ed8b6e..17445ac4d3e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
@@ -44,6 +44,14 @@
     containers:
       board: [ DoorElectronicsFrontierCommand ]
 
+- type: entity
+  parent: [ AirlockEngineering, AirlockFrontierCommandLocked]
+  id: AirlockFrontierCommandEngineeringLocked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontierCommand ]
+
 - type: entity
   parent: HighSecDoor
   id: HighSecFrontierCommandLocked
@@ -189,6 +197,22 @@
     containers:
       board: [ DoorElectronicsFrontierCommand ]
 
+- type: entity
+  parent: [ AirlockEngineeringGlass, AirlockFrontierCommandGlassLocked]
+  id: AirlockFrontierCommandEngineeringGlassLocked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontierCommand ]
+
+- type: entity
+  parent: [ AirlockAtmosphericsGlass, AirlockFrontierCommandGlassLocked]
+  id: AirlockFrontierCommandAtmosphericsGlassLocked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontierCommand ]
+
 - type: entity
   parent: AirlockGlass
   id: AirlockMailCarrierGlassLocked
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
index 73781b76250..3857ecade42 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Windoors/windoor.yml
@@ -6,29 +6,33 @@
   id: WindoorSecureMercenaryLocked
   suffix: Mercenary, Locked
   components:
-  - type: AccessReader
-    access: [["Captain"], ["Mercenary"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMercenary ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureFrontierLocked
   suffix: Frontier, Locked
   components:
-  - type: AccessReader
-    access: [["Frontier"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontier ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureFrontierCommandLocked
   suffix: Frontier Command, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"], ["HeadOfPersonnel"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsFrontierCommand ]
 
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureHeadOfSecurityLocked
   suffix: Sheriff, Locked
   components:
-  - type: AccessReader
-    access: [["HeadOfSecurity"]]
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsHeadOfSecurity ]
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 ca91f13b2fd..2bc1adbdb39 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -106,7 +106,6 @@
       visible: false
       map: ["enum.WeldableLayers.BaseWelded"]
   - type: AccessReader
-    access: [["Captain"], ["Pilot"]]
 
 # Wooden Cabinet
 - type: entity
diff --git a/Resources/Prototypes/_NF/Events/events_bluespace.yml b/Resources/Prototypes/_NF/Events/events_bluespace.yml
index 77973e5811c..6e4057f52df 100644
--- a/Resources/Prototypes/_NF/Events/events_bluespace.yml
+++ b/Resources/Prototypes/_NF/Events/events_bluespace.yml
@@ -126,7 +126,7 @@
     # rewardFactor: 0.5 # Filler to make the bank go up
 
 - type: entity
-  id: BluespaceArcIndDataCarrier
+  id: BluespaceDataCarrier
   parent: BaseGameRule
   noSpawn: true
   components:
diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
index 2849998257d..fa7273265df 100644
--- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -5,6 +5,7 @@
   children:
   - ShipyardAmbition
   - ShipyardBrigand
+  - ShipyardCeres
   - ShipyardGasbender
   - ShipyardHarbormaster
   - ShipyardKilderkin
@@ -24,6 +25,11 @@
   name: guide-entry-shipyard-brigand
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Brigand.xml"
 
+- type: guideEntry
+  id: ShipyardCeres
+  name: guide-entry-shipyard-ceres
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml"
+
 - type: guideEntry
   id: ShipyardGasbender
   name: guide-entry-shipyard-gasbender
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
index 69a29b8d7f5..9052015d28a 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/bags.yml
@@ -1,407 +1,417 @@
 - type: loadout
-  id: ContractorClothingBackpackFilled
-  equipment: ContractorClothingBackpackFilled
+  id: ContractorClothingBackpack
+  equipment: ContractorClothingBackpack
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackFilled
+  id: ContractorClothingBackpack
   equipment:
-    back: ClothingBackpackFilled
+    back: ClothingBackpack
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelFilled
-  equipment: ContractorClothingBackpackDuffelFilled
+  id: ContractorClothingBackpackDuffel
+  equipment: ContractorClothingBackpackDuffel
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelFilled
+  id: ContractorClothingBackpackDuffel
   equipment:
-    back: ClothingBackpackDuffelFilled
+    back: ClothingBackpackDuffel
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelFilled
-  equipment: ContractorClothingBackpackSatchelFilled
+  id: ContractorClothingBackpackSatchel
+  equipment: ContractorClothingBackpackSatchel
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelFilled
+  id: ContractorClothingBackpackSatchel
   equipment:
-    back: ClothingBackpackSatchelFilled
+    back: ClothingBackpackSatchel
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerFilled
-  equipment: ContractorClothingBackpackMessengerFilled
+  id: ContractorClothingBackpackMessenger
+  equipment: ContractorClothingBackpackMessenger
   price: 0
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerFilled
+  id: ContractorClothingBackpackMessenger
   equipment:
-    back: ClothingBackpackMessengerFilled
+    back: ClothingBackpackMessenger
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerContractor
+  equipment: ContractorClothingBackpackMessengerContractor
+  price: 0
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerContractor
+  equipment:
+    back: ClothingBackpackMessengerContractor
 
 #T1
 - type: loadout
-  id: ContractorClothingBackpackCaptainFilled
-  equipment: ContractorClothingBackpackCaptainFilled
+  id: ContractorClothingBackpackCaptain
+  equipment: ContractorClothingBackpackCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackCaptainFilled
+  id: ContractorClothingBackpackCaptain
   equipment:
-    back: ClothingBackpackCaptainFilled
+    back: ClothingBackpackCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelCaptainFilled
-  equipment: ContractorClothingBackpackDuffelCaptainFilled
+  id: ContractorClothingBackpackDuffelCaptain
+  equipment: ContractorClothingBackpackDuffelCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelCaptainFilled
+  id: ContractorClothingBackpackDuffelCaptain
   equipment:
-    back: ClothingBackpackDuffelCaptainFilled
+    back: ClothingBackpackDuffelCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelCaptainFilled
-  equipment: ContractorClothingBackpackSatchelCaptainFilled
+  id: ContractorClothingBackpackSatchelCaptain
+  equipment: ContractorClothingBackpackSatchelCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelCaptainFilled
+  id: ContractorClothingBackpackSatchelCaptain
   equipment:
-    back: ClothingBackpackSatchelCaptainFilled
+    back: ClothingBackpackSatchelCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerCaptainFilled
-  equipment: ContractorClothingBackpackMessengerCaptainFilled
+  id: ContractorClothingBackpackMessengerCaptain
+  equipment: ContractorClothingBackpackMessengerCaptain
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerCaptainFilled
+  id: ContractorClothingBackpackMessengerCaptain
   equipment:
-    back: ClothingBackpackMessengerCaptainFilled
+    back: ClothingBackpackMessengerCaptain
 
 - type: loadout
-  id: ContractorClothingBackpackSalvageFilled
-  equipment: ContractorClothingBackpackSalvageFilled
+  id: ContractorClothingBackpackSalvage
+  equipment: ContractorClothingBackpackSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSalvageFilled
+  id: ContractorClothingBackpackSalvage
   equipment:
-    back: ClothingBackpackSalvageFilled
+    back: ClothingBackpackSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelSalvageFilled
-  equipment: ContractorClothingBackpackDuffelSalvageFilled
+  id: ContractorClothingBackpackDuffelSalvage
+  equipment: ContractorClothingBackpackDuffelSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelSalvageFilled
+  id: ContractorClothingBackpackDuffelSalvage
   equipment:
-    back: ClothingBackpackDuffelSalvageFilled
+    back: ClothingBackpackDuffelSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelSalvageFilled
-  equipment: ContractorClothingBackpackSatchelSalvageFilled
+  id: ContractorClothingBackpackSatchelSalvage
+  equipment: ContractorClothingBackpackSatchelSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelSalvageFilled
+  id: ContractorClothingBackpackSatchelSalvage
   equipment:
-    back: ClothingBackpackSatchelSalvageFilled
+    back: ClothingBackpackSatchelSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerSalvageFilled
-  equipment: ContractorClothingBackpackMessengerSalvageFilled
+  id: ContractorClothingBackpackMessengerSalvage
+  equipment: ContractorClothingBackpackMessengerSalvage
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerSalvageFilled
+  id: ContractorClothingBackpackMessengerSalvage
   equipment:
-    back: ClothingBackpackMessengerSalvageFilled
+    back: ClothingBackpackMessengerSalvage
 
 - type: loadout
-  id: ContractorClothingBackpackCargoFilled
-  equipment: ContractorClothingBackpackCargoFilled
+  id: ContractorClothingBackpackCargo
+  equipment: ContractorClothingBackpackCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackCargoFilled
+  id: ContractorClothingBackpackCargo
   equipment:
-    back: ClothingBackpackCargoFilled
+    back: ClothingBackpackCargo
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelCargoFilled
-  equipment: ContractorClothingBackpackDuffelCargoFilled
+  id: ContractorClothingBackpackDuffelCargo
+  equipment: ContractorClothingBackpackDuffelCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelCargoFilled
+  id: ContractorClothingBackpackDuffelCargo
   equipment:
-    back: ClothingBackpackDuffelCargoFilled
+    back: ClothingBackpackDuffelCargo
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelCargoFilled
-  equipment: ContractorClothingBackpackSatchelCargoFilled
+  id: ContractorClothingBackpackSatchelCargo
+  equipment: ContractorClothingBackpackSatchelCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelCargoFilled
+  id: ContractorClothingBackpackSatchelCargo
   equipment:
-    back: ClothingBackpackSatchelCargoFilled
+    back: ClothingBackpackSatchelCargo
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerCargoFilled
-  equipment: ContractorClothingBackpackMessengerCargoFilled
+  id: ContractorClothingBackpackMessengerCargo
+  equipment: ContractorClothingBackpackMessengerCargo
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerCargoFilled
+  id: ContractorClothingBackpackMessengerCargo
   equipment:
-    back: ClothingBackpackMessengerCargoFilled
+    back: ClothingBackpackMessengerCargo
 
 - type: loadout
-  id: ContractorClothingBackpackHydroponicsFilled
-  equipment: ContractorClothingBackpackHydroponicsFilled
+  id: ContractorClothingBackpackHydroponics
+  equipment: ContractorClothingBackpackHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackHydroponicsFilled
+  id: ContractorClothingBackpackHydroponics
   equipment:
-    back: ClothingBackpackHydroponicsFilled
+    back: ClothingBackpackHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelHydroponicsFilled
-  equipment: ContractorClothingBackpackDuffelHydroponicsFilled
+  id: ContractorClothingBackpackDuffelHydroponics
+  equipment: ContractorClothingBackpackDuffelHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelHydroponicsFilled
+  id: ContractorClothingBackpackDuffelHydroponics
   equipment:
-    back: ClothingBackpackDuffelHydroponicsFilled
+    back: ClothingBackpackDuffelHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelHydroponicsFilled
-  equipment: ContractorClothingBackpackSatchelHydroponicsFilled
+  id: ContractorClothingBackpackSatchelHydroponics
+  equipment: ContractorClothingBackpackSatchelHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelHydroponicsFilled
+  id: ContractorClothingBackpackSatchelHydroponics
   equipment:
-    back: ClothingBackpackSatchelHydroponicsFilled
+    back: ClothingBackpackSatchelHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerHydroponicsFilled
-  equipment: ContractorClothingBackpackMessengerHydroponicsFilled
+  id: ContractorClothingBackpackMessengerHydroponics
+  equipment: ContractorClothingBackpackMessengerHydroponics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerHydroponicsFilled
+  id: ContractorClothingBackpackMessengerHydroponics
   equipment:
-    back: ClothingBackpackMessengerHydroponicsFilled
+    back: ClothingBackpackMessengerHydroponics
 
 - type: loadout
-  id: ContractorClothingBackpackScienceFilled
-  equipment: ContractorClothingBackpackScienceFilled
+  id: ContractorClothingBackpackScience
+  equipment: ContractorClothingBackpackScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackScienceFilled
+  id: ContractorClothingBackpackScience
   equipment:
-    back: ClothingBackpackScienceFilled
+    back: ClothingBackpackScience
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelScienceFilled
-  equipment: ContractorClothingBackpackDuffelScienceFilled
+  id: ContractorClothingBackpackDuffelScience
+  equipment: ContractorClothingBackpackDuffelScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelScienceFilled
+  id: ContractorClothingBackpackDuffelScience
   equipment:
-    back: ClothingBackpackDuffelScienceFilled
+    back: ClothingBackpackDuffelScience
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelScienceFilled
-  equipment: ContractorClothingBackpackSatchelScienceFilled
+  id: ContractorClothingBackpackSatchelScience
+  equipment: ContractorClothingBackpackSatchelScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelScienceFilled
+  id: ContractorClothingBackpackSatchelScience
   equipment:
-    back: ClothingBackpackSatchelScienceFilled
+    back: ClothingBackpackSatchelScience
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerScienceFilled
-  equipment: ContractorClothingBackpackMessengerScienceFilled
+  id: ContractorClothingBackpackMessengerScience
+  equipment: ContractorClothingBackpackMessengerScience
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerScienceFilled
+  id: ContractorClothingBackpackMessengerScience
   equipment:
-    back: ClothingBackpackMessengerScienceFilled
+    back: ClothingBackpackMessengerScience
 
 - type: loadout
-  id: ContractorClothingBackpackMedicalFilled
-  equipment: ContractorClothingBackpackMedicalFilled
+  id: ContractorClothingBackpackMedical
+  equipment: ContractorClothingBackpackMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMedicalFilled
+  id: ContractorClothingBackpackMedical
   equipment:
-    back: ClothingBackpackMedicalFilled
+    back: ClothingBackpackMedical
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelMedicalFilled
-  equipment: ContractorClothingBackpackDuffelMedicalFilled
+  id: ContractorClothingBackpackDuffelMedical
+  equipment: ContractorClothingBackpackDuffelMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelMedicalFilled
+  id: ContractorClothingBackpackDuffelMedical
   equipment:
-    back: ClothingBackpackDuffelMedicalFilled
+    back: ClothingBackpackDuffelMedical
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelMedicalFilled
-  equipment: ContractorClothingBackpackSatchelMedicalFilled
+  id: ContractorClothingBackpackSatchelMedical
+  equipment: ContractorClothingBackpackSatchelMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelMedicalFilled
+  id: ContractorClothingBackpackSatchelMedical
   equipment:
-    back: ClothingBackpackSatchelMedicalFilled
+    back: ClothingBackpackSatchelMedical
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerMedicalFilled
-  equipment: ContractorClothingBackpackMessengerMedicalFilled
+  id: ContractorClothingBackpackMessengerMedical
+  equipment: ContractorClothingBackpackMessengerMedical
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerMedicalFilled
+  id: ContractorClothingBackpackMessengerMedical
   equipment:
-    back: ClothingBackpackMessengerMedicalFilled
+    back: ClothingBackpackMessengerMedical
 
 - type: loadout
-  id: ContractorClothingBackpackChemistryFilled
-  equipment: ContractorClothingBackpackChemistryFilled
+  id: ContractorClothingBackpackChemistry
+  equipment: ContractorClothingBackpackChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackChemistryFilled
+  id: ContractorClothingBackpackChemistry
   equipment:
-    back: ClothingBackpackChemistryFilled
+    back: ClothingBackpackChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelChemistryFilled
-  equipment: ContractorClothingBackpackDuffelChemistryFilled
+  id: ContractorClothingBackpackDuffelChemistry
+  equipment: ContractorClothingBackpackDuffelChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelChemistryFilled
+  id: ContractorClothingBackpackDuffelChemistry
   equipment:
-    back: ClothingBackpackDuffelChemistryFilled
+    back: ClothingBackpackDuffelChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelChemistryFilled
-  equipment: ContractorClothingBackpackSatchelChemistryFilled
+  id: ContractorClothingBackpackSatchelChemistry
+  equipment: ContractorClothingBackpackSatchelChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelChemistryFilled
+  id: ContractorClothingBackpackSatchelChemistry
   equipment:
-    back: ClothingBackpackSatchelChemistryFilled
+    back: ClothingBackpackSatchelChemistry
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerChemistryFilled
-  equipment: ContractorClothingBackpackMessengerChemistryFilled
+  id: ContractorClothingBackpackMessengerChemistry
+  equipment: ContractorClothingBackpackMessengerChemistry
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerChemistryFilled
+  id: ContractorClothingBackpackMessengerChemistry
   equipment:
-    back: ClothingBackpackMessengerChemistryFilled
+    back: ClothingBackpackMessengerChemistry
 
 - type: loadout
   id: ContractorClothingBackpackGenetics
@@ -508,210 +518,353 @@
     back: ClothingBackpackMessengerVirology
 
 - type: loadout
-  id: ContractorClothingBackpackEngineeringFilled
-  equipment: ContractorClothingBackpackEngineeringFilled
+  id: ContractorClothingBackpackEngineering
+  equipment: ContractorClothingBackpackEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackEngineeringFilled
+  id: ContractorClothingBackpackEngineering
   equipment:
-    back: ClothingBackpackEngineeringFilled
+    back: ClothingBackpackEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelEngineeringFilled
-  equipment: ContractorClothingBackpackDuffelEngineeringFilled
+  id: ContractorClothingBackpackDuffelEngineering
+  equipment: ContractorClothingBackpackDuffelEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelEngineeringFilled
+  id: ContractorClothingBackpackDuffelEngineering
   equipment:
-    back: ClothingBackpackDuffelEngineeringFilled
+    back: ClothingBackpackDuffelEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelEngineeringFilled
-  equipment: ContractorClothingBackpackSatchelEngineeringFilled
+  id: ContractorClothingBackpackSatchelEngineering
+  equipment: ContractorClothingBackpackSatchelEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelEngineeringFilled
+  id: ContractorClothingBackpackSatchelEngineering
   equipment:
-    back: ClothingBackpackSatchelEngineeringFilled
+    back: ClothingBackpackSatchelEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerEngineeringFilled
-  equipment: ContractorClothingBackpackMessengerEngineeringFilled
+  id: ContractorClothingBackpackMessengerEngineering
+  equipment: ContractorClothingBackpackMessengerEngineering
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerEngineeringFilled
+  id: ContractorClothingBackpackMessengerEngineering
   equipment:
-    back: ClothingBackpackMessengerEngineeringFilled
+    back: ClothingBackpackMessengerEngineering
 
 - type: loadout
-  id: ContractorClothingBackpackAtmosphericsFilled
-  equipment: ContractorClothingBackpackAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerChiefEngineer
+  equipment: ContractorClothingBackpackMessengerChiefEngineer
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerChiefEngineer
   equipment:
-    back: ClothingBackpackAtmosphericsFilled
+    back: ClothingBackpackMessengerChiefEngineer
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelAtmosphericsFilled
-  equipment: ContractorClothingBackpackDuffelAtmosphericsFilled
+  id: ContractorClothingBackpackAtmospherics
+  equipment: ContractorClothingBackpackAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackAtmospherics
+  equipment:
+    back: ClothingBackpackAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackDuffelAtmospherics
+  equipment: ContractorClothingBackpackDuffelAtmospherics
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 750
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelAtmosphericsFilled
+  id: ContractorClothingBackpackDuffelAtmospherics
+  equipment:
+    back: ClothingBackpackDuffelAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackSatchelAtmospherics
+  equipment: ContractorClothingBackpackSatchelAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackSatchelAtmospherics
+  equipment:
+    back: ClothingBackpackSatchelAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerAtmospherics
+  equipment: ContractorClothingBackpackMessengerAtmospherics
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerAtmospherics
+  equipment:
+    back: ClothingBackpackMessengerAtmospherics
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerChaplain
+  equipment: ContractorClothingBackpackMessengerChaplain
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerChaplain
+  equipment:
+    back: ClothingBackpackMessengerChaplain
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorBlack
+  equipment: ContractorClothingBackpackMessengerColorBlack
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorBlack
+  equipment:
+    back: ClothingBackpackMessengerColorBlack
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorWhite
+  equipment: ContractorClothingBackpackMessengerColorWhite
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorWhite
+  equipment:
+    back: ClothingBackpackMessengerColorWhite
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorBlue
+  equipment: ContractorClothingBackpackMessengerColorBlue
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorBlue
+  equipment:
+    back: ClothingBackpackMessengerColorBlue
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorGreen
+  equipment: ContractorClothingBackpackMessengerColorGreen
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorGreen
+  equipment:
+    back: ClothingBackpackMessengerColorGreen
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorOrange
+  equipment: ContractorClothingBackpackMessengerColorOrange
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorOrange
+  equipment:
+    back: ClothingBackpackMessengerColorOrange
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorRed
+  equipment: ContractorClothingBackpackMessengerColorRed
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorRed
+  equipment:
+    back: ClothingBackpackMessengerColorRed
+
+- type: loadout
+  id: ContractorClothingBackpackMessengerColorPurple
+  equipment: ContractorClothingBackpackMessengerColorPurple
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 500
+
+- type: startingGear
+  id: ContractorClothingBackpackMessengerColorPurple
   equipment:
-    back: ClothingBackpackDuffelAtmosphericsFilled
+    back: ClothingBackpackMessengerColorPurple
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelAtmosphericsFilled
-  equipment: ContractorClothingBackpackSatchelAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrownLight
+  equipment: ContractorClothingBackpackMessengerColorBrownLight
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrownLight
   equipment:
-    back: ClothingBackpackSatchelAtmosphericsFilled
+    back: ClothingBackpackMessengerColorBrownLight
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerAtmosphericsFilled
-  equipment: ContractorClothingBackpackMessengerAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrown
+  equipment: ContractorClothingBackpackMessengerColorBrown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
   price: 500
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerAtmosphericsFilled
+  id: ContractorClothingBackpackMessengerColorBrown
   equipment:
-    back: ClothingBackpackMessengerAtmosphericsFilled
+    back: ClothingBackpackMessengerColorBrown
 
 #T2
 - type: loadout
-  id: ContractorClothingBackpackClownFilled
-  equipment: ContractorClothingBackpackClownFilled
+  id: ContractorClothingBackpackClown
+  equipment: ContractorClothingBackpackClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackClownFilled
+  id: ContractorClothingBackpackClown
   equipment:
-    back: ClothingBackpackClownFilled
+    back: ClothingBackpackClown
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelClownFilled
-  equipment: ContractorClothingBackpackDuffelClownFilled
+  id: ContractorClothingBackpackDuffelClown
+  equipment: ContractorClothingBackpackDuffelClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 2000
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelClownFilled
+  id: ContractorClothingBackpackDuffelClown
   equipment:
-    back: ClothingBackpackDuffelClownFilled
+    back: ClothingBackpackDuffelClown
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelClownFilled
-  equipment: ContractorClothingBackpackSatchelClownFilled
+  id: ContractorClothingBackpackSatchelClown
+  equipment: ContractorClothingBackpackSatchelClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelClownFilled
+  id: ContractorClothingBackpackSatchelClown
   equipment:
-    back: ClothingBackpackSatchelClownFilled
+    back: ClothingBackpackSatchelClown
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerClownFilled
-  equipment: ContractorClothingBackpackMessengerClownFilled
+  id: ContractorClothingBackpackMessengerClown
+  equipment: ContractorClothingBackpackMessengerClown
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerClownFilled
+  id: ContractorClothingBackpackMessengerClown
   equipment:
-    back: ClothingBackpackMessengerClownFilled
+    back: ClothingBackpackMessengerClown
 
 - type: loadout
-  id: ContractorClothingBackpackMimeFilled
-  equipment: ContractorClothingBackpackMimeFilled
+  id: ContractorClothingBackpackMime
+  equipment: ContractorClothingBackpackMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMimeFilled
+  id: ContractorClothingBackpackMime
   equipment:
-    back: ClothingBackpackMimeFilled
+    back: ClothingBackpackMime
 
 - type: loadout
-  id: ContractorClothingBackpackDuffelMimeFilled
-  equipment: ContractorClothingBackpackDuffelMimeFilled
+  id: ContractorClothingBackpackDuffelMime
+  equipment: ContractorClothingBackpackDuffelMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 2000
 
 - type: startingGear
-  id: ContractorClothingBackpackDuffelMimeFilled
+  id: ContractorClothingBackpackDuffelMime
   equipment:
-    back: ClothingBackpackDuffelMimeFilled
+    back: ClothingBackpackDuffelMime
 
 - type: loadout
-  id: ContractorClothingBackpackSatchelMimeFilled
-  equipment: ContractorClothingBackpackSatchelMimeFilled
+  id: ContractorClothingBackpackSatchelMime
+  equipment: ContractorClothingBackpackSatchelMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackSatchelMimeFilled
+  id: ContractorClothingBackpackSatchelMime
   equipment:
-    back: ClothingBackpackSatchelMimeFilled
+    back: ClothingBackpackSatchelMime
 
 - type: loadout
-  id: ContractorClothingBackpackMessengerMimeFilled
-  equipment: ContractorClothingBackpackMessengerMimeFilled
+  id: ContractorClothingBackpackMessengerMime
+  equipment: ContractorClothingBackpackMessengerMime
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT2
   price: 1250
 
 - type: startingGear
-  id: ContractorClothingBackpackMessengerMimeFilled
+  id: ContractorClothingBackpackMessengerMime
   equipment:
-    back: ClothingBackpackMessengerMimeFilled
+    back: ClothingBackpackMessengerMime
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml
new file mode 100644
index 00000000000..e94dd8072fa
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/encryption_keys.yml
@@ -0,0 +1,50 @@
+#T0
+- type: loadout
+  id: ContractorEncryptionKeyTraffic
+  equipment: ContractorEncryptionKeyTraffic
+
+- type: startingGear
+  id: ContractorEncryptionKeyTraffic
+  storage:
+    back:
+    - EncryptionKeyTraffic
+
+- type: loadout
+  id: ContractorEncryptionKeyMedical
+  equipment: ContractorEncryptionKeyMedical
+
+- type: startingGear
+  id: ContractorEncryptionKeyMedical
+  storage:
+    back:
+    - EncryptionKeyMedical
+
+- type: loadout
+  id: ContractorEncryptionKeyCargo
+  equipment: ContractorEncryptionKeyCargo
+
+- type: startingGear
+  id: ContractorEncryptionKeyCargo
+  storage:
+    back:
+    - EncryptionKeyCargo
+
+- type: loadout
+  id: ContractorEncryptionKeyEngineering
+  equipment: ContractorEncryptionKeyEngineering
+
+- type: startingGear
+  id: ContractorEncryptionKeyEngineering
+  storage:
+    back:
+    - EncryptionKeyEngineering
+
+- type: loadout
+  id: ContractorEncryptionKeyScience
+  equipment: ContractorEncryptionKeyScience
+
+- type: startingGear
+  id: ContractorEncryptionKeyScience
+  storage:
+    back:
+    - EncryptionKeyScience
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
index 84bd27a2087..7a3c8215ae0 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/face.yml
@@ -1,3 +1,23 @@
+#T0
+- type: loadout
+  id: ContractorClothingMaskBreath
+  equipment: ContractorClothingMaskBreath
+
+- type: startingGear
+  id: ContractorClothingMaskBreath
+  equipment:
+    mask: ClothingMaskBreath
+
+- type: loadout
+  id: ContractorClothingMaskBreathMedical
+  equipment: ContractorClothingMaskBreathMedical
+  price: 200
+
+- type: startingGear
+  id: ContractorClothingMaskBreathMedical
+  equipment:
+    mask: ClothingMaskBreathMedical
+
 #T1
 - type: loadout
   id: ContractorClothingMaskSterile
@@ -5,7 +25,7 @@
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
-  price: 500
+  price: 200
 
 - type: startingGear
   id: ContractorClothingMaskSterile
@@ -18,7 +38,7 @@
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
-  price: 500
+  price: 300
 
 - type: startingGear
   id: ContractorClothingMaskGas
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
new file mode 100644
index 00000000000..f494bbf7962
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
@@ -0,0 +1,53 @@
+#T0
+- type: loadout
+  id: ContractorMedicalTrackingImplanter
+  equipment: ContractorMedicalTrackingImplanter
+
+- type: startingGear
+  id: ContractorMedicalTrackingImplanter
+  storage:
+    back:
+    - MedicalTrackingImplanter
+
+#T1
+- type: loadout
+  id: ContractorLightImplanter
+  equipment: ContractorLightImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorLightImplanter
+  storage:
+    back:
+    - LightImplanter
+
+- type: loadout
+  id: ContractorBikeHornImplanter
+  equipment: ContractorBikeHornImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBikeHornImplanter
+  storage:
+    back:
+    - BikeHornImplanter
+
+- type: loadout
+  id: ContractorSadTromboneImplanter
+  equipment: ContractorSadTromboneImplanter
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorSadTromboneImplanter
+  storage:
+    back:
+    - SadTromboneImplanter
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml
new file mode 100644
index 00000000000..44763471e00
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/survival.yml
@@ -0,0 +1,49 @@
+#T0
+- type: loadout
+  id: ContractorBoxSurvivalNFOxygen
+  equipment: ContractorBoxSurvivalNFOxygen
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFOxygen
+  storage:
+    back:
+    - BoxSurvivalNFOxygen
+
+- type: loadout
+  id: ContractorBoxSurvivalNFNitrogen
+  equipment: ContractorBoxSurvivalNFNitrogen
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFNitrogen
+  storage:
+    back:
+    - BoxSurvivalNFNitrogen
+
+#T1
+- type: loadout
+  id: ContractorBoxSurvivalNFOxygenExtended
+  equipment: ContractorBoxSurvivalNFOxygenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFOxygenExtended
+  storage:
+    back:
+    - BoxSurvivalNFOxygenExtended
+
+- type: loadout
+  id: ContractorBoxSurvivalNFNitrogenExtended
+  equipment: ContractorBoxSurvivalNFNitrogenExtended
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 1000
+
+- type: startingGear
+  id: ContractorBoxSurvivalNFNitrogenExtended
+  storage:
+    back:
+    - BoxSurvivalNFNitrogenExtended
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
index d741451f905..cbaa75a3fe7 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/bags.yml
@@ -1,39 +1,39 @@
 - type: loadout
-  id: MercenaryClothingBackpackMercenaryFilled
-  equipment: MercenaryClothingBackpackMercenaryFilled
+  id: MercenaryClothingBackpackMercenary
+  equipment: MercenaryClothingBackpackMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackMercenaryFilled
+  id: MercenaryClothingBackpackMercenary
   equipment:
-    back: ClothingBackpackMercenaryFilled
+    back: ClothingBackpackMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackDuffelMercenaryFilled
-  equipment: MercenaryClothingBackpackDuffelMercenaryFilled
+  id: MercenaryClothingBackpackDuffelMercenary
+  equipment: MercenaryClothingBackpackDuffelMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackDuffelMercenaryFilled
+  id: MercenaryClothingBackpackDuffelMercenary
   equipment:
-    back: ClothingBackpackDuffelMercenaryFilled
+    back: ClothingBackpackDuffelMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackSatchelMercenaryFilled
-  equipment: MercenaryClothingBackpackSatchelMercenaryFilled
+  id: MercenaryClothingBackpackSatchelMercenary
+  equipment: MercenaryClothingBackpackSatchelMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackSatchelMercenaryFilled
+  id: MercenaryClothingBackpackSatchelMercenary
   equipment:
-    back: ClothingBackpackSatchelMercenaryFilled
+    back: ClothingBackpackSatchelMercenary
 
 - type: loadout
-  id: MercenaryClothingBackpackMessengerMercenaryFilled
-  equipment: MercenaryClothingBackpackMessengerMercenaryFilled
+  id: MercenaryClothingBackpackMessengerMercenary
+  equipment: MercenaryClothingBackpackMessengerMercenary
   price: 0
 
 - type: startingGear
-  id: MercenaryClothingBackpackMessengerMercenaryFilled
+  id: MercenaryClothingBackpackMessengerMercenary
   equipment:
-    back: ClothingBackpackMessengerMercenaryFilled
+    back: ClothingBackpackMessengerMercenary
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
index c09494cad8d..639a3127a5f 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/face.yml
@@ -15,3 +15,12 @@
   id: BrigmedicClothingMaskBrigmedic
   equipment:
     mask: ClothingMaskBreathMedicalSecurity
+
+- type: loadout
+  id: NfsdClothingMaskGasNfsd
+  equipment: NfsdClothingMaskGasNfsd
+
+- type: startingGear
+  id: NfsdClothingMaskGasNfsd
+  equipment:
+    mask: ClothingMaskGasNfsd
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml
new file mode 100644
index 00000000000..a5904ba5af8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Nfsd/survival.yml
@@ -0,0 +1,20 @@
+#T1
+- type: loadout
+  id: NfsdBoxSurvivalNfsdOxygen
+  equipment: NfsdBoxSurvivalNfsdOxygen
+
+- type: startingGear
+  id: NfsdBoxSurvivalNfsdOxygen
+  storage:
+    back:
+    - BoxSurvivalNFOxygenExtended
+
+- type: loadout
+  id: NfsdBoxSurvivalNfsdNitrogen
+  equipment: NfsdBoxSurvivalNfsdNitrogen
+
+- type: startingGear
+  id: NfsdBoxSurvivalNfsdNitrogen
+  storage:
+    back:
+    - BoxSurvivalNFNitrogenExtended
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
index 263c2023b8a..5151fa07c0b 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pilot/bags.yml
@@ -1,39 +1,39 @@
 - type: loadout
-  id: PilotClothingBackpackPilotFilled
-  equipment: PilotClothingBackpackPilotFilled
+  id: PilotClothingBackpackPilot
+  equipment: PilotClothingBackpackPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackPilotFilled
+  id: PilotClothingBackpackPilot
   equipment:
-    back: ClothingBackpackPilotFilled
+    back: ClothingBackpackPilot
 
 - type: loadout
-  id: PilotClothingBackpackDuffelPilotFilled
-  equipment: PilotClothingBackpackDuffelPilotFilled
+  id: PilotClothingBackpackDuffelPilot
+  equipment: PilotClothingBackpackDuffelPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackDuffelPilotFilled
+  id: PilotClothingBackpackDuffelPilot
   equipment:
-    back: ClothingBackpackDuffelPilotFilled
+    back: ClothingBackpackDuffelPilot
 
 - type: loadout
-  id: PilotClothingBackpackSatchelPilotFilled
-  equipment: PilotClothingBackpackSatchelPilotFilled
+  id: PilotClothingBackpackSatchelPilot
+  equipment: PilotClothingBackpackSatchelPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackSatchelPilotFilled
+  id: PilotClothingBackpackSatchelPilot
   equipment:
-    back: ClothingBackpackSatchelPilotFilled
+    back: ClothingBackpackSatchelPilot
 
 - type: loadout
-  id: PilotClothingBackpackMessengerPilotFilled
-  equipment: PilotClothingBackpackMessengerPilotFilled
+  id: PilotClothingBackpackMessengerPilot
+  equipment: PilotClothingBackpackMessengerPilot
   price: 0
 
 - type: startingGear
-  id: PilotClothingBackpackMessengerPilotFilled
+  id: PilotClothingBackpackMessengerPilot
   equipment:
-    back: ClothingBackpackMessengerPilotFilled
+    back: ClothingBackpackMessengerPilot
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml
new file mode 100644
index 00000000000..3f8e6b84bb2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/jumpsuit.yml
@@ -0,0 +1,19 @@
+- type: loadout
+  id: PirateJumpsuit
+  equipment: PirateJumpsuit
+  price: 0
+
+- type: startingGear
+  id: PirateJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPirate
+
+- type: loadout
+  id: PirateJumpskirt
+  equipment: PirateJumpskirt
+  price: 0
+
+- type: startingGear
+  id: PirateJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtColorLightBrown
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml
new file mode 100644
index 00000000000..4bac1cf9719
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Pirates/pda.yml
@@ -0,0 +1,9 @@
+- type: loadout
+  id: PiratePiratePDA
+  equipment: PiratePiratePDA
+  price: 0
+
+- type: startingGear
+  id: PiratePiratePDA
+  equipment:
+    id: PiratePDA
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml
new file mode 100644
index 00000000000..51053e9cdbc
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/jumpsuit.yml
@@ -0,0 +1,19 @@
+- type: loadout
+  id: PrisonerJumpsuit
+  equipment: PrisonerJumpsuit
+  price: 0
+
+- type: startingGear
+  id: PrisonerJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPrisoner
+
+- type: loadout
+  id: PrisonerJumpskirt
+  equipment: PrisonerJumpskirt
+  price: 0
+
+- type: startingGear
+  id: PrisonerJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtPrisoner
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml
new file mode 100644
index 00000000000..4dac52d1a5f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Prisoner/pda.yml
@@ -0,0 +1,9 @@
+- type: loadout
+  id: PrisonerPrisonerPDA
+  equipment: PrisonerPrisonerPDA
+  price: 0
+
+- type: startingGear
+  id: PrisonerPrisonerPDA
+  equipment:
+    id: PrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
new file mode 100644
index 00000000000..1aca7fe60f3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/bags.yml
@@ -0,0 +1,26 @@
+- type: loadout
+  id: SecurityGuardBackpack
+  equipment: SecurityGuardBackpack
+
+- type: startingGear
+  id: SecurityGuardBackpack
+  equipment:
+    back: ClothingBackpackSecurityFilled
+
+- type: loadout
+  id: SecurityGuardSatchel
+  equipment: SecurityGuardSatchel
+
+- type: startingGear
+  id: SecurityGuardSatchel
+  equipment:
+    back: ClothingBackpackSatchelSecurityFilled
+
+- type: loadout
+  id: SecurityGuardDuffel
+  equipment: SecurityGuardDuffel
+
+- type: startingGear
+  id: SecurityGuardDuffel
+  equipment:
+    back: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml
new file mode 100644
index 00000000000..e96a224239b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/SecurityGuard/face.yml
@@ -0,0 +1,8 @@
+- type: loadout
+  id: SecurityClothingMaskGasSecurity
+  equipment: SecurityClothingMaskGasSecurity
+
+- type: startingGear
+  id: SecurityClothingMaskGasSecurity
+  equipment:
+    mask: ClothingMaskGasSecurity
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
index f6cbdb42101..f9e540f439b 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/StationRep/bags.yml
@@ -29,14 +29,14 @@
     back: ClothingBackpackSatchelSrFilled
 
 - type: loadout
-  id: StationRepClothingBackpackMessengerSrFilled
-  equipment: StationRepClothingBackpackMessengerSrFilled
+  id: StationRepClothingBackpackMessengerSr
+  equipment: StationRepClothingBackpackMessengerSr
   price: 0
 
 - type: startingGear
-  id: StationRepClothingBackpackMessengerSrFilled
+  id: StationRepClothingBackpackMessengerSr
   equipment:
-    back: ClothingBackpackMessengerSrFilled
+    back: ClothingBackpackMessengerSr
 
 - type: loadout
   id: StationRepClothingBackpackIanFilled
diff --git a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
index a4671d1e5cb..77d9553b60e 100644
--- a/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/brigmedic_loadout_groups.yml
@@ -68,6 +68,7 @@
 
 - type: loadoutGroup
   id: BrigmedicBelt
+  minLimit: 1
   name: loadout-group-contractor-belt
   loadouts:
   - BrigmedicClothingBeltBrigmedicWebbing
diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
index eef99fcb59a..fca0980fb46 100644
--- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -128,38 +128,38 @@
   id: ContractorBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -168,22 +168,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: ContractorOuterClothing
@@ -600,6 +611,8 @@
   name: loadout-group-contractor-face
   minLimit: 0
   loadouts:
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
@@ -652,4 +665,37 @@
   - ClothingNeckPansexualPin
   - ClothingNeckTransPin
   - ClothingNeckAutismPin
-  - ClothingNeckGoldAutismPin
\ No newline at end of file
+  - ClothingNeckGoldAutismPin
+
+- type: loadoutGroup
+  id: ContractorBoxSurvival
+  name: loadout-group-contractor-survival-box
+  minLimit: 1
+  loadouts:
+  - ContractorBoxSurvivalNFOxygen
+  - ContractorBoxSurvivalNFNitrogen
+  - ContractorBoxSurvivalNFOxygenExtended
+  - ContractorBoxSurvivalNFNitrogenExtended
+
+- type: loadoutGroup
+  id: ContractorEncryptionKey
+  name: loadout-group-contractor-encryption-key
+  minLimit: 1
+  maxLimit: 3
+  loadouts:
+  - ContractorEncryptionKeyTraffic
+  - ContractorEncryptionKeyMedical
+  - ContractorEncryptionKeyCargo
+  - ContractorEncryptionKeyEngineering
+  - ContractorEncryptionKeyScience
+
+- type: loadoutGroup
+  id: ContractorImplanter
+  name: loadout-group-contractor-implanter
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - ContractorMedicalTrackingImplanter
+  - ContractorLightImplanter
+  - ContractorBikeHornImplanter
+  - ContractorSadTromboneImplanter
diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
index 00c0590f93d..5ae5dbd5334 100644
--- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -132,46 +132,46 @@
   id: MercenaryBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - MercenaryClothingBackpackMercenaryFilled
-  - MercenaryClothingBackpackDuffelMercenaryFilled
-  - MercenaryClothingBackpackSatchelMercenaryFilled
-  - MercenaryClothingBackpackMessengerMercenaryFilled
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - PilotClothingBackpackPilotFilled
-  - PilotClothingBackpackDuffelPilotFilled
-  - PilotClothingBackpackSatchelPilotFilled
-  - PilotClothingBackpackMessengerPilotFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - MercenaryClothingBackpackMercenary
+  - MercenaryClothingBackpackDuffelMercenary
+  - MercenaryClothingBackpackSatchelMercenary
+  - MercenaryClothingBackpackMessengerMercenary
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - PilotClothingBackpackPilot
+  - PilotClothingBackpackDuffelPilot
+  - PilotClothingBackpackSatchelPilot
+  - PilotClothingBackpackMessengerPilot
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -180,22 +180,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: MercenaryOuterClothing
@@ -504,6 +515,8 @@
   minLimit: 0
   loadouts:
   - MercenaryClothingMaskGasMercenary
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
diff --git a/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
index e18f459d755..86479a65b7d 100644
--- a/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
@@ -1,6 +1,22 @@
 - type: loadoutGroup
   id: NfsdBelt
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-belt
+  minLimit: 1
   loadouts:
   - NfsdWebbing
   - NfsdBelt
+
+- type: loadoutGroup
+  id: NfsdBoxSurvival
+  name: loadout-group-contractor-survival-box
+  minLimit: 1
+  loadouts:
+  - NfsdBoxSurvivalNfsdOxygen
+  - NfsdBoxSurvivalNfsdNitrogen
+
+- type: loadoutGroup
+  id: NfsdFace
+  name: loadout-group-contractor-face
+  minLimit: 0
+  loadouts:
+  - NfsdClothingMaskGasNfsd
diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
index b7051fbf923..e2996f77db3 100644
--- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
@@ -130,42 +130,42 @@
   id: PilotBackpack
   name: loadout-group-contractor-backpack
   loadouts:
-  - PilotClothingBackpackPilotFilled
-  - PilotClothingBackpackDuffelPilotFilled
-  - PilotClothingBackpackSatchelPilotFilled
-  - PilotClothingBackpackMessengerPilotFilled
-  - ContractorClothingBackpackFilled
-  - ContractorClothingBackpackDuffelFilled
-  - ContractorClothingBackpackSatchelFilled
-  - ContractorClothingBackpackMessengerFilled
-  - ContractorClothingBackpackCaptainFilled
-  - ContractorClothingBackpackDuffelCaptainFilled
-  - ContractorClothingBackpackSatchelCaptainFilled
-  - ContractorClothingBackpackMessengerCaptainFilled
-  - ContractorClothingBackpackSalvageFilled
-  - ContractorClothingBackpackDuffelSalvageFilled
-  - ContractorClothingBackpackSatchelSalvageFilled
-  - ContractorClothingBackpackMessengerSalvageFilled
-  - ContractorClothingBackpackCargoFilled
-  - ContractorClothingBackpackDuffelCargoFilled
-  - ContractorClothingBackpackSatchelCargoFilled
-  - ContractorClothingBackpackMessengerCargoFilled
-  - ContractorClothingBackpackHydroponicsFilled
-  - ContractorClothingBackpackDuffelHydroponicsFilled
-  - ContractorClothingBackpackSatchelHydroponicsFilled
-  - ContractorClothingBackpackMessengerHydroponicsFilled
-  - ContractorClothingBackpackScienceFilled
-  - ContractorClothingBackpackDuffelScienceFilled
-  - ContractorClothingBackpackSatchelScienceFilled
-  - ContractorClothingBackpackMessengerScienceFilled
-  - ContractorClothingBackpackMedicalFilled
-  - ContractorClothingBackpackDuffelMedicalFilled
-  - ContractorClothingBackpackSatchelMedicalFilled
-  - ContractorClothingBackpackMessengerMedicalFilled
-  - ContractorClothingBackpackChemistryFilled
-  - ContractorClothingBackpackDuffelChemistryFilled
-  - ContractorClothingBackpackSatchelChemistryFilled
-  - ContractorClothingBackpackMessengerChemistryFilled
+  - PilotClothingBackpackPilot
+  - PilotClothingBackpackDuffelPilot
+  - PilotClothingBackpackSatchelPilot
+  - PilotClothingBackpackMessengerPilot
+  - ContractorClothingBackpack
+  - ContractorClothingBackpackDuffel
+  - ContractorClothingBackpackSatchel
+  - ContractorClothingBackpackMessenger
+  - ContractorClothingBackpackCaptain
+  - ContractorClothingBackpackDuffelCaptain
+  - ContractorClothingBackpackSatchelCaptain
+  - ContractorClothingBackpackMessengerCaptain
+  - ContractorClothingBackpackSalvage
+  - ContractorClothingBackpackDuffelSalvage
+  - ContractorClothingBackpackSatchelSalvage
+  - ContractorClothingBackpackMessengerSalvage
+  - ContractorClothingBackpackCargo
+  - ContractorClothingBackpackDuffelCargo
+  - ContractorClothingBackpackSatchelCargo
+  - ContractorClothingBackpackMessengerCargo
+  - ContractorClothingBackpackHydroponics
+  - ContractorClothingBackpackDuffelHydroponics
+  - ContractorClothingBackpackSatchelHydroponics
+  - ContractorClothingBackpackMessengerHydroponics
+  - ContractorClothingBackpackScience
+  - ContractorClothingBackpackDuffelScience
+  - ContractorClothingBackpackSatchelScience
+  - ContractorClothingBackpackMessengerScience
+  - ContractorClothingBackpackMedical
+  - ContractorClothingBackpackDuffelMedical
+  - ContractorClothingBackpackSatchelMedical
+  - ContractorClothingBackpackMessengerMedical
+  - ContractorClothingBackpackChemistry
+  - ContractorClothingBackpackDuffelChemistry
+  - ContractorClothingBackpackSatchelChemistry
+  - ContractorClothingBackpackMessengerChemistry
   - ContractorClothingBackpackGenetics
   - ContractorClothingBackpackDuffelGenetics
   - ContractorClothingBackpackSatchelGenetics
@@ -174,22 +174,33 @@
   - ContractorClothingBackpackDuffelVirology
   - ContractorClothingBackpackSatchelVirology
   - ContractorClothingBackpackMessengerVirology
-  - ContractorClothingBackpackEngineeringFilled
-  - ContractorClothingBackpackDuffelEngineeringFilled
-  - ContractorClothingBackpackSatchelEngineeringFilled
-  - ContractorClothingBackpackMessengerEngineeringFilled
-  - ContractorClothingBackpackAtmosphericsFilled
-  - ContractorClothingBackpackDuffelAtmosphericsFilled
-  - ContractorClothingBackpackSatchelAtmosphericsFilled
-  - ContractorClothingBackpackMessengerAtmosphericsFilled
-  - ContractorClothingBackpackClownFilled
-  - ContractorClothingBackpackDuffelClownFilled
-  - ContractorClothingBackpackSatchelClownFilled
-  - ContractorClothingBackpackMessengerClownFilled
-  - ContractorClothingBackpackMimeFilled
-  - ContractorClothingBackpackDuffelMimeFilled
-  - ContractorClothingBackpackSatchelMimeFilled
-  - ContractorClothingBackpackMessengerMimeFilled
+  - ContractorClothingBackpackEngineering
+  - ContractorClothingBackpackDuffelEngineering
+  - ContractorClothingBackpackSatchelEngineering
+  - ContractorClothingBackpackMessengerEngineering
+  - ContractorClothingBackpackMessengerChiefEngineer
+  - ContractorClothingBackpackAtmospherics
+  - ContractorClothingBackpackDuffelAtmospherics
+  - ContractorClothingBackpackSatchelAtmospherics
+  - ContractorClothingBackpackMessengerAtmospherics
+  - ContractorClothingBackpackMessengerChaplain
+  - ContractorClothingBackpackMessengerColorBlack
+  - ContractorClothingBackpackMessengerColorWhite
+  - ContractorClothingBackpackMessengerColorBlue
+  - ContractorClothingBackpackMessengerColorGreen
+  - ContractorClothingBackpackMessengerColorOrange
+  - ContractorClothingBackpackMessengerColorRed
+  - ContractorClothingBackpackMessengerColorPurple
+  - ContractorClothingBackpackMessengerColorBrownLight
+  - ContractorClothingBackpackMessengerColorBrown
+  - ContractorClothingBackpackClown
+  - ContractorClothingBackpackDuffelClown
+  - ContractorClothingBackpackSatchelClown
+  - ContractorClothingBackpackMessengerClown
+  - ContractorClothingBackpackMime
+  - ContractorClothingBackpackDuffelMime
+  - ContractorClothingBackpackSatchelMime
+  - ContractorClothingBackpackMessengerMime
   
 - type: loadoutGroup
   id: PilotOuterClothing
@@ -538,6 +549,8 @@
   minLimit: 0
   loadouts:
   - PilotClothingMaskPilot
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
   - ContractorClothingMaskSterile
   - ContractorClothingMaskGas
   - ContractorClothingMaskGasExplorer
diff --git a/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
new file mode 100644
index 00000000000..bbe9e1ab2c3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/pirates_loadout_groups.yml
@@ -0,0 +1,21 @@
+- type: loadoutGroup
+  id: PirateJumpsuit
+  name: loadout-group-contractor-jumpsuit
+  loadouts:
+  - PirateJumpsuit
+  - PirateJumpskirt
+
+- type: loadoutGroup
+  id: PiratePDA
+  name: loadout-group-contractor-id
+  loadouts:
+  - PiratePiratePDA
+
+- type: loadoutGroup
+  id: PirateFace
+  name: loadout-group-contractor-face
+  minLimit: 0
+  loadouts:
+  - ContractorClothingMaskBreath
+  - ContractorClothingMaskBreathMedical
+  - ContractorClothingMaskGas
diff --git a/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml
new file mode 100644
index 00000000000..865a660cca3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Loadouts/prisoner_loadout_groups.yml
@@ -0,0 +1,12 @@
+- type: loadoutGroup
+  id: PrisonerJumpsuit
+  name: loadout-group-contractor-jumpsuit
+  loadouts:
+  - PrisonerJumpsuit
+  - PrisonerJumpskirt
+
+- type: loadoutGroup
+  id: PrisonerPDA
+  name: loadout-group-contractor-id
+  loadouts:
+  - PrisonerPrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
index f5c8fa08111..bd3dd1f8689 100644
--- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml
@@ -3,17 +3,20 @@
 - type: roleLoadout
   id: JobContractor
   groups:
+  - ContractorHead
+  - ContractorNeck
   - ContractorJumpsuit
-  - ContractorPDA
+  - ContractorGloves
   - ContractorBackpack
-  - ContractorShoes
   - ContractorOuterClothing
-  - ContractorHead
-  - ContractorBelt
+  - ContractorShoes
   - ContractorFace
-  - ContractorNeck
-  - ContractorGloves
   - ContractorGlasses
+  - ContractorPDA
+  - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -23,17 +26,20 @@
 - type: roleLoadout
   id: JobMercenary
   groups:
+  - MercenaryHead
+  - ContractorNeck
   - MercenaryJumpsuit
-  - MercenaryPDA
+  - MercenaryGloves
   - MercenaryBackpack
-  - MercenaryBelt
-  - MercenaryHead
-  - MercenaryFace
   - MercenaryOuterClothing
-  - MercenaryGlasses
   - MercenaryShoes
-  - ContractorNeck
-  - MercenaryGloves
+  - MercenaryFace
+  - MercenaryGlasses
+  - MercenaryPDA
+  - MercenaryBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -43,17 +49,20 @@
 - type: roleLoadout
   id: JobPilot
   groups:
+  - PilotHead
+  - PilotNeck
   - PilotJumpsuit
-  - PilotPDA
+  - PilotGloves
   - PilotBackpack
-  - PilotBelt
-  - PilotShoes
   - PilotOuterClothing
+  - PilotShoes
   - PilotFace
-  - PilotHead
-  - PilotGloves
-  - PilotNeck
   - PilotGlasses
+  - PilotPDA
+  - PilotBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorUtility
   - ContractorFun
   - ContractorTrinkets
@@ -63,57 +72,67 @@
 - type: roleLoadout
   id: JobValet
   groups:
+  - ContractorNeck
   - ValetJumpsuit
   - ContractorBackpack
   - ContractorShoes
   - ContractorFace
-  - ContractorNeck
   - ContractorGlasses
   - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobMailCarrier
   groups:
+  - ContractorNeck
   - MailCarrierJumpsuit
+  - ContractorGloves
   - ContractorBackpack
   - MailCarrierOuterClothing
   - ContractorShoes
-  - ContractorGloves
   - ContractorFace
-  - ContractorNeck
+  - ContractorBoxSurvival
+  - ContractorEncryptionKey
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobStationTrafficController
   groups:
+  - ContractorNeck
   - StcJumpsuit
-  - ContractorBackpack
   - ContractorGloves
-  - ContractorShoes
+  - ContractorBackpack
   - ContractorOuterClothing
+  - ContractorShoes
   - ContractorFace
-  - ContractorNeck
   - ContractorGlasses
   - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
 - type: roleLoadout
   id: JobStationRepresentative
   groups:
-  - StationRepJumpsuit
-  - StationRepBackpack
-  - StationRepOuterClothing
   - StationRepHead
   - StationRepNeck
+  - StationRepJumpsuit
   - StationRepGloves
+  - StationRepBackpack
+  - StationRepOuterClothing
   - ContractorShoes
-  - ContractorBelt
   - ContractorFace
   - ContractorGlasses
+  - ContractorBelt
+  - ContractorBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
 
@@ -122,13 +141,17 @@
   id: JobSecurityGuard
   groups:
   - SecurityGuardHead
-  - SecurityGuardPDA
   - SecurityGuardJumpsuit
   - SecurityGuardGloves
-  - SecurityBackpack
+  - SecurityGuardBackpack
   - SecurityGuardOuterClothing
   - SecurityGuardShoes
+  - SecurityGuardFace
+  - SecurityGuardPDA
   - SecurityGuardBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -137,14 +160,18 @@
   id: JobCadet
   groups:
   - CadetHead
-  - CadetPDA
   - CadetJumpsuit
+  - CadetGloves
   - CadetBackpack
   - CadetOuterClothing
   - CadetShoes
-  - CadetGloves
+  - NfsdFace
   - CadetGlasses
+  - CadetPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -152,14 +179,18 @@
   id: JobDeputy
   groups:
   - DeputyHead
-  - DeputyPDA
   - DeputyJumpsuit
+  - DeputyGloves
   - DeputyBackpack
   - DeputyOuterClothing
   - DeputyShoes
-  - DeputyGloves
+  - NfsdFace
   - DeputyGlasses
+  - DeputyPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
   
@@ -168,15 +199,18 @@
   groups:
   - BrigmedicHead
   - BrigmedicNeck
-  - BrigmedicPDA
   - BrigmedicJumpsuit
+  - BrigmedicGloves
   - BrigmedicBackpack
   - BrigmedicOuterClothing
   - BrigmedicShoes
   - BrigmedicFace
-  - BrigmedicGloves
   - BrigmedicGlasses
+  - BrigmedicPDA
   - BrigmedicBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -184,14 +218,18 @@
   id: JobDetectiveNF
   groups:
   - DetectiveNFHead
-  - DetectiveNFPDA
   - DetectiveNFJumpsuit
+  - DetectiveNFGloves
   - DetectiveNFBackpack
   - DetectiveNFOuterClothing
   - DetectiveNFShoes
-  - DetectiveNFGloves
+  - NfsdFace
   - DetectiveNFGlasses
+  - DetectiveNFPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -213,14 +251,18 @@
   id: JobBailiff
   groups:
   - BailiffHead
-  - BailiffPDA
   - BailiffJumpsuit
+  - BailiffGloves
   - BailiffBackpack
   - BailiffOuterClothing
   - BailiffShoes
-  - BailiffGloves
+  - NfsdFace
   - BailiffGlasses
+  - BailiffPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -228,14 +270,18 @@
   id: JobSeniorOfficer
   groups:
   - SeniorOfficerHead
-  - SeniorOfficerPDA
   - SeniorOfficerJumpsuit
+  - SeniorOfficerGloves
   - SeniorOfficerBackpack
   - SeniorOfficerOuterClothing
   - SeniorOfficerShoes
-  - SeniorOfficerGloves
+  - NfsdFace
   - SeniorOfficerGlasses
+  - SeniorOfficerPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
+  - ContractorEncryptionKey
   - ContractorFun
   - ContractorTrinkets
 
@@ -244,14 +290,71 @@
   groups:
   - SheriffHead
   - SheriffNeck
-  - SheriffPDA
   - SheriffJumpsuit
+  - SheriffGloves
   - SheriffBackpack
   - SheriffOuterClothing
   - SheriffShoes
   - SheriffFace
-  - SheriffGloves
   - SheriffGlasses
+  - SheriffPDA
   - NfsdBelt
+  - NfsdBoxSurvival
+  - ContractorImplanter
   - ContractorFun
   - ContractorTrinkets
+
+# Pirate
+
+- type: roleLoadout
+  id: JobPirate
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+- type: roleLoadout
+  id: JobPirateFirstMate
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+- type: roleLoadout
+  id: JobPirateCaptain
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PirateJumpsuit
+#  - PirateGloves
+  - ContractorBackpack
+#  - PirateOuterClothing
+#  - PirateShoes
+  - PirateFace
+  - PiratePDA
+  - ContractorBoxSurvival
+
+# Prisoner
+
+- type: roleLoadout
+  id: JobPrisoner
+  groups:
+#  - PirateHead
+#  - PirateNeck
+  - PrisonerJumpsuit
+#  - PrisonerShoes
+  - PrisonerPDA
diff --git a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
index a4ff0d4bb15..97b7a52b7fb 100644
--- a/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/security_guard_groups.yml
@@ -1,6 +1,6 @@
 - type: loadoutGroup
   id: SecurityGuardGloves
-  name: loadout-group-security-guard-gloves
+  name: loadout-group-contractor-gloves
   loadouts:
   - CombatGloves
   - ColorBlackGloves
@@ -8,7 +8,7 @@
 
 - type: loadoutGroup
   id: SecurityGuardHead
-  name: loadout-group-security-guard-head
+  name: loadout-group-contractor-head
   minLimit: 0
   loadouts:
   - SecurityBeret
@@ -16,21 +16,29 @@
 
 - type: loadoutGroup
   id: SecurityGuardJumpsuit
-  name: loadout-group-security-guard-jumpsuit
+  name: loadout-group-contractor-jumpsuit
   loadouts:
   - SecurityGuardJumpsuit
   - SecurityGuardJumpskirt
 
+- type: loadoutGroup
+  id: SecurityGuardBackpack
+  name: loadout-group-contractor-backpack
+  loadouts:
+  - SecurityGuardBackpack
+  - SecurityGuardSatchel
+  - SecurityGuardDuffel
+
 - type: loadoutGroup
   id: SecurityGuardOuterClothing
-  name: loadout-group-security-guard-outerclothing
+  name: loadout-group-contractor-outerclothing
   loadouts:
   - ArmorVest
   - ArmorVestSlim
 
 - type: loadoutGroup
   id: SecurityGuardShoes
-  name: loadout-group-security-guard-shoes
+  name: loadout-group-contractor-shoes
   loadouts:
   - LeatherShoes
   - CombatBoots
@@ -38,13 +46,20 @@
 
 - type: loadoutGroup
   id: SecurityGuardBelt
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-belt
   loadouts:
   - SecurityBelt
   - SecurityWebbing
 
 - type: loadoutGroup
   id: SecurityGuardPDA
-  name: loadout-group-security-belt
+  name: loadout-group-contractor-id
+  loadouts:
+  - SecurityGuardSecurityGuardPDA
+
+- type: loadoutGroup
+  id: SecurityGuardFace
+  name: loadout-group-contractor-face
+  minLimit: 0
   loadouts:
-  - SecurityGuardSecurityGuardPDA
\ No newline at end of file
+  - SecurityClothingMaskGasSecurity
diff --git a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
index afd8458b317..48b3f2cdc51 100644
--- a/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/stationrep_loadout_groups.yml
@@ -12,7 +12,7 @@
   - StationRepClothingBackpackSrFilled
   - StationRepClothingBackpackDuffelSrFilled
   - StationRepClothingBackpackSatchelSrFilled
-  - StationRepClothingBackpackMessengerSrFilled
+  - StationRepClothingBackpackMessengerSr
   - StationRepClothingBackpackIanFilled #We put the ian bag here so its not default, we also let SR pick a bag out of drip concerns.
   
 - type: loadoutGroup
diff --git a/Resources/Prototypes/_NF/Maps/POI/lodge.yml b/Resources/Prototypes/_NF/Maps/POI/lodge.yml
index 8cb217bcda0..cf2ec3b234b 100644
--- a/Resources/Prototypes/_NF/Maps/POI/lodge.yml
+++ b/Resources/Prototypes/_NF/Maps/POI/lodge.yml
@@ -8,7 +8,7 @@
       stationProto: StandardFrontierOutpost
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Expiditionary Lodge'
+          mapNameTemplate: 'Expeditionary Lodge'
         - type: StationJobs
           overflowJobs:
           - Pilot
diff --git a/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml b/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml
new file mode 100644
index 00000000000..bb31b5d0486
--- /dev/null
+++ b/Resources/Prototypes/_NF/Objects/Devices/admin_hand_teleporter.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: HandTeleporterAdmin
+  parent: HandTeleporter
+  suffix: Admeme
+  description: "An upgraded Teleporter that can ignore some restrictions the original had, but is strongly restricted to experienced CC users."
+  components:
+  - type: HandTeleporter
+    firstPortalPrototype: "PortalAdminStart"
+    secondPortalPrototype: "PortalAdminEnd"
diff --git a/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
new file mode 100644
index 00000000000..8320212f396
--- /dev/null
+++ b/Resources/Prototypes/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/heavy_rifle.yml
@@ -0,0 +1,133 @@
+- type: entity
+  id: BaseSpeedLoaderHeavyRifle
+  name: "speed loader (.20 rifle)"
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+      - SpeedLoaderRifleHeavy
+  - type: SpeedLoader
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - CartridgeRifle
+    capacity: 8
+  - type: Sprite
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
+        ents: []
+
+- type: entity
+  id: SpeedLoaderRifleHeavy
+  name: "speed loader (.20 rifle)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifle
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: base
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyEmpty
+  name: "speed loader (.20 rifle any)"
+  parent: SpeedLoaderRifleHeavy
+  components:
+  - type: BallisticAmmoProvider
+    proto: null
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+
+- type: entity
+  id: SpeedLoaderRifleHeavyIncendiary
+  name: "speed loader (.20 rifle incendiary)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleIncendiary
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: base-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: base
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyPractice
+  name: "speed loader (.20 rifle practice)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRiflePractice
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: practice-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: practice
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyUranium
+  name: "speed loader (.20 rifle uranium)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleUranium
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: uranium-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: uranium
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  id: SpeedLoaderRifleHeavyRubber
+  name: "speed loader (.20 rifle rubber)"
+  parent: BaseSpeedLoaderHeavyRifle
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgeRifleRubber
+  - type: Sprite
+    sprite: _NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi
+    layers:
+      - state: base
+        map: [ "enum.GunVisualLayers.Base" ]
+      - state: rubber-8
+        map: [ "enum.GunVisualLayers.Mag" ]
+  - type: MagazineVisuals
+    magState: rubber
+    steps: 9
+    zeroVisible: false
+  - type: Appearance
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
new file mode 100644
index 00000000000..b521e8e0c60
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml
@@ -0,0 +1,42 @@
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyEmpty
+  result: SpeedLoaderRifleHeavyEmpty
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavy
+  result: SpeedLoaderRifleHeavy
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 190
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyPractice
+  result: SpeedLoaderRifleHeavyPractice
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 90
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyUranium
+  result: SpeedLoaderRifleHeavyUranium
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
+    Uranium: 110
+
+- type: latheRecipe
+  id: SpeedLoaderRifleHeavyIncendiary
+  result: SpeedLoaderRifleHeavyIncendiary
+  category: Ammo
+  completetime: 5
+  materials:
+    Steel: 50
+    Plastic: 150
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 6de6678cdc3..04c4c26383f 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -60,3 +60,12 @@
   completetime: 1
   materials:
     Steel: 75
+
+- type: latheRecipe
+  id: ServiceSelectiveDropper
+  result: ServiceSelectiveDropper
+  completetime: 2
+  materials:
+    Glass: 200
+    Plastic: 100
+    Steel: 100
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
index 660e3495766..0ac8ae0fa09 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
@@ -8,9 +8,9 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 72000 # 20 hrs
-    - !type:DepartmentTimeRequirement
-      department: Security
-      time: 10800 # 3 hrs as sec
+    - !type:RoleTimeRequirement
+      role: JobSecurityGuard
+      time: 10800 # 3 hrs as security guard
   canBeAntag: false
   icon: "JobIconStc" 
   supervisors: job-supervisors-sr
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
index de3ad6b9154..0ebf35aed05 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
@@ -6,7 +6,7 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 86400 # Frontier - 24 hours
-  startingGear: NFPirateGear
+  startingGear: PirateNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -23,17 +23,10 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateGear
+  id: PirateNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadBandBlack
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
-  # innerClothingSkirt: ClothingUniformJumpsuitPirate
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
index 283a9ca1e19..2534068ab34 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_captain.yml
@@ -7,7 +7,7 @@
     - !type:WhitelistRequirement
     - !type:OverallPlaytimeRequirement
       time: 172800 # Frontier - 48 hours
-  startingGear: NFPirateCaptainGear
+  startingGear: PirateCaptainNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -24,19 +24,12 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateCaptainGear
+  id: PirateCaptainNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirate
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     pocket2: EnergyCutlass
     outerClothing: ClothingOuterCoatPirate
-  # innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
index c9406e5fc07..07379d9b719 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate_first_mate.yml
@@ -7,7 +7,7 @@
     - !type:WhitelistRequirement
     - !type:OverallPlaytimeRequirement
       time: 129600 # Frontier - 36 hours
-  startingGear: NFPirateFirstMateGear
+  startingGear: PirateFirstMateNFGear
   alwaysUseSpawner: true
   hideConsoleVisibility: true
   canBeAntag: true
@@ -24,18 +24,11 @@
     implants: [ FreelanceTrackingImplant ]
 
 - type: startingGear
-  id: NFPirateFirstMateGear
+  id: PirateFirstMateNFGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitPirate
-    back: ClothingBackpackPirateFilled
     head: ClothingHeadHatPirateTricord
     ears: ClothingHeadsetAltFreelancer
     shoes: ClothingShoesBootsLaceup
-    id: PiratePDA
     belt: ClothingBeltUtility
     pocket1: AppraisalTool
     outerClothing: ClothingOuterCoatGentle
-  # innerClothingSkirt: ClothingUniformJumpsuitPirate
-  # satchel: ClothingBackpackPirateFilled
-  # duffelbag: ClothingBackpackPirateFilled
-  # messenger: ClothingBackpackMessengerMercenaryFilled
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
index 9afef55373f..9e5747dac9b 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/security_guard.yml
@@ -30,3 +30,4 @@
     eyes: ClothingEyesGlassesSunglasses #ClothingEyesGlassesSecurity
     ears: ClothingHeadsetSecurity
     pocket1: WeaponPistolMk58 #WeaponPistolMk58Nonlethal
+    pocket2: MagazinePistol
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
index 9cefe654c39..4a61647574d 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/ambition.yml
@@ -28,8 +28,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            AtmosphericTechnician: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
\ No newline at end of file
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
index ec153cdeb2f..8d61c751409 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml
@@ -24,12 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            ServiceWorker: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            Chaplain: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            AtmosphericTechnician: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            Chef: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml
index 7b716c9e5c9..3eda606446f 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/courserx.yml
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml
index 8609ac7bf0d..7c45eb4a002 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dartx.yml
@@ -34,8 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            Clown: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
index b1fc3b13c78..e3647b6bb0a 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/decadedove.yml
@@ -24,6 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            StationEngineer: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Borg: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
index 400e7cb2f50..881dc93524d 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/dragonfly.yml
@@ -24,8 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            ServiceWorker: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
index 316470a9568..dd1984637cf 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gourd.yml
@@ -24,12 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            AtmosphericTechnician: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
-            Chef: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Janitor: [ 0, 0 ]
-            Musician: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml
index 52dd35295f9..16436be934f 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/kestrel.yml
@@ -34,4 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 0, 0 ]        
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]  
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml
index d3d88ab5a45..45fe4910ca9 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/mayflower.yml
@@ -24,5 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            MedicalDoctor: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
index 28c8fff75ee..b40903a2bdd 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/pathfinder.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml
index 76defabe64f..0954667c783 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/praeda.yml
@@ -34,12 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Quartermaster: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            CargoTechnician: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            Janitor: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml
index 1df693aae33..8fc437a7a34 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/rosebudmkii.yml
@@ -24,8 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
index 2c2acdb4c1b..ae352aa0796 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
index 682840a7ae9..b71a1185cea 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/bison.yml
@@ -23,4 +23,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
index 8632dcb291f..7b98d53d2c9 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/canister.yml
@@ -27,4 +27,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
\ No newline at end of file
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
index 29b6b8fac67..55e4fd902ca 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml
@@ -33,4 +33,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
index 06272bfb7a5..03825012e30 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/nugget.yml
@@ -33,4 +33,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
index b1582bee67d..45bcccd6b34 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml
@@ -23,4 +23,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
index 0f1de51786e..97612df1b3f 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/point.yml
@@ -23,4 +23,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
index cee528cc490..65d95cc9685 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
@@ -23,4 +23,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml
index ee5c7564abe..2f08cf9e015 100644
--- a/Resources/Prototypes/_NF/Shipyard/barge.yml
+++ b/Resources/Prototypes/_NF/Shipyard/barge.yml
@@ -34,8 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Quartermaster: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml
index 8343d71f607..f5072caeb08 100644
--- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Quartermaster: [ 0, 0 ]
-            CargoTechnician: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            ServiceWorker: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
index f9d1a722ed1..aed77085486 100644
--- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Chef: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/bookworm.yml b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
index fe8133b6f38..d31aa063d79 100644
--- a/Resources/Prototypes/_NF/Shipyard/bookworm.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bookworm.yml
@@ -24,5 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Librarian: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/bulker.yml b/Resources/Prototypes/_NF/Shipyard/bulker.yml
index 81f4dc8965d..52650fa104b 100644
--- a/Resources/Prototypes/_NF/Shipyard/bulker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/bulker.yml
@@ -34,6 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Chef: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
index aabbff387c7..acca673513f 100644
--- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml
+++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
@@ -24,10 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Paramedic: [ 0, 0 ]
-            ChiefMedicalOfficer: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
-            Borg: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            MedicalIntern: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml
index 703df670793..a35385f6aba 100644
--- a/Resources/Prototypes/_NF/Shipyard/ceres.yml
+++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml
@@ -1,6 +1,6 @@
 - type: vessel
   id: Ceres
-  name: NC Ceres
+  name: SBB Ceres
   description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests
   price: 49500
   category: Medium
@@ -9,7 +9,7 @@
 
 - type: gameMap
   id: Ceres
-  mapName: 'NC Ceres'
+  mapName: 'SBB Ceres'
   mapPath: /Maps/_NF/Shuttles/ceres.yml
   minPlayers: 0
   stations:
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Botanist: [ 0, 0 ]
-            Chef: [ 0, 0 ]
-            ServiceWorker: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/chisel.yml b/Resources/Prototypes/_NF/Shipyard/chisel.yml
index 00d93eee310..677f8434af3 100644
--- a/Resources/Prototypes/_NF/Shipyard/chisel.yml
+++ b/Resources/Prototypes/_NF/Shipyard/chisel.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/cleithro.yml b/Resources/Prototypes/_NF/Shipyard/cleithro.yml
index e8a0e77284e..bbb2b9db214 100644
--- a/Resources/Prototypes/_NF/Shipyard/cleithro.yml
+++ b/Resources/Prototypes/_NF/Shipyard/cleithro.yml
@@ -31,5 +31,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Psychologist: [ 0, 0 ]
-            ServiceWorker: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/comet.yml b/Resources/Prototypes/_NF/Shipyard/comet.yml
index 1fc590d1a80..e83968c629a 100644
--- a/Resources/Prototypes/_NF/Shipyard/comet.yml
+++ b/Resources/Prototypes/_NF/Shipyard/comet.yml
@@ -34,7 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            StationEngineer: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/condor.yml b/Resources/Prototypes/_NF/Shipyard/condor.yml
index 25492692f01..326b333ff7b 100644
--- a/Resources/Prototypes/_NF/Shipyard/condor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/condor.yml
@@ -24,9 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            StationEngineer: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            AtmosphericTechnician: [ 0, 0 ]
-            Borg: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/construct.yml b/Resources/Prototypes/_NF/Shipyard/construct.yml
index 12c2cd6fabe..dc4d7545d50 100644
--- a/Resources/Prototypes/_NF/Shipyard/construct.yml
+++ b/Resources/Prototypes/_NF/Shipyard/construct.yml
@@ -24,4 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Passenger: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml
index fec8f968699..443c32ae260 100644
--- a/Resources/Prototypes/_NF/Shipyard/crescent.yml
+++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml
@@ -34,19 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Quartermaster: [ 0, 0 ]
-            Lawyer: [ 0, 0 ]
-            Janitor: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
-            ChiefMedicalOfficer: [ 0, 0 ]
-            ChiefEngineer: [ 0, 0 ]
-            Chef: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
-            Mercenary: [ 0, 0 ]
-            AtmosphericTechnician: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            Musician: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/crown.yml b/Resources/Prototypes/_NF/Shipyard/crown.yml
new file mode 100644
index 00000000000..1aad25402b3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/crown.yml
@@ -0,0 +1,29 @@
+- type: vessel
+  id: Crown
+  name: SBI Crown
+  description: "A refurbished and repainted older model of the NSF Templar for Civilian and Mercenary use, mind the gap."
+  price: 20000
+  category: Small
+  group: Civilian
+  shuttlePath: /Maps/_NF/Shuttles/crown.yml
+
+- type: gameMap
+  id: Crown
+  mapName: 'SBI Crown'
+  mapPath: /Maps/_NF/Shuttles/crown.yml
+  minPlayers: 0
+  stations:
+    Crown:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'Crown {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml
index b59cffad600..7c2b4a9c310 100644
--- a/Resources/Prototypes/_NF/Shipyard/eagle.yml
+++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml
@@ -31,8 +31,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Chemist: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Paramedic: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/esquire.yml b/Resources/Prototypes/_NF/Shipyard/esquire.yml
index 38d71f2fbae..b48399a2d5e 100644
--- a/Resources/Prototypes/_NF/Shipyard/esquire.yml
+++ b/Resources/Prototypes/_NF/Shipyard/esquire.yml
@@ -34,6 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Lawyer: [ 0, 0 ]
-            Mercenary: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/garden.yml b/Resources/Prototypes/_NF/Shipyard/garden.yml
index a8fb2fe52f5..8485fa613fa 100644
--- a/Resources/Prototypes/_NF/Shipyard/garden.yml
+++ b/Resources/Prototypes/_NF/Shipyard/garden.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Botanist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml
index 129ffe4d489..bdf4c275e37 100644
--- a/Resources/Prototypes/_NF/Shipyard/hauler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Quartermaster: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/helix.yml b/Resources/Prototypes/_NF/Shipyard/helix.yml
index 55841edf1a4..81ce720b77a 100644
--- a/Resources/Prototypes/_NF/Shipyard/helix.yml
+++ b/Resources/Prototypes/_NF/Shipyard/helix.yml
@@ -1,40 +1,39 @@
-# Author Info
-# GitHub: ???
-# Discord: ???
+# # Author Info
+# # GitHub: ???
+# # Discord: ???
 
-# Maintainer Info
-# GitHub: ???
-# Discord: ???
+# # Maintainer Info
+# # GitHub: ???
+# # Discord: ???
 
-# Shuttle Notes:
-#
-- type: vessel
-  id: Helix
-  name: NM Helix
-  description: A medium, modular hospital. Standard issue equipped with chem lab, cloning, and treatment ward
-  price: 44600 # +5800 from 15% markup
-  category: Medium
-  group: Civilian
-  shuttlePath: /Maps/_NF/Shuttles/helix.yml
+# # Shuttle Notes:
+# #
+# - type: vessel
+  # id: Helix
+  # name: NM Helix
+  # description: A medium, modular hospital. Standard issue equipped with chem lab, cloning, and treatment ward
+  # price: 44600 # +5800 from 15% markup
+  # category: Medium
+  # group: Civilian
+  # shuttlePath: /Maps/_NF/Shuttles/helix.yml
 
-- type: gameMap
-  id: Helix
-  mapName: 'NM Helix'
-  mapPath: /Maps/_NF/Shuttles/helix.yml
-  minPlayers: 0
-  stations:
-    Helix:
-      stationProto: StandardFrontierVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Helix {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          overflowJobs: []
-          availableJobs:
-            Paramedic: [ 0, 0 ]
-            ChiefMedicalOfficer: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
+# - type: gameMap
+  # id: Helix
+  # mapName: 'NM Helix'
+  # mapPath: /Maps/_NF/Shuttles/helix.yml
+  # minPlayers: 0
+  # stations:
+    # Helix:
+      # stationProto: StandardFrontierVessel
+      # components:
+        # - type: StationNameSetup
+          # mapNameTemplate: 'Helix {1}'
+          # nameGenerator:
+            # !type:NanotrasenNameGenerator
+            # prefixCreator: '14'
+        # - type: StationJobs
+          # overflowJobs: []
+          # availableJobs:
+            # Contractor: [ 0, 0 ]
+            # Pilot: [ 0, 0 ]
+            # Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml
index 4b2720855f4..db1f1d33644 100644
--- a/Resources/Prototypes/_NF/Shipyard/honker.yml
+++ b/Resources/Prototypes/_NF/Shipyard/honker.yml
@@ -24,4 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Clown: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/investigator.yml b/Resources/Prototypes/_NF/Shipyard/investigator.yml
index 5516698df2f..c2420838480 100644
--- a/Resources/Prototypes/_NF/Shipyard/investigator.yml
+++ b/Resources/Prototypes/_NF/Shipyard/investigator.yml
@@ -24,6 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml
index f0a533767bc..b209b573b12 100644
--- a/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml
+++ b/Resources/Prototypes/_NF/Shipyard/knuckleverse.yml
@@ -24,8 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Janitor: [ 0, 0 ]
-            Bartender: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Boxer: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml
index 4e8335f39aa..24c3e5859d6 100644
--- a/Resources/Prototypes/_NF/Shipyard/loader.yml
+++ b/Resources/Prototypes/_NF/Shipyard/loader.yml
@@ -34,4 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
index 1d2a51e0fb4..9a9feb8f9e6 100644
--- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml
+++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
@@ -24,6 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
index 6b01b0db481..1150b366178 100644
--- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
@@ -31,10 +31,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Quartermaster: [ 0, 0 ]
-            CargoTechnician: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Chef: [ 0, 0 ]
-            Botanist: [ 0, 0 ]
-            Janitor: [ 0, 0 ]
-            Borg: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml
index 86bf8499b27..0fbc909cf09 100644
--- a/Resources/Prototypes/_NF/Shipyard/metastable.yml
+++ b/Resources/Prototypes/_NF/Shipyard/metastable.yml
@@ -24,11 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            Chef: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
             Mercenary: [ 0, 0 ]
-            Borg: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/mission.yml b/Resources/Prototypes/_NF/Shipyard/mission.yml
index 4f538e6d3f2..6cd770e81d0 100644
--- a/Resources/Prototypes/_NF/Shipyard/mission.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mission.yml
@@ -34,6 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Chaplain: [ 0, 0 ]
-            Janitor: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
index 6a5996a0352..44e44462f0f 100644
--- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml
+++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
@@ -24,8 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
-            Borg: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
index 682eff4ff30..7d601a4ffa2 100644
--- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml
+++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Chef: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml
index f00cb6301b7..47e628a468f 100644
--- a/Resources/Prototypes/_NF/Shipyard/placebo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml
@@ -24,4 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Psychologist: [ 0, 0 ]
\ No newline at end of file
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/prospector.yml b/Resources/Prototypes/_NF/Shipyard/prospector.yml
index 1afde203a9b..58dd5843d10 100644
--- a/Resources/Prototypes/_NF/Shipyard/prospector.yml
+++ b/Resources/Prototypes/_NF/Shipyard/prospector.yml
@@ -34,4 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            SalvageSpecialist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml
index 2c2c051b0a2..7598daaa8da 100644
--- a/Resources/Prototypes/_NF/Shipyard/pts.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pts.yml
@@ -33,4 +33,7 @@
             prefixCreator: '14'
         - type: StationJobs
           overflowJobs: []
-          availableJobs: {}
+          availableJobs:
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/pulse.yml b/Resources/Prototypes/_NF/Shipyard/pulse.yml
index 175c7f127a0..c72d5a1ec80 100644
--- a/Resources/Prototypes/_NF/Shipyard/pulse.yml
+++ b/Resources/Prototypes/_NF/Shipyard/pulse.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Paramedic: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml
index d5c42fd121c..3a5bbcf768e 100644
--- a/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml
+++ b/Resources/Prototypes/_NF/Shipyard/rosebudmki.yml
@@ -34,8 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            MedicalDoctor: [ 0, 0 ]
-            Chemist: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/searchlight.yml b/Resources/Prototypes/_NF/Shipyard/searchlight.yml
index ebc4acf0be0..31dbc82245d 100644
--- a/Resources/Prototypes/_NF/Shipyard/searchlight.yml
+++ b/Resources/Prototypes/_NF/Shipyard/searchlight.yml
@@ -36,4 +36,4 @@
           availableJobs:
             Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Mercenary: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml
index a318f9b68e4..c3be629df4c 100644
--- a/Resources/Prototypes/_NF/Shipyard/skipper.yml
+++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Botanist: [ 0, 0 ]
-            Chef: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
index dbffdc97751..8b4724dd707 100644
--- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml
+++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            StationEngineer: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/spectre.yml b/Resources/Prototypes/_NF/Shipyard/spectre.yml
index 12d9a2a3611..b30b521c27b 100644
--- a/Resources/Prototypes/_NF/Shipyard/spectre.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spectre.yml
@@ -34,7 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml
index b323848f178..8b68b4a8b37 100644
--- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml
@@ -24,7 +24,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Clown: [ 0, 0 ]
-            Mime: [ 0, 0 ]
-            Musician: [ 0, 0 ]
-            Chef: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/stratos.yml b/Resources/Prototypes/_NF/Shipyard/stratos.yml
index afd364eca2f..eb1325c0936 100644
--- a/Resources/Prototypes/_NF/Shipyard/stratos.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stratos.yml
@@ -34,8 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            Bartender: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            Scientist: [ 0, 0 ]
-            ResearchDirector: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/vagabond.yml b/Resources/Prototypes/_NF/Shipyard/vagabond.yml
index 4bb745c8a76..b73cc3c72d2 100644
--- a/Resources/Prototypes/_NF/Shipyard/vagabond.yml
+++ b/Resources/Prototypes/_NF/Shipyard/vagabond.yml
@@ -35,7 +35,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
-            CargoTechnician: [ 0, 0 ]
-            StationEngineer: [ 0, 0 ]
-            SalvageSpecialist: [ 0, 0 ]
-            Quartermaster: [ 0, 0 ]
+            Contractor: [ 0, 0 ]
+            Pilot: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Shipyard/waveshot.yml b/Resources/Prototypes/_NF/Shipyard/waveshot.yml
index abe5fa1390b..f2868f365a9 100644
--- a/Resources/Prototypes/_NF/Shipyard/waveshot.yml
+++ b/Resources/Prototypes/_NF/Shipyard/waveshot.yml
@@ -34,5 +34,6 @@
         - type: StationJobs
           overflowJobs: []
           availableJobs:
+            Contractor: [ 0, 0 ]
             Pilot: [ 0, 0 ]
-            Reporter: [ 0, 0 ]
+            Mercenary: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index fcadf573061..c27282d82d8 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -69,6 +69,9 @@
 
 - type: Tag
   id: VirologyLab
-  
+
 - type: Tag
   id: HoverbikeKeys
+
+- type: Tag
+  id: SpeedLoaderRifleHeavy
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml
new file mode 100644
index 00000000000..c80607a7b2e
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Ceres.xml
@@ -0,0 +1,107 @@
+<Document>
+  # CERES-CLASS SERVICE SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="KitchenKnife"/>
+  <GuideEntityEmbed Entity="KitchenMicrowave"/>
+  <GuideEntityEmbed Entity="KitchenElectricGrill"/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Medium
+
+  [color=#a4885c]Recommended Crew:[/color] 2-4
+
+  [color=#a4885c]Power Gen Type:[/color] Plasma
+
+  [color=#a4885c]Expeditions:[/color] None
+
+  [color=#a4885c]IFF Console:[/color] None
+
+  [color=#a4885c]Available Roles:[/color] Contractor, Pilot, Mercenary
+
+  "A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests."
+
+  [italic]Brought to you by BlueBird Starship Design & Construction.[/italic]
+
+  # Piloting
+  <Box>
+    <GuideEntityEmbed Entity="ComputerShuttle"/>
+  </Box>
+  After clicking the shuttle console, you should see a radar view of the shuttle. Here are the steps for piloting the shuttle back and forth:
+
+  - First, disconnect any airlocks that are connected to the dock.
+  - Then, you actually get to pilot the shuttle. The controls are fairly simple, with [color=#028ed9]"W"[/color] and [color=#028ed9]"S"[/color] being forward and backward, [color=#028ed9]"A"[/color] and [color=#028ed9]"D"[/color] being left and right, and [color=#028ed9]"Q"[/color] and [color=#028ed9]"E"[/color] being rotating left and right; and [color=#028ed9]"spacebar"[/color] being the brake and moving precicely by holding the [color=#028ed9]"spacebar"[/color] while doing other inputs.
+
+  # Hiring crew
+  <Box>
+    <GuideEntityEmbed Entity="ComputerStationRecords"/>
+    <GuideEntityEmbed Entity="ClothingHeadsetGrey"/>
+    <GuideEntityEmbed Entity="IntercomCommon"/>
+  </Box>
+  As a Captain of a Nanotrasen vessel, you have the authority to hire, fire, demote, or promote crew members at will. There are two ways you as a Captain can go about hiring crew: you can either use the [color=#a4885c]station records computer[/color] on your ship to open crew slots (jobs available vary from ship to ship) or invite through in-game communications other players to your crew.
+
+  # PREFLIGHT CHECKLIST
+
+  ## 1. Power supply
+
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SMESBasic"/>
+  <GuideEntityEmbed Entity="SubstationBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+  - Check that the SMES unit is anchored to the floor.
+  - Check that the substation unit is anchored to the floor.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load (W).
+
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+
+  - Check that P.A.C.M.A.N. generator units are anchored to the floor.
+  - Check that P.A.C.M.A.N. generator units are fueled. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation.
+  - Check that P.A.C.M.A.N. generator units are set to HV output.
+  - Set Target Power to [bold]12 kW[/bold] on each  generator unit.
+  - Start P.A.C.M.A.N. generator units.
+
+  ## 2. Atmospherics
+
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  </Box>
+
+  - Check that the air canister is anchored to connector port.
+  - Check that the distribution pump is set to normal pressure.
+  - Enable the distribution pump.
+
+  ## 2.2. Waste Loop
+  <Box>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  <GuideEntityEmbed Entity="AirAlarm"/>
+  </Box>
+
+  - Enable waste loop pump.
+  - Disable Auto Mode on the Air Alarm in the Engine Room.
+  - Set the Air Alarm in the Engine Room to Filtering (Wide).
+
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  <GuideEntityEmbed Entity="GravityGeneratorMini"/>
+  </Box>
+
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Check that the mini gravity generator is anchored, powered, and enabled.
+
+  # GETTING THE MOST OUT OF THE CERES
+
+  - The Ceres is designed for multi-person crews. Consider having a dedicated botanist to grow quality produce.
+  - Though unorthodox, the disposal units are designed to safely and efficiently transport produce from botany to kitchen. Make use of them!
+  - Don't be afraid to adjust the table and seating layout to suit your needs.
+  - For serving food to a larger party, the food carts in the freezer may simplify transportation.
+</Document>
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..ce3d78d944d
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
index 702b7c61322..8f09ebb065a 100644
--- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
+++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy",
+    "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy, wielded by erhardsteinhauer",
     "size": {
         "x": 32,
         "y": 32
@@ -24,6 +24,18 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..e1be43e99ff
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..081b70371d4
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
index 6657216b76b..acbd06c2708 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
@@ -1,77 +1,85 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
 	"size": {
 		"x": 32,
 		"y": 32
 	},
-	"states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "0-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "0-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "25-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "25-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "50-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "50-inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "75-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "75-inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-	]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "0-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "0-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "25-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "25-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "50-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "50-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "75-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "75-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..38327d97081
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..4e0a357b844
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
index 7ec48da4fec..2b374ec4dd8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/9ded73fb85b9106d6bbf1c9a34d1d2fa27ee0e2e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..126915fd270
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..93a9303c5ea
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
index 3b48bfc87c3..434d66fcfd8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2 backpack sprite by Peptide (copy of pulse rifle), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..b9df7a2cb2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..644db232d2e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
index 1a906ef965d..023ad90cfae 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json
@@ -1,45 +1,53 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/27386/commits/4814da0f8e0d88f430c8b335e541e0a7734755a2, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..b9df7a2cb2d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..644db232d2e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
index 990ba511859..8766242121a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json
@@ -1,54 +1,62 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/167a810bc8534a56c74ffa8f1373acd3b1ac70ee/icons/obj/guns/energy/xray.dmi, backpack sprite by peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
   "size": {
     "x": 32,
     "y": 32
   },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-unshaded-0",
-      "delays": [
-        [
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-1"
-    },
-    {
-      "name": "mag-unshaded-2"
-    },
-    {
-      "name": "mag-unshaded-3"
-    },
-    {
-      "name": "mag-unshaded-4"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9fa2fafdff6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..63615e2df1f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
index a5e32a3b395..d3b991783f4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,11 +21,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..a1d40617d2f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..146fe9b1c2a
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
index 919d0f87ac0..0257e70364f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,13 +27,21 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..2fa1f7811dc
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..c358af57c32
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index 2f30ef18a87..c45db54aff5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..42926b00f47
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..fd58fca837b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
index 8b1af3c5049..2ff87fa2917 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json
@@ -45,11 +45,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..50b0e2a1d4f
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..eaf5e92574d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
index 25feebd92c2..bd66b2c9685 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -1,42 +1,50 @@
 {
 	"version": 1,
 	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111",
+	"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
 	"size": {
 		"x": 32,
 		"y": 32
 	},
-	"states": [
-		{
-			"name": "icon"
-		},
-		{
-			"name": "base"
-		},
-		{
-			"name": "bolt-open"
-		},
-		{
-			"name": "mag-0"
-		},
-		{
-			"name": "suppressor"
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "suppressor"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..ee66cf3df9b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..c5d66956051
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
index f55fd2db207..b3ab88b772f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord)",
+  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,14 @@
         {
             "name": "inhand-left",
             "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..da4a7f4f922
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..ac02c47a844
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
index 5ef981dec9e..8699d00b7df 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -27,11 +27,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9a45848ec52
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..7252681abaf
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
index cd94834b2ae..25613e8bcd9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json
@@ -25,7 +25,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..27c2e923590
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..78165792c70
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
index f3a7f48582c..42b8d94d6d0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json
@@ -17,7 +17,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..5f5b50d715d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..4810c9c3755
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..26a569bfc22
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..e2380308b43
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json
deleted file mode 100644
index fefe1f6eb75..00000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-NC-4.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy",
-    "size": {
-        "x": 64,
-        "y": 64
-    },
-    "states": [
-        {
-            "name": "pump-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "pump-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "enforcer-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "enforcer-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "db-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "db-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "sawn-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "sawn-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "improvised-inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "improvised-inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
index 27d7ebd6653..3add3a471b6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json
@@ -17,7 +17,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..6c1d1581e8a
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, wield sprites by RiceMar1244",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..09fbaae551e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..00b475f6b45
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Shotguns/pump_inhands_64x.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-left.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png
rename to Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/inhand-right.png
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json
new file mode 100644
index 00000000000..852268d1874
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, sawn-inhand states modified from db-inhand by Flareguy",
+    "size": {
+        "x": 64,
+        "y": 64
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
index 4f7fc5d6f55..e4f1ef8dd85 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from InterBay13 at https://github.com/AndySok/InterBay13/commit/84824582fe1381d9ea6282b9da407994ab8ab509, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,11 +21,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..dc8f5727641
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..7a478a39768
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
index da8881c7c58..818c56417d4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/13612/commits/c1cf3c42b0cd00023937e46845a7c32d6beefa0e, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
     "size": {
         "x": 32,
         "y": 32
@@ -21,11 +21,19 @@
             "name": "inhand-right",
             "directions": 4
         },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
         {
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..d373352b9f5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..03625930c82
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b645db6d31b..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png
deleted file mode 100644
index e93a93d031a..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png
deleted file mode 100644
index 77dee9de3fd..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png
deleted file mode 100644
index b41f121b130..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json
deleted file mode 100644
index fd414099766..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/bloodcult.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Syndicate by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png
deleted file mode 100644
index e96994fd24f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png
deleted file mode 100644
index d26e490e929..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png
deleted file mode 100644
index 68f6c2d40ab..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png
deleted file mode 100644
index de92e600f0c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/captain.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 32405971540..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png
deleted file mode 100644
index e21f7efe6bc..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png
deleted file mode 100644
index bb53e45c896..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png
deleted file mode 100644
index 004aeaeb368..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json
deleted file mode 100644
index 4bb9c1b1fb3..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/cargo.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Cargo Tech Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png
new file mode 100644
index 00000000000..f5144c42221
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png
new file mode 100644
index 00000000000..ea919b24cf8
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png
new file mode 100644
index 00000000000..98e7a3c92cb
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png
new file mode 100644
index 00000000000..fead91d8237
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png
new file mode 100644
index 00000000000..154181958e7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png
new file mode 100644
index 00000000000..b0c76c0f69d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/base-top-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png
new file mode 100644
index 00000000000..bee7ad0f5ab
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png
new file mode 100644
index 00000000000..be6a6f5fbd3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png
new file mode 100644
index 00000000000..a902e0a16c7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/clasp-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png
new file mode 100644
index 00000000000..102a5a562cc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png
new file mode 100644
index 00000000000..2bd545e9e4f
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png
new file mode 100644
index 00000000000..8bb814ecc26
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-accent-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png
new file mode 100644
index 00000000000..165dace2e9c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png
new file mode 100644
index 00000000000..d726d2b6f82
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png
new file mode 100644
index 00000000000..dbed3235fe5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/decor-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png
new file mode 100644
index 00000000000..984576911d2
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base-top.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png
new file mode 100644
index 00000000000..b6c9fa4d209
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png
new file mode 100644
index 00000000000..fd5a606267c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-clasp.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png
new file mode 100644
index 00000000000..db85691a3cf
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor-accent.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png
new file mode 100644
index 00000000000..2efaed67476
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-decor.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png
new file mode 100644
index 00000000000..5d75e5918dd
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/icon-sling.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json
new file mode 100644
index 00000000000..e9791bcb3ab
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/meta.json
@@ -0,0 +1,93 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Original sprites by @Zydras (github), split into layers by erhardsteinhauer (discor/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-base-top"
+    },
+    {
+      "name": "icon-clasp"
+    },
+    {
+      "name": "icon-sling"
+    },
+    {
+      "name": "icon-decor"
+    },
+    {
+      "name": "icon-decor-accent"
+    },
+    {
+      "name": "base-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "base-top-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "clasp-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "sling-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "decor-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "decor-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "decor-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "decor-accent-equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "base-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "base-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "base-top-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "base-top-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "clasp-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "clasp-inhand-right",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png
new file mode 100644
index 00000000000..7cd038f570b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Back/Messenger/color.rsi/sling-equipped-BACKPACK.png differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 5c93787d4d3..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png
deleted file mode 100644
index f8794fe9ace..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png
deleted file mode 100644
index c571aa7b006..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png
deleted file mode 100644
index 901bbaea151..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/engineering.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 57c9796e96c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png
deleted file mode 100644
index 9dd3c88e6b0..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png
deleted file mode 100644
index d18b2575237..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png
deleted file mode 100644
index d02bcd50ad2..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/hydroponics.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 2334435c525..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png
deleted file mode 100644
index 2b727f2ff0d..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png
deleted file mode 100644
index bc018e28e4e..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png
deleted file mode 100644
index 87ba51a9541..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json
deleted file mode 100644
index c2133b8a3e0..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/janitor.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Janitor Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/equipped-BACKPACK.png
deleted file mode 100644
index c05d7f100ed..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/icon.png
deleted file mode 100644
index f306abe6e85..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-left.png
deleted file mode 100644
index 4d08f38c746..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-right.png
deleted file mode 100644
index 5fab995a1e3..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json
deleted file mode 100644
index 59325f6c703..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/mercenary.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Mercenary Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b37ae418710..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png
deleted file mode 100644
index 04fb7b49734..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png
deleted file mode 100644
index 083523ccf63..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png
deleted file mode 100644
index 0ae703d7b72..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json
deleted file mode 100644
index 08d2f92bc5e..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_brown.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for NSFD by erhardsteinhauer (discord), color palette by GhostPrince (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png
deleted file mode 100644
index b1f091e01f9..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png
deleted file mode 100644
index 0ebe1565595..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png
deleted file mode 100644
index e5696f75877..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png
deleted file mode 100644
index 0bec86d1532..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json
deleted file mode 100644
index cf17a5a1470..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/nfsd_cream.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Brigmedic by erhardsteinhauer (discord), color palette by GhostPrince (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 51eb259ec25..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png
deleted file mode 100644
index 5fb4593365c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png
deleted file mode 100644
index 03ea84cc6bc..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png
deleted file mode 100644
index 280a43ee31f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json
deleted file mode 100644
index d5c0c04092e..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/pilot.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Pilot Job by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 7067601728b..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png
deleted file mode 100644
index 3968a4856a2..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png
deleted file mode 100644
index 494c90b7ea9..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png
deleted file mode 100644
index 8e186c52f8c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json
deleted file mode 100644
index 54103f9fdea..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/salvage.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Sprites by @Zydras (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png
deleted file mode 100644
index 10d3a3913ad..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/equipped-BACKPACK.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png
deleted file mode 100644
index 686ecc9147f..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png
deleted file mode 100644
index d100e35e08c..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png
deleted file mode 100644
index 13f8a1bdd32..00000000000
Binary files a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json
deleted file mode 100644
index fd414099766..00000000000
--- a/Resources/Textures/_NF/Clothing/Back/Messenger/syndicate.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0345de358247afe0eb23ed0ff509b9b5f1995135 | Based on sprite by @Zydras (github), resprited (colored) for Syndicate by erhardsteinhauer (discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png
index 2b308539f05..47394428e06 100644
Binary files a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png
index b2205e37f3a..a05345873c9 100644
Binary files a/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png and b/Resources/Textures/_NF/Interface/Misc/job_icons.rsi/nfsdsheriff.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper.png
new file mode 100644
index 00000000000..242fe00bc0f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper1.png
new file mode 100644
index 00000000000..999d333ab84
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/dropper1.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..b1d24f32949
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png
new file mode 100644
index 00000000000..231e0038921
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..0198590656b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png
new file mode 100644
index 00000000000..deef55564f7
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/meta.json
new file mode 100644
index 00000000000..cfd84f8b969
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Chemistry/dropper.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dropper"
+    },
+    {
+      "name": "dropper1"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-fill-1",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-fill-1",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png
deleted file mode 100644
index 959c1436a12..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/bolt-open.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png
deleted file mode 100644
index 65f3aacd308..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/equipped-BELT.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png
deleted file mode 100644
index fb8869879fc..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png
deleted file mode 100644
index 762b7b0eeed..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png
deleted file mode 100644
index d391ea6f0fd..00000000000
Binary files a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png
new file mode 100644
index 00000000000..2c6f3fb0726
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png
new file mode 100644
index 00000000000..9fc7ae245b2
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png
new file mode 100644
index 00000000000..223c9e3b4fb
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png
new file mode 100644
index 00000000000..e8efed267b9
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png
new file mode 100644
index 00000000000..690e4e402c5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png
new file mode 100644
index 00000000000..cc5db9400da
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png
new file mode 100644
index 00000000000..8755dd94dec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png
new file mode 100644
index 00000000000..eada2162213
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png
new file mode 100644
index 00000000000..8af13d1cf16
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png
new file mode 100644
index 00000000000..c6df5f222b4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json
new file mode 100644
index 00000000000..7f4c9fadf9b
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/meta.json
@@ -0,0 +1,137 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by @Stagnation on the frontier discord",
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base-1"
+        },
+        {
+            "name": "base-2"
+        },
+        {
+            "name": "base-3"
+        },
+        {
+            "name": "base-4"
+        },
+        {
+            "name": "base-5"
+        },
+        {
+            "name": "base-6"
+        },
+        {
+            "name": "base-7"
+        },
+        {
+            "name": "base-8"
+        },
+        {
+            "name": "practice-1"
+        },
+        {
+            "name": "practice-2"
+        },
+        {
+            "name": "practice-3"
+        },
+        {
+            "name": "practice-4"
+        },
+        {
+            "name": "practice-5"
+        },
+        {
+            "name": "practice-6"
+        },
+        {
+            "name": "practice-7"
+        },
+        {
+            "name": "practice-8"
+        },
+        {
+            "name": "rubber-1"
+        },
+        {
+            "name": "rubber-2"
+        },
+        {
+            "name": "rubber-3"
+        },
+        {
+            "name": "rubber-4"
+        },
+        {
+            "name": "rubber-5"
+        },
+        {
+            "name": "rubber-6"
+        },
+        {
+            "name": "rubber-7"
+        },
+        {
+            "name": "rubber-8"
+        },
+        {
+            "name": "uranium-1"
+        },
+        {
+            "name": "uranium-2"
+        },
+        {
+            "name": "uranium-3"
+        },
+        {
+            "name": "uranium-4"
+        },
+        {
+            "name": "uranium-5"
+        },
+        {
+            "name": "uranium-6"
+        },
+        {
+            "name": "uranium-7"
+        },
+        {
+            "name": "uranium-8"
+        },
+        {
+            "name": "piercing-1"
+        },
+        {
+            "name": "piercing-2"
+        },
+        {
+            "name": "piercing-3"
+        },
+        {
+            "name": "piercing-4"
+        },
+        {
+            "name": "piercing-5"
+        },
+        {
+            "name": "piercing-6"
+        },
+        {
+            "name": "piercing-7"
+        },
+        {
+            "name": "piercing-8"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png
new file mode 100644
index 00000000000..4930f3f9989
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png
new file mode 100644
index 00000000000..28cbeba80bf
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png
new file mode 100644
index 00000000000..63b7a84f900
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png
new file mode 100644
index 00000000000..749eba847ae
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png
new file mode 100644
index 00000000000..f7608dbedba
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png
new file mode 100644
index 00000000000..3079f5324e6
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png
new file mode 100644
index 00000000000..0a1ec7887ed
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png
new file mode 100644
index 00000000000..7c46da59ce5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/piercing-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png
new file mode 100644
index 00000000000..e5f08f1d51f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png
new file mode 100644
index 00000000000..ababaa84671
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png
new file mode 100644
index 00000000000..411fc78a3fd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png
new file mode 100644
index 00000000000..515b63889f5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png
new file mode 100644
index 00000000000..cc7011a1642
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png
new file mode 100644
index 00000000000..2e7e7fbcdab
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png
new file mode 100644
index 00000000000..f8e250bd15e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png
new file mode 100644
index 00000000000..d7dfe0371fe
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/practice-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png
new file mode 100644
index 00000000000..5dca9d7803d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png
new file mode 100644
index 00000000000..f615854e5ce
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png
new file mode 100644
index 00000000000..44dacb9f0b8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png
new file mode 100644
index 00000000000..7216d9f79fa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png
new file mode 100644
index 00000000000..7a6d1b044dc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png
new file mode 100644
index 00000000000..65a9e355e02
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png
new file mode 100644
index 00000000000..18a0b63c5d5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png
new file mode 100644
index 00000000000..a5517503ebc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/rubber-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png
new file mode 100644
index 00000000000..084eb43a8c8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png
new file mode 100644
index 00000000000..1c6069bcbb4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png
new file mode 100644
index 00000000000..a47505934cc
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png
new file mode 100644
index 00000000000..b5b31a8e2ba
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png
new file mode 100644
index 00000000000..4cc13396828
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-5.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png
new file mode 100644
index 00000000000..8e6e5ba62ef
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-6.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png
new file mode 100644
index 00000000000..5378e8179fd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-7.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png
new file mode 100644
index 00000000000..13668787201
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Ammunition/SpeedLoaders/HeavyRifle/argenti_speed_loader.rsi/uranium-8.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..c17a68eb35a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
index 464c22d1a7a..98c1971f7e1 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/meta.json
@@ -28,6 +28,18 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..9c0b3bacdcf
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..52b461684e7
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Launchers/mail.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png
new file mode 100644
index 00000000000..5da259a4230
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..d5c2e5102fb
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png
new file mode 100644
index 00000000000..5da259a4230
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png
new file mode 100644
index 00000000000..57fb0c7c594
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png
new file mode 100644
index 00000000000..97f36840ffd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
similarity index 82%
rename from Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json
rename to Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
index 90a5a880de3..b261898e2f1 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Argenti-Revolver.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Revolvers/argenti.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by discord #vipan9104",
+  "license": "CC-BY-SA-4.0",
+  "copyright": "Created by @Stagnation on frontier discord",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 00000000000..ff8892bdaf3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
index c223e6b194f..f0146e82a56 100644
--- a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/meta.json
@@ -24,6 +24,18 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..f41af6b0c46
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..fcae7fa8f04
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Weapons/Guns/Snipers/repeater.rsi/wielded-inhand-right.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 374bf3f6262..8bc30012c98 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -20,7 +20,8 @@ WindoorSecurityLocked: WindoorSecureSecurityLocked
 WindoorScienceLocked: WindoorSecureScienceLocked
 WindoorHeadOfPersonnelLocked: WindoorSecureHeadOfPersonnelLocked
 WindoorAtmosphericsLocked: WindoorSecureAtmosphericsLocked
-WindoorParamedicLocked: WindoorSecureParamedicLocked
+WindoorParamedicLocked: WindoorSecureMedicalLocked
+WindoorSecureParamedicLocked: WindoorSecureMedicalLocked
 
 # 2023-07-03
 ClothingHeadHelmetHelmet: ClothingHeadHelmetBasic
@@ -299,48 +300,48 @@ BodyBag_Container: BodyBag
 BodyBag_Folded: BodyBagFolded
 
 # 2024-04-26
-BaseBulletRubber: null
-BulletPistolRubber: BulletPistol
-BulletMagnumRubber: BulletMagnum
-BulletLightRifleRubber: BulletLightRifle
-BulletRifleRubber: BulletRifle
-BulletCaselessRifleRubber: BulletCaselessRifle
-CartridgePistolRubber: CartridgePistol
-CartridgeMagnumRubber: CartridgeMagnum
-CartridgeLightRifleRubber: CartridgeLightRifle
-CartridgeRifleRubber: CartridgeRifle
-CartridgeCaselessRifleRubber: CartridgeCaselessRifle
-MagazinePistolRubber: MagazinePistol
-MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
-MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
-MagazineMagnumRubber: MagazineMagnum
-MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
-MagazineLightRifleRubber: MagazineLightRifle
-MagazineRifleRubber: MagazineRifle
-MagazineCaselessRifleRubber: MagazineCaselessRifle
-MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
-SpeedLoaderPistolRubber: SpeedLoaderPistol
-SpeedLoaderMagnumRubber: SpeedLoaderMagnum
-MagazineBoxPistolRubber: MagazineBoxPistol
-# RIP box of magnum rubbers 202X to 2024
-MagazineBoxMagnumRubber: MagazineBoxMagnum
-MagazineBoxLightRifleRubber: MagazineBoxLightRifle
-MagazineBoxRifleRubber: MagazineBoxRifle
-MagazineBoxRifleBigRubber: MagazineBoxRifleBig
-MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
-MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
-BoxMagazinePistolRubber: BoxMagazinePistol
-BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
-BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
-BoxMagazineLightRifleRubber: BoxMagazineLightRifle
-BoxMagazineRifleRubber: BoxMagazineRifle
-BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
-BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
-WeaponPistolMk58Nonlethal: WeaponPistolMk58
-WeaponPistolN1984Nonlethal: WeaponPistolN1984
-WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
-WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
-WeaponRifleLecterRubber: WeaponRifleLecter
+# BaseBulletRubber: null
+# BulletPistolRubber: BulletPistol
+# BulletMagnumRubber: BulletMagnum
+# BulletLightRifleRubber: BulletLightRifle
+# BulletRifleRubber: BulletRifle
+# BulletCaselessRifleRubber: BulletCaselessRifle
+# CartridgePistolRubber: CartridgePistol
+# CartridgeMagnumRubber: CartridgeMagnum
+# CartridgeLightRifleRubber: CartridgeLightRifle
+# CartridgeRifleRubber: CartridgeRifle
+# CartridgeCaselessRifleRubber: CartridgeCaselessRifle
+# MagazinePistolRubber: MagazinePistol
+# MagazinePistolSubMachineGunRubber: MagazinePistolSubMachineGun
+# MagazinePistolCaselessRifleRubber: MagazinePistolCaselessRifle
+# MagazineMagnumRubber: MagazineMagnum
+# MagazineMagnumSubMachineGunRubber: MagazineMagnumSubMachineGun
+# MagazineLightRifleRubber: MagazineLightRifle
+# MagazineRifleRubber: MagazineRifle
+# MagazineCaselessRifleRubber: MagazineCaselessRifle
+# MagazineCaselessRifleShortRubber: MagazineCaselessRifleShort
+# SpeedLoaderPistolRubber: SpeedLoaderPistol
+# SpeedLoaderMagnumRubber: SpeedLoaderMagnum
+# MagazineBoxPistolRubber: MagazineBoxPistol
+# # RIP box of magnum rubbers 202X to 2024
+# MagazineBoxMagnumRubber: MagazineBoxMagnum
+# MagazineBoxLightRifleRubber: MagazineBoxLightRifle
+# MagazineBoxRifleRubber: MagazineBoxRifle
+# MagazineBoxRifleBigRubber: MagazineBoxRifleBig
+# MagazineBoxCaselessRifleRubber: MagazineBoxCaselessRifle
+# MagazineBoxCaselessRifleBigRubber: MagazineBoxCaselessRifle10x24
+# BoxMagazinePistolRubber: BoxMagazinePistol
+# BoxMagazinePistolHighCapacityRubber: BoxMagazinePistolHighCapacity
+# BoxMagazinePistolSubMachineGunRubber: BoxMagazinePistolSubMachineGun
+# BoxMagazineLightRifleRubber: BoxMagazineLightRifle
+# BoxMagazineRifleRubber: BoxMagazineRifle
+# BoxMagazineCaselessRifleRubber: BoxMagazinePistolCaselessRifle
+# BoxMagazineMagnumSubMachineGunRubber: BoxMagazineMagnumSubMachineGun
+# WeaponPistolMk58Nonlethal: WeaponPistolMk58
+# WeaponPistolN1984Nonlethal: WeaponPistolN1984
+# WeaponSubMachineGunVectorRubber: WeaponSubMachineGunVector
+# WeaponSubMachineGunDrozdRubber: WeaponSubMachineGunDrozd
+# WeaponRifleLecterRubber: WeaponRifleLecter
 
 # 2024-04-26
 GlassBoxLaserBroken: GlassBoxBroken
@@ -377,3 +378,9 @@ APCBasicEmpImmune: APCBasic
 
 # 2024-02-09
 Ashtray: NFAshtray
+
+# 2024-05-25
+BoxSurvival: BoxSurvivalNFOxygen
+BoxSurvivalEngineering: BoxSurvivalNFOxygenExtended
+BoxSurvivalMedical: BoxSurvivalNFOxygen
+BoxHug: BoxSurvivalNFOxygen
\ No newline at end of file