diff --git a/Content.Client/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs b/Content.Client/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
new file mode 100644
index 00000000000..6a34621b6eb
--- /dev/null
+++ b/Content.Client/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
@@ -0,0 +1,16 @@
+using Content.Client.Chemistry.UI;
+using Content.Client.Items;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Robust.Shared.GameStates;
+
+namespace Content.Client.Chemistry.EntitySystems;
+
+public sealed class FillableOneTimeInjectorSystem : SharedFillableOneTimeInjectorSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        Subs.ItemStatus<FillableOneTimeInjectorComponent>(ent => new FillableOneTimeInjectorStatusControl(ent, SolutionContainers));
+    }
+}
diff --git a/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs b/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs
new file mode 100644
index 00000000000..2c9e28138f3
--- /dev/null
+++ b/Content.Client/Chemistry/UI/FillableOneTimeInjectorStatusControl.cs
@@ -0,0 +1,84 @@
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.FixedPoint;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Chemistry.UI;
+
+public sealed class FillableOneTimeInjectorStatusControl : Control
+{
+    private readonly Entity<FillableOneTimeInjectorComponent> _parent;
+    private readonly SharedSolutionContainerSystem _solutionContainers;
+    private readonly RichTextLabel _label;
+
+    private FixedPoint2 PrevVolume;
+    private FixedPoint2 PrevMaxVolume;
+    private FixedPoint2 PrevTransferAmount;
+    private FillableOneTimeInjectorToggleMode PrevToggleStateIndex;
+
+    public FillableOneTimeInjectorStatusControl(Entity<FillableOneTimeInjectorComponent> parent, SharedSolutionContainerSystem solutionContainers)
+    {
+        _parent = parent;
+        _solutionContainers = solutionContainers;
+        _label = new RichTextLabel { StyleClasses = { StyleNano.StyleClassItemStatus } };
+        AddChild(_label);
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!_solutionContainers.TryGetSolution(_parent.Owner, _parent.Comp.SolutionName, out _, out var solution))
+            return;
+
+        // only updates the UI if any of the details are different than they previously were
+        if (PrevVolume == solution.Volume
+            && PrevMaxVolume == solution.MaxVolume
+            && PrevTransferAmount == _parent.Comp.TransferAmount)
+            return;
+
+        PrevVolume = solution.Volume;
+        PrevMaxVolume = solution.MaxVolume;
+        PrevTransferAmount = _parent.Comp.TransferAmount;
+        var modeStringLocalized = "";
+
+        // only updates the UI if any of the details are different than they previously were
+        if(PrevToggleStateIndex == _parent.Comp.ToggleState)
+            return;
+
+        PrevToggleStateIndex = _parent.Comp.ToggleState;
+
+        // Update current volume and injector state
+        modeStringLocalized = Loc.GetString(
+            _parent.Comp.ToggleState switch
+            {
+                FillableOneTimeInjectorToggleMode.Draw => "injector-draw-text",
+                FillableOneTimeInjectorToggleMode.Inject => "injector-inject-text",
+                FillableOneTimeInjectorToggleMode.Spent => "injector-spent-text",
+                _ => "injector-invalid-injector-toggle-mode"
+            });
+
+        if (_parent.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Draw)
+        {
+            _label.SetMarkup(
+                Loc.GetString(
+                    "onetime-injector-simple-volume-label",
+                    ("currentVolume", solution.Volume),
+                    ("modeString", modeStringLocalized)));
+        }
+        else
+        {
+            _label.SetMarkup(
+                Loc.GetString(
+                    "injector-volume-label",
+                    ("currentVolume", solution.Volume),
+                    ("totalVolume", solution.MaxVolume),
+                    ("modeString", modeStringLocalized),
+                    ("transferVolume", _parent.Comp.TransferAmount)));
+        }
+    }
+}
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
index 45704ee2349..7468d96b7a4 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUi.cs
@@ -36,7 +36,7 @@ public override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    private static void SendStockTradingUiMessage(StockTradingUiAction action, int company, float amount, BoundUserInterface userInterface)
+    private static void SendStockTradingUiMessage(StockTradingUiAction action, int company, int amount, BoundUserInterface userInterface)
     {
         var newsMessage = new StockTradingUiMessageEvent(action, company, amount);
         var message = new CartridgeUiMessage(newsMessage);
diff --git a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
index b44e8f44c70..7aaed6e49df 100644
--- a/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
+++ b/Content.Client/DeltaV/CartridgeLoader/Cartridges/StockTradingUiFragment.xaml.cs
@@ -14,8 +14,8 @@ public sealed partial class StockTradingUiFragment : BoxContainer
     private readonly Dictionary<int, CompanyEntry> _companyEntries = new();
 
     // Event handlers for the parent UI
-    public event Action<int, float>? OnBuyButtonPressed;
-    public event Action<int, float>? OnSellButtonPressed;
+    public event Action<int, int>? OnBuyButtonPressed;
+    public event Action<int, int>? OnSellButtonPressed;
 
     // Define colors
     public static readonly Color PositiveColor = Color.FromHex("#00ff00"); // Green
@@ -70,8 +70,8 @@ private sealed class CompanyEntry
 
         public CompanyEntry(int companyIndex,
             string displayName,
-            Action<int, float>? onBuyPressed,
-            Action<int, float>? onSellPressed)
+            Action<int, int>? onBuyPressed,
+            Action<int, int>? onSellPressed)
         {
             Container = new BoxContainer
             {
@@ -216,13 +216,13 @@ public CompanyEntry(int companyIndex,
             // Button click events
             _buyButton.OnPressed += _ =>
             {
-                if (float.TryParse(_amountEdit.Text, out var amount) && amount > 0)
+                if (int.TryParse(_amountEdit.Text, out var amount) && amount > 0)
                     onBuyPressed?.Invoke(companyIndex, amount);
             };
 
             _sellButton.OnPressed += _ =>
             {
-                if (float.TryParse(_amountEdit.Text, out var amount) && amount > 0)
+                if (int.TryParse(_amountEdit.Text, out var amount) && amount > 0)
                     onSellPressed?.Invoke(companyIndex, amount);
             };
 
@@ -235,7 +235,7 @@ public CompanyEntry(int companyIndex,
             };
         }
 
-        public void Update(StockCompanyStruct company, int ownedStocks)
+        public void Update(StockCompany company, int ownedStocks)
         {
             _nameLabel.Text = company.LocalizedDisplayName;
             _priceLabel.Text = $"${company.CurrentPrice:F2}";
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
index cc6cc6e82b0..b52eacfa722 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml
@@ -2,7 +2,7 @@
                 xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
                 xmlns:fancyTree="clr-namespace:Content.Client.UserInterface.Controls.FancyTree"
                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                SetSize="750 700"
+                SetSize="850 700"
                 MinSize="100 200"
                 Resizable="True"
                 Title="{Loc 'guidebook-window-title'}">
@@ -21,9 +21,13 @@
                     Margin="0 5 10 5">
                 </LineEdit>
             </BoxContainer>
+            <BoxContainer Access="Internal" Name="ReturnContainer" Orientation="Horizontal" HorizontalAlignment="Right" Visible="False">
+                <Button Name="HomeButton" Text="{Loc 'ui-rules-button-home'}" Margin="0 0 10 0"/>
+            </BoxContainer>
             <ScrollContainer Name="Scroll" HScrollEnabled="False" HorizontalExpand="True" VerticalExpand="True">
                 <Control>
-                    <BoxContainer Orientation="Vertical" Name="EntryContainer" Margin="5 5 5 5" Visible="False"/>
+                    <BoxContainer Orientation="Vertical" Name="EntryContainer" Margin="5 5 5 5" Visible="False">
+                    </BoxContainer>
                     <BoxContainer Orientation="Vertical" Name="Placeholder" Margin="5 5 5 5">
                         <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text'}"/>
                         <Label HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Loc 'guidebook-placeholder-text-2'}"/>
diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
index 4776386c1dd..aff1ef5d70c 100644
--- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs
@@ -5,11 +5,13 @@
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Controls.FancyTree;
 using JetBrains.Annotations;
+using Content.Client.UserInterface.Systems.Info;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.ContentPack;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Guidebook.Controls;
 
@@ -21,6 +23,8 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler
 
     private Dictionary<string, GuideEntry> _entries = new();
 
+    public ProtoId<GuideEntryPrototype> LastEntry;
+
     public GuidebookWindow()
     {
         RobustXamlLoader.Load(this);
@@ -37,7 +41,13 @@ public GuidebookWindow()
     private void OnSelectionChanged(TreeItem? item)
     {
         if (item != null && item.Metadata is GuideEntry entry)
+        {
             ShowGuide(entry);
+
+            var isRulesEntry = entry.RuleEntry;
+            ReturnContainer.Visible = isRulesEntry;
+            HomeButton.OnPressed += _ => ShowGuide(entry);
+        }
         else
             ClearSelectedGuide();
     }
@@ -66,6 +76,8 @@ private void ShowGuide(GuideEntry entry)
             EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." });
             Logger.Error($"Failed to parse contents of guide document {entry.Id}.");
         }
+
+        LastEntry = entry.Id;
     }
 
     public void UpdateGuides(
@@ -152,6 +164,10 @@ private void RepopulateTree(List<string>? roots = null, string? forcedRoot = nul
             return null;
         }
 
+        var rulesProto = UserInterfaceManager.GetUIController<InfoUIController>().GetCoreRuleEntry();
+        if (entry.RuleEntry && entry.Id != rulesProto.Id)
+            return null;
+
         var item = Tree.AddItem(parent);
         item.Metadata = entry;
         var name = Loc.GetString(entry.Name);
diff --git a/Content.Client/Guidebook/GuideEntry.cs b/Content.Client/Guidebook/GuideEntry.cs
index b7b3b3309e6..55cbef3ad5a 100644
--- a/Content.Client/Guidebook/GuideEntry.cs
+++ b/Content.Client/Guidebook/GuideEntry.cs
@@ -34,6 +34,8 @@ public class GuideEntry
     /// </summary>
     [DataField("filterEnabled")] public bool FilterEnabled = default!;
 
+    [DataField] public bool RuleEntry;
+
     /// <summary>
     ///     Priority for sorting top-level guides when shown in a tree / table of contents.
     ///     If the guide is the child of some other guide, the order simply determined by the order of children in <see cref="Children"/>.
diff --git a/Content.Client/Light/AfterLightTargetOverlay.cs b/Content.Client/Light/AfterLightTargetOverlay.cs
new file mode 100644
index 00000000000..5cfe1e993b0
--- /dev/null
+++ b/Content.Client/Light/AfterLightTargetOverlay.cs
@@ -0,0 +1,58 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+
+namespace Content.Client.Light;
+
+/// <summary>
+/// This exists just to copy <see cref="BeforeLightTargetOverlay"/> to the light render target
+/// </summary>
+public sealed class AfterLightTargetOverlay : Overlay
+{
+    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
+
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    public const int ContentZIndex = LightBlurOverlay.ContentZIndex + 1;
+
+    public AfterLightTargetOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        ZIndex = ContentZIndex;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var viewport = args.Viewport;
+        var worldHandle = args.WorldHandle;
+
+        if (viewport.Eye == null)
+            return;
+
+        var lightOverlay = _overlay.GetOverlay<BeforeLightTargetOverlay>();
+        var bounds = args.WorldBounds;
+
+        // at 1-1 render scale it's mostly fine but at 4x4 it's way too fkn big
+        var newScale = viewport.RenderScale / 2f;
+
+        var localMatrix =
+            viewport.LightRenderTarget.GetWorldToLocalMatrix(viewport.Eye, newScale);
+        var diff = (lightOverlay.EnlargedLightTarget.Size - viewport.LightRenderTarget.Size);
+        var halfDiff = diff / 2;
+
+        // Pixels -> Metres -> Half distance.
+        // If we're zoomed in need to enlarge the bounds further.
+        args.WorldHandle.RenderInRenderTarget(viewport.LightRenderTarget,
+            () =>
+            {
+                // We essentially need to draw the cropped version onto the lightrendertarget.
+                var subRegion = new UIBox2i(halfDiff.X,
+                    halfDiff.Y,
+                    viewport.LightRenderTarget.Size.X + halfDiff.X,
+                    viewport.LightRenderTarget.Size.Y + halfDiff.Y);
+
+                worldHandle.SetTransform(localMatrix);
+                worldHandle.DrawTextureRectRegion(lightOverlay.EnlargedLightTarget.Texture, bounds, subRegion: subRegion);
+            }, null);
+    }
+}
diff --git a/Content.Client/Light/BeforeLightTargetOverlay.cs b/Content.Client/Light/BeforeLightTargetOverlay.cs
new file mode 100644
index 00000000000..add172c6f3c
--- /dev/null
+++ b/Content.Client/Light/BeforeLightTargetOverlay.cs
@@ -0,0 +1,51 @@
+using System.Numerics;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+
+namespace Content.Client.Light;
+
+/// <summary>
+/// Handles an enlarged lighting target so content can use large blur radii.
+/// </summary>
+public sealed class BeforeLightTargetOverlay : Overlay
+{
+    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
+
+    [Dependency] private readonly IClyde _clyde = default!;
+
+    public IRenderTexture EnlargedLightTarget = default!;
+    public Box2Rotated EnlargedBounds;
+
+    /// <summary>
+    /// In metres
+    /// </summary>
+    private float _skirting = 1.5f;
+
+    public const int ContentZIndex = -10;
+
+    public BeforeLightTargetOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        ZIndex = ContentZIndex;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        // Code is weird but I don't think engine should be enlarging the lighting render target arbitrarily either, maybe via cvar?
+        // The problem is the blur has no knowledge of pixels outside the viewport so with a large enough blur radius you get sampling issues.
+        var size = args.Viewport.LightRenderTarget.Size + (int) (_skirting * EyeManager.PixelsPerMeter);
+        EnlargedBounds = args.WorldBounds.Enlarged(_skirting / 2f);
+
+        // This just exists to copy the lightrendertarget and write back to it.
+        if (EnlargedLightTarget?.Size != size)
+        {
+            EnlargedLightTarget = _clyde
+                .CreateRenderTarget(size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "enlarged-light-copy");
+        }
+
+        args.WorldHandle.RenderInRenderTarget(EnlargedLightTarget,
+            () =>
+            {
+            }, _clyde.GetClearColor(args.MapUid));
+    }
+}
diff --git a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
new file mode 100644
index 00000000000..2da67137ed1
--- /dev/null
+++ b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
@@ -0,0 +1,36 @@
+using Robust.Client.Graphics;
+
+namespace Content.Client.Light.EntitySystems;
+
+public sealed class PlanetLightSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GetClearColorEvent>(OnClearColor);
+
+        _overlayMan.AddOverlay(new BeforeLightTargetOverlay());
+        _overlayMan.AddOverlay(new RoofOverlay(EntityManager));
+        _overlayMan.AddOverlay(new TileEmissionOverlay(EntityManager));
+        _overlayMan.AddOverlay(new LightBlurOverlay());
+        _overlayMan.AddOverlay(new AfterLightTargetOverlay());
+    }
+
+    private void OnClearColor(ref GetClearColorEvent ev)
+    {
+        ev.Color = Color.Transparent;
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _overlayMan.RemoveOverlay<BeforeLightTargetOverlay>();
+        _overlayMan.RemoveOverlay<RoofOverlay>();
+        _overlayMan.RemoveOverlay<TileEmissionOverlay>();
+        _overlayMan.RemoveOverlay<LightBlurOverlay>();
+        _overlayMan.RemoveOverlay<AfterLightTargetOverlay>();
+    }
+}
diff --git a/Content.Client/Light/EntitySystems/RoofSystem.cs b/Content.Client/Light/EntitySystems/RoofSystem.cs
new file mode 100644
index 00000000000..559eea40fc0
--- /dev/null
+++ b/Content.Client/Light/EntitySystems/RoofSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Light.EntitySystems;
+
+namespace Content.Client.Light.EntitySystems;
+
+/// <inheritdoc/>
+public sealed class RoofSystem : SharedRoofSystem
+{
+
+}
diff --git a/Content.Client/Light/LightBlurOverlay.cs b/Content.Client/Light/LightBlurOverlay.cs
new file mode 100644
index 00000000000..ae0684f9ffc
--- /dev/null
+++ b/Content.Client/Light/LightBlurOverlay.cs
@@ -0,0 +1,44 @@
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+
+namespace Content.Client.Light;
+
+/// <summary>
+/// Essentially handles blurring for content-side light overlays.
+/// </summary>
+public sealed class LightBlurOverlay : Overlay
+{
+    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
+
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    public const int ContentZIndex = TileEmissionOverlay.ContentZIndex + 1;
+
+    private IRenderTarget? _blurTarget;
+
+    public LightBlurOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        ZIndex = ContentZIndex;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.Viewport.Eye == null)
+            return;
+
+        var beforeOverlay = _overlay.GetOverlay<BeforeLightTargetOverlay>();
+        var size = beforeOverlay.EnlargedLightTarget.Size;
+
+        if (_blurTarget?.Size != size)
+        {
+            _blurTarget = _clyde
+                .CreateRenderTarget(size, new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb), name: "enlarged-light-blur");
+        }
+
+        var target = beforeOverlay.EnlargedLightTarget;
+        // Yeah that's all this does keep walkin.
+        _clyde.BlurRenderTarget(args.Viewport, target, _blurTarget, args.Viewport.Eye, 14f * 2f);
+    }
+}
diff --git a/Content.Client/Light/LightCycleSystem.cs b/Content.Client/Light/LightCycleSystem.cs
new file mode 100644
index 00000000000..9e19423cc33
--- /dev/null
+++ b/Content.Client/Light/LightCycleSystem.cs
@@ -0,0 +1,33 @@
+using Content.Client.GameTicking.Managers;
+using Content.Shared;
+using Content.Shared.Light.Components;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Light;
+
+/// <inheritdoc/>
+public sealed class LightCycleSystem : SharedLightCycleSystem
+{
+    [Dependency] private readonly ClientGameTicker _ticker = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var mapQuery = AllEntityQuery<LightCycleComponent, MapLightComponent>();
+        while (mapQuery.MoveNext(out var uid,  out var cycle, out var map))
+        {
+            if (!cycle.Running)
+                continue;
+
+            var time = (float) _timing.CurTime
+                .Add(cycle.Offset)
+                .Subtract(_ticker.RoundStartTimeSpan)
+                .TotalSeconds;
+
+            var color = GetColor((uid, cycle), cycle.OriginalColor, time);
+            map.AmbientLightColor = color;
+        }
+    }
+}
diff --git a/Content.Client/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs
new file mode 100644
index 00000000000..981edf793c8
--- /dev/null
+++ b/Content.Client/Light/RoofOverlay.cs
@@ -0,0 +1,100 @@
+using System.Numerics;
+using Content.Shared.Light.Components;
+using Content.Shared.Maps;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client.Light;
+
+public sealed class RoofOverlay : Overlay
+{
+    private readonly IEntityManager _entManager;
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    private readonly EntityLookupSystem _lookup;
+    private readonly SharedMapSystem _mapSystem;
+    private readonly SharedTransformSystem _xformSystem;
+
+    private readonly HashSet<Entity<OccluderComponent>> _occluders = new();
+
+    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
+
+    public const int ContentZIndex = BeforeLightTargetOverlay.ContentZIndex + 1;
+
+    public RoofOverlay(IEntityManager entManager)
+    {
+        _entManager = entManager;
+        IoCManager.InjectDependencies(this);
+
+        _lookup = _entManager.System<EntityLookupSystem>();
+        _mapSystem = _entManager.System<SharedMapSystem>();
+        _xformSystem = _entManager.System<SharedTransformSystem>();
+
+        ZIndex = ContentZIndex;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.Viewport.Eye == null)
+            return;
+
+        var mapEnt = _mapSystem.GetMap(args.MapId);
+
+        if (!_entManager.TryGetComponent(mapEnt, out RoofComponent? roofComp) ||
+            !_entManager.TryGetComponent(mapEnt, out MapGridComponent? grid))
+        {
+            return;
+        }
+
+        var viewport = args.Viewport;
+        var eye = args.Viewport.Eye;
+
+        var worldHandle = args.WorldHandle;
+        var lightoverlay = _overlay.GetOverlay<BeforeLightTargetOverlay>();
+        var bounds = lightoverlay.EnlargedBounds;
+        var target = lightoverlay.EnlargedLightTarget;
+
+        worldHandle.RenderInRenderTarget(target,
+            () =>
+            {
+                var invMatrix = target.GetWorldToLocalMatrix(eye, viewport.RenderScale / 2f);
+
+                var gridMatrix = _xformSystem.GetWorldMatrix(mapEnt);
+                var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
+
+                worldHandle.SetTransform(matty);
+
+                var tileEnumerator = _mapSystem.GetTilesEnumerator(mapEnt, grid, bounds);
+
+                // Due to stencilling we essentially draw on unrooved tiles
+                while (tileEnumerator.MoveNext(out var tileRef))
+                {
+                    if ((tileRef.Tile.Flags & (byte) TileFlag.Roof) == 0x0)
+                    {
+                        // Check if the tile is occluded in which case hide it anyway.
+                        // This is to avoid lit walls bleeding over to unlit tiles.
+                        _occluders.Clear();
+                        _lookup.GetLocalEntitiesIntersecting(mapEnt, tileRef.GridIndices, _occluders);
+                        var found = false;
+
+                        foreach (var occluder in _occluders)
+                        {
+                            if (!occluder.Comp.Enabled)
+                                continue;
+
+                            found = true;
+                            break;
+                        }
+
+                        if (!found)
+                            continue;
+                    }
+
+                    var local = _lookup.GetLocalBounds(tileRef, grid.TileSize);
+                    worldHandle.DrawRect(local, roofComp.Color);
+                }
+
+            }, null);
+    }
+}
diff --git a/Content.Client/Light/TileEmissionOverlay.cs b/Content.Client/Light/TileEmissionOverlay.cs
new file mode 100644
index 00000000000..bccc6fc21e6
--- /dev/null
+++ b/Content.Client/Light/TileEmissionOverlay.cs
@@ -0,0 +1,90 @@
+using System.Numerics;
+using Content.Shared.Light.Components;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Client.Light;
+
+public sealed class TileEmissionOverlay : Overlay
+{
+    public override OverlaySpace Space => OverlaySpace.BeforeLighting;
+
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IOverlayManager _overlay = default!;
+
+    private SharedMapSystem _mapSystem;
+    private SharedTransformSystem _xformSystem;
+
+    private readonly EntityLookupSystem _lookup;
+
+    private readonly EntityQuery<TransformComponent> _xformQuery;
+    private readonly HashSet<Entity<TileEmissionComponent>> _entities = new();
+
+    private List<Entity<MapGridComponent>> _grids = new();
+
+    public const int ContentZIndex = RoofOverlay.ContentZIndex + 1;
+
+    public TileEmissionOverlay(IEntityManager entManager)
+    {
+        IoCManager.InjectDependencies(this);
+
+        _lookup = entManager.System<EntityLookupSystem>();
+        _mapSystem = entManager.System<SharedMapSystem>();
+        _xformSystem = entManager.System<SharedTransformSystem>();
+
+        _xformQuery = entManager.GetEntityQuery<TransformComponent>();
+        ZIndex = ContentZIndex;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (args.Viewport.Eye == null)
+            return;
+
+        var mapId = args.MapId;
+        var worldHandle = args.WorldHandle;
+        var lightoverlay = _overlay.GetOverlay<BeforeLightTargetOverlay>();
+        var bounds = lightoverlay.EnlargedBounds;
+        var target = lightoverlay.EnlargedLightTarget;
+        var viewport = args.Viewport;
+
+        args.WorldHandle.RenderInRenderTarget(target,
+        () =>
+        {
+            var invMatrix = target.GetWorldToLocalMatrix(viewport.Eye, viewport.RenderScale / 2f);
+            _grids.Clear();
+            _mapManager.FindGridsIntersecting(mapId, bounds, ref _grids, approx: true);
+
+            foreach (var grid in _grids)
+            {
+                var gridInvMatrix = _xformSystem.GetInvWorldMatrix(grid);
+                var localBounds = gridInvMatrix.TransformBox(bounds);
+                _entities.Clear();
+                _lookup.GetLocalEntitiesIntersecting(grid.Owner, localBounds, _entities);
+
+                if (_entities.Count == 0)
+                    continue;
+
+                var gridMatrix = _xformSystem.GetWorldMatrix(grid.Owner);
+
+                foreach (var ent in _entities)
+                {
+                    var xform = _xformQuery.Comp(ent);
+
+                    var tile = _mapSystem.LocalToTile(grid.Owner, grid, xform.Coordinates);
+                    var matty = Matrix3x2.Multiply(gridMatrix, invMatrix);
+
+                    worldHandle.SetTransform(matty);
+
+                    // Yes I am fully aware this leads to overlap. If you really want to have alpha then you'll need
+                    // to turn the squares into polys.
+                    // Additionally no shadows so if you make it too big it's going to go through a 1x wall.
+                    var local = _lookup.GetLocalBounds(tile, grid.Comp.TileSize).Enlarged(ent.Comp.Range);
+                    worldHandle.DrawRect(local, ent.Comp.Color);
+                }
+            }
+        }, null);
+    }
+}
diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs
index 7c53f45e8a8..bacc90eabff 100644
--- a/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@ -1,38 +1,80 @@
-using Content.Client.Storage.Systems;
+using Content.Client.UserInterface.Systems.Storage;
+using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
+using Robust.Client.UserInterface;
 
 namespace Content.Client.Storage;
 
 [UsedImplicitly]
 public sealed class StorageBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IEntityManager _entManager = default!;
-
-    [Obsolete] public override bool DeferredClose => false;
-    private readonly StorageSystem _storage;
+    private StorageWindow? _window;
 
     public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
-        IoCManager.InjectDependencies(this);
-        _storage = _entManager.System<StorageSystem>();
     }
 
     protected override void Open()
     {
         base.Open();
 
-        if (_entManager.TryGetComponent<StorageComponent>(Owner, out var comp))
-            _storage.OpenStorageWindow((Owner, comp));
+        _window = IoCManager.Resolve<IUserInterfaceManager>()
+            .GetUIController<StorageUIController>()
+            .CreateStorageWindow(Owner);
+
+        if (EntMan.TryGetComponent(Owner, out StorageComponent? storage))
+        {
+            _window.UpdateContainer((Owner, storage));
+        }
+
+        _window.OnClose += Close;
+        _window.FlagDirty();
+    }
+
+    public void Refresh()
+    {
+        _window?.FlagDirty();
+    }
+
+    public void Reclaim()
+    {
+        if (_window == null)
+            return;
+
+        _window.OnClose -= Close;
+        _window.Orphan();
+        _window = null;
     }
 
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-        if (!disposing)
+
+        Reclaim();
+    }
+
+    public void Hide()
+    {
+        if (_window == null)
             return;
 
-        _storage.CloseStorageWindow(Owner);
+        _window.Visible = false;
+    }
+
+    public void Show()
+    {
+        if (_window == null)
+            return;
+
+        _window.Visible = true;
+    }
+
+    public void ReOpen()
+    {
+        _window?.Orphan();
+        _window = null;
+        Open();
     }
 }
 
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index b80a855f986..1ec582390d7 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -1,10 +1,11 @@
-using System.Linq;
+using System.Linq;
 using System.Numerics;
 using Content.Client.Animations;
 using Content.Shared.Hands;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
-using Robust.Shared.Collections;
+using Robust.Client.Player;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
@@ -13,114 +14,91 @@ namespace Content.Client.Storage.Systems;
 public sealed class StorageSystem : SharedStorageSystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly EntityPickupAnimationSystem _entityPickupAnimation = default!;
 
-    private readonly List<Entity<StorageComponent>> _openStorages = new();
-    public int OpenStorageAmount => _openStorages.Count;
-
-    public event Action<Entity<StorageComponent>>? StorageUpdated;
-    public event Action<Entity<StorageComponent>?>? StorageOrderChanged;
+    private Dictionary<EntityUid, ItemStorageLocation> _oldStoredItems = new();
 
     public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<StorageComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<StorageComponent, ComponentHandleState>(OnStorageHandleState);
         SubscribeNetworkEvent<PickupAnimationEvent>(HandlePickupAnimation);
         SubscribeAllEvent<AnimateInsertingEntitiesEvent>(HandleAnimatingInsertingEntities);
     }
 
-    public override void UpdateUI(Entity<StorageComponent?> entity)
+    private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref ComponentHandleState args)
     {
-        if (Resolve(entity.Owner, ref entity.Comp))
-            StorageUpdated?.Invoke((entity, entity.Comp));
-    }
+        if (args.Current is not StorageComponentState state)
+            return;
 
-    public void OpenStorageWindow(Entity<StorageComponent> entity)
-    {
-        if (_openStorages.Contains(entity))
-        {
-            if (_openStorages.LastOrDefault() == entity)
-            {
-                CloseStorageWindow((entity, entity.Comp));
-            }
-            else
-            {
-                var storages = new ValueList<Entity<StorageComponent>>(_openStorages);
-                var reverseStorages = storages.Reverse();
+        component.Grid.Clear();
+        component.Grid.AddRange(state.Grid);
+        component.MaxItemSize = state.MaxItemSize;
+        component.Whitelist = state.Whitelist;
+        component.Blacklist = state.Blacklist;
 
-                foreach (var storageEnt in reverseStorages)
-                {
-                    if (storageEnt == entity)
-                        break;
+        _oldStoredItems.Clear();
 
-                    CloseStorageBoundUserInterface(storageEnt.Owner);
-                    _openStorages.Remove(entity);
-                }
-            }
-            return;
+        foreach (var item in component.StoredItems)
+        {
+            _oldStoredItems.Add(item.Key, item.Value);
         }
 
-        ClearNonParentStorages(entity);
-        _openStorages.Add(entity);
-        Entity<StorageComponent>? last = _openStorages.LastOrDefault();
-        StorageOrderChanged?.Invoke(last);
-    }
+        component.StoredItems.Clear();
 
-    public void CloseStorageWindow(Entity<StorageComponent?> entity)
-    {
-        if (!Resolve(entity, ref entity.Comp))
-            return;
-
-        if (!_openStorages.Contains((entity, entity.Comp)))
-            return;
+        foreach (var (nent, location) in state.StoredItems)
+        {
+            var ent = EnsureEntity<StorageComponent>(nent, uid);
+            component.StoredItems[ent] = location;
+        }
 
-        var storages = new ValueList<Entity<StorageComponent>>(_openStorages);
-        var reverseStorages = storages.Reverse();
+        component.SavedLocations.Clear();
 
-        foreach (var storage in reverseStorages)
+        foreach (var loc in state.SavedLocations)
         {
-            CloseStorageBoundUserInterface(storage.Owner);
-            _openStorages.Remove(storage);
-            if (storage.Owner == entity.Owner)
-                break;
+            component.SavedLocations[loc.Key] = new(loc.Value);
         }
 
-        Entity<StorageComponent>? last = null;
-        if (_openStorages.Any())
-            last = _openStorages.LastOrDefault();
-        StorageOrderChanged?.Invoke(last);
-    }
+        var uiDirty = !component.StoredItems.SequenceEqual(_oldStoredItems);
 
-    private void ClearNonParentStorages(EntityUid uid)
-    {
-        var storages = new ValueList<Entity<StorageComponent>>(_openStorages);
-        var reverseStorages = storages.Reverse();
-
-        foreach (var storage in reverseStorages)
+        if (uiDirty && UI.TryGetOpenUi<StorageBoundUserInterface>(uid, StorageComponent.StorageUiKey.Key, out var storageBui))
         {
-            if (storage.Comp.Container.Contains(uid))
-                break;
+            storageBui.Refresh();
+            // Make sure nesting still updated.
+            var player = _player.LocalEntity;
 
-            CloseStorageBoundUserInterface(storage.Owner);
-            _openStorages.Remove(storage);
+            if (NestedStorage && player != null && ContainerSystem.TryGetContainingContainer((uid, null, null), out var container) &&
+                UI.TryGetOpenUi<StorageBoundUserInterface>(container.Owner, StorageComponent.StorageUiKey.Key, out var containerBui))
+            {
+                containerBui.Hide();
+            }
         }
     }
 
-    private void CloseStorageBoundUserInterface(Entity<UserInterfaceComponent?> entity)
+    public override void UpdateUI(Entity<StorageComponent?> entity)
     {
-        if (!Resolve(entity, ref entity.Comp, false))
-            return;
-
-        if (entity.Comp.ClientOpenInterfaces.GetValueOrDefault(StorageComponent.StorageUiKey.Key) is not { } bui)
-            return;
+        if (UI.TryGetOpenUi<StorageBoundUserInterface>(entity.Owner, StorageComponent.StorageUiKey.Key, out var sBui))
+        {
+            sBui.Refresh();
+        }
+    }
 
-        bui.Close();
+    protected override void HideStorageWindow(EntityUid uid, EntityUid actor)
+    {
+        if (UI.TryGetOpenUi<StorageBoundUserInterface>(uid, StorageComponent.StorageUiKey.Key, out var storageBui))
+        {
+            storageBui.Hide();
+        }
     }
 
-    private void OnShutdown(Entity<StorageComponent> ent, ref ComponentShutdown args)
+    protected override void ShowStorageWindow(EntityUid uid, EntityUid actor)
     {
-        CloseStorageWindow((ent, ent.Comp));
+        if (UI.TryGetOpenUi<StorageBoundUserInterface>(uid, StorageComponent.StorageUiKey.Key, out var storageBui))
+        {
+            storageBui.Show();
+        }
     }
 
     /// <inheritdoc />
@@ -143,7 +121,7 @@ public void PickupAnimation(EntityUid item, EntityCoordinates initialCoords, Ent
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        if (finalCoords.InRange(EntityManager, TransformSystem, initialCoords, 0.1f) ||
+        if (TransformSystem.InRange(finalCoords, initialCoords, 0.1f) ||
             !Exists(initialCoords.EntityId) || !Exists(finalCoords.EntityId))
         {
             return;
diff --git a/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs b/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs
index 3517a001c27..0e648c25a09 100644
--- a/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs
+++ b/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs
@@ -74,7 +74,7 @@ private void OnKeyBindDown(Control control)
     /// internal recentlyInteractedWindows tracking.
     /// </summary>
     /// <param name="window"></param>
-    private void SetMostRecentlyInteractedWindow(BaseWindow window)
+    public void SetMostRecentlyInteractedWindow(BaseWindow window)
     {
         // Search through the list and see if already added.
         // (This search is backwards since it's fairly common that the user is clicking the same
@@ -134,7 +134,6 @@ public bool HasClosableWindow()
             if (window.IsOpen)
                 return true;
 
-            recentlyInteractedWindows.RemoveAt(i);
             // continue going down the list, hoping to find a still-open window
         }
 
diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
index 6f20393b7f2..7ff9e7a521c 100644
--- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
+++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
@@ -4,9 +4,11 @@
 using Content.Client.Guidebook.Controls;
 using Content.Client.Lobby;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.CCVar;
 using Content.Shared.Input;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
+using Robust.Shared.Configuration;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Prototypes;
@@ -18,9 +20,11 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
 {
     [UISystemDependency] private readonly GuidebookSystem _guidebookSystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
 
     private GuidebookWindow? _guideWindow;
     private MenuButton? GuidebookButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.GuidebookButton;
+    private ProtoId<GuideEntryPrototype>? _lastEntry;
 
     public void OnStateEntered(LobbyState state)
     {
@@ -107,6 +111,12 @@ private void OnWindowClosed()
     {
         if (GuidebookButton != null)
             GuidebookButton.Pressed = false;
+
+        if (_guideWindow != null)
+        {
+            _guideWindow.ReturnContainer.Visible = false;
+            _lastEntry = _guideWindow.LastEntry;
+        }
     }
 
     private void OnWindowOpen()
@@ -162,6 +172,17 @@ public void ToggleGuidebook(
             }
         }
 
+        if (selected == null)
+        {
+            if (_lastEntry is { } lastEntry && guides.ContainsKey(lastEntry))
+            {
+                selected = _lastEntry;
+            }
+            else
+            {
+                selected = _cfgManager.GetCVar(CCVars.DefaultGuide);
+            }
+        }
         _guideWindow.UpdateGuides(guides, rootEntries, forceRoot, selected);
 
         // Expand up to depth-2.
diff --git a/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs b/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
index 2f266cfdd6b..b89115da86b 100644
--- a/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
+++ b/Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
@@ -31,13 +31,12 @@ private void OnScreenLoad()
         ReloadHotbar();
     }
 
-    public void Setup(HandsContainer handsContainer, StorageContainer storageContainer)
+    public void Setup(HandsContainer handsContainer)
     {
         _inventory = UIManager.GetUIController<InventoryUIController>();
         _hands = UIManager.GetUIController<HandsUIController>();
         _storage = UIManager.GetUIController<StorageUIController>();
         _hands.RegisterHandContainer(handsContainer);
-        _storage.RegisterStorageContainer(storageContainer);
     }
 
     public void ReloadHotbar()
diff --git a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml
index 00ba1878b48..b9602c64e5a 100644
--- a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml
+++ b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml
@@ -1,7 +1,6 @@
 <widgets:HotbarGui
     xmlns="https://spacestation14.io"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Controls"
-    xmlns:storage="clr-namespace:Content.Client.UserInterface.Systems.Storage.Controls"
     xmlns:hands="clr-namespace:Content.Client.UserInterface.Systems.Hands.Controls"
     xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
     Name="HotbarInterface"
@@ -10,13 +9,31 @@
     Orientation="Vertical"
     HorizontalAlignment="Center">
     <BoxContainer Orientation="Vertical">
-        <BoxContainer Name="StorageContainer"
+        <BoxContainer Name="SingleStorageContainer"
                       Access="Public"
                       HorizontalAlignment="Center"
+                      HorizontalExpand="True"
                       Margin="10">
-            <storage:StorageContainer
-                Name="StoragePanel"
-                Visible="False"/>
+        </BoxContainer>
+        <BoxContainer Name="DoubleStorageContainer"
+                      Access="Public"
+                      HorizontalAlignment="Stretch"
+                      HorizontalExpand="True"
+                      Margin="10">
+            <BoxContainer Name="LeftStorageContainer"
+                          Access="Public"
+                          HorizontalAlignment="Left"
+                          HorizontalExpand="True"
+                          VerticalAlignment="Bottom"
+                          Margin="10">
+            </BoxContainer>
+            <BoxContainer Name="RightStorageContainer"
+                          Access="Public"
+                          HorizontalAlignment="Right"
+                          HorizontalExpand="True"
+                          VerticalAlignment="Bottom"
+                          Margin="10">
+            </BoxContainer>
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" Name="Hotbar" HorizontalAlignment="Center">
             <inventory:ItemSlotButtonContainer
diff --git a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
index 59d86c84b85..b3650136e7a 100644
--- a/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
@@ -15,7 +15,7 @@ public HotbarGui()
         StatusPanelLeft.SetSide(HandUILocation.Left);
         var hotbarController = UserInterfaceManager.GetUIController<HotbarUIController>();
 
-        hotbarController.Setup(HandContainer, StoragePanel);
+        hotbarController.Setup(HandContainer);
         LayoutContainer.SetGrowVertical(this, LayoutContainer.GrowDirection.Begin);
     }
 
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
index dd9986e4c6e..f4c4158b5ce 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
@@ -59,7 +59,7 @@ public ItemGridPiece(Entity<ItemComponent> entity, ItemStorageLocation location,
         Location = location;
 
         Visible = true;
-        MouseFilter = MouseFilterMode.Pass;
+        MouseFilter = MouseFilterMode.Stop;
 
         TooltipSupplier = SupplyTooltip;
 
@@ -105,8 +105,11 @@ protected override void Draw(DrawingHandleScreen handle)
             return;
         }
 
-        if (_storageController.IsDragging && _storageController.DraggingGhost?.Entity == Entity && _storageController.DraggingGhost != this)
+        if (_storageController.IsDragging && _storageController.DraggingGhost?.Entity == Entity &&
+            _storageController.DraggingGhost != this)
+        {
             return;
+        }
 
         var adjustedShape = _entityManager.System<ItemSystem>().GetAdjustedItemShape((Entity, itemComponent), Location.Rotation, Vector2i.Zero);
         var boundingGrid = adjustedShape.GetBoundingBox();
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
similarity index 64%
rename from Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
rename to Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index ef55e38ed25..30bc61aa3bf 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageContainer.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -3,7 +3,9 @@
 using System.Numerics;
 using Content.Client.Hands.Systems;
 using Content.Client.Items.Systems;
+using Content.Client.Storage;
 using Content.Client.Storage.Systems;
+using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Item;
 using Content.Shared.Storage;
@@ -11,12 +13,14 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.Collections;
+using Robust.Shared.Containers;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Client.UserInterface.Systems.Storage.Controls;
 
-public sealed class StorageContainer : BaseWindow
+public sealed class StorageWindow : BaseWindow
 {
     [Dependency] private readonly IEntityManager _entity = default!;
     private readonly StorageUIController _storageController;
@@ -27,6 +31,20 @@ public sealed class StorageContainer : BaseWindow
     private readonly GridContainer _backgroundGrid;
     private readonly GridContainer _sidebar;
 
+    private Control _titleContainer;
+    private Label _titleLabel;
+
+    // Needs to be nullable in case a piece is in default spot.
+    private readonly Dictionary<EntityUid, (ItemStorageLocation? Loc, ItemGridPiece Control)> _pieces = new();
+    private readonly List<Control> _controlGrid = new();
+
+    private ValueList<EntityUid> _contained = new();
+    private ValueList<EntityUid> _toRemove = new();
+
+    private TextureButton? _backButton;
+
+    private bool _isDirty;
+
     public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPiecePressed;
     public event Action<GUIBoundKeyEventArgs, ItemGridPiece>? OnPieceUnpressed;
 
@@ -51,9 +69,10 @@ public sealed class StorageContainer : BaseWindow
     private readonly string _sidebarFatTexturePath = "Storage/sidebar_fat";
     private Texture? _sidebarFatTexture;
 
-    public StorageContainer()
+    public StorageWindow()
     {
         IoCManager.InjectDependencies(this);
+        Resizable = false;
 
         _storageController = UserInterfaceManager.GetUIController<StorageUIController>();
 
@@ -63,6 +82,7 @@ public StorageContainer()
 
         _sidebar = new GridContainer
         {
+            Name = "SideBar",
             HSeparationOverride = 0,
             VSeparationOverride = 0,
             Columns = 1
@@ -70,21 +90,48 @@ public StorageContainer()
 
         _pieceGrid = new GridContainer
         {
+            Name = "PieceGrid",
             HSeparationOverride = 0,
             VSeparationOverride = 0
         };
 
         _backgroundGrid = new GridContainer
         {
+            Name = "BackgroundGrid",
             HSeparationOverride = 0,
             VSeparationOverride = 0
         };
 
+        _titleLabel = new Label()
+        {
+            HorizontalExpand = true,
+            Name = "StorageLabel",
+            ClipText = true,
+            Text = "Dummy",
+            StyleClasses =
+            {
+                "FancyWindowTitle",
+            }
+        };
+
+        _titleContainer = new PanelContainer()
+        {
+            StyleClasses =
+            {
+                "WindowHeadingBackground"
+            },
+            Children =
+            {
+                _titleLabel
+            }
+        };
+
         var container = new BoxContainer
         {
             Orientation = BoxContainer.LayoutOrientation.Vertical,
             Children =
             {
+                _titleContainer,
                 new BoxContainer
                 {
                     Orientation = BoxContainer.LayoutOrientation.Horizontal,
@@ -130,12 +177,22 @@ public void UpdateContainer(Entity<StorageComponent>? entity)
         if (entity == null)
             return;
 
+        if (UserInterfaceManager.GetUIController<StorageUIController>().WindowTitle)
+        {
+            _titleLabel.Text = Identity.Name(entity.Value, _entity);
+            _titleContainer.Visible = true;
+        }
+        else
+        {
+            _titleContainer.Visible = false;
+        }
+
         BuildGridRepresentation();
     }
 
     private void BuildGridRepresentation()
     {
-        if (!_entity.TryGetComponent<StorageComponent>(StorageEntity, out var comp) || !comp.Grid.Any())
+        if (!_entity.TryGetComponent<StorageComponent>(StorageEntity, out var comp) || comp.Grid.Count == 0)
             return;
 
         var boundingGrid = comp.Grid.GetBoundingBox();
@@ -144,12 +201,13 @@ private void BuildGridRepresentation()
 
         #region Sidebar
         _sidebar.Children.Clear();
-        _sidebar.Rows = boundingGrid.Height + 1;
+        var rows = boundingGrid.Height + 1;
+        _sidebar.Rows = rows;
+
         var exitButton = new TextureButton
         {
-            TextureNormal = _entity.System<StorageSystem>().OpenStorageAmount == 1
-                ?_exitTexture
-                : _backTexture,
+            Name = "ExitButton",
+            TextureNormal = _exitTexture,
             Scale = new Vector2(2, 2),
         };
         exitButton.OnPressed += _ =>
@@ -165,8 +223,10 @@ private void BuildGridRepresentation()
                 args.Handle();
             }
         };
+
         var exitContainer = new BoxContainer
         {
+            Name = "ExitContainer",
             Children =
             {
                 new TextureRect
@@ -182,28 +242,70 @@ private void BuildGridRepresentation()
                 }
             }
         };
+
         _sidebar.AddChild(exitContainer);
-        for (var i = 0; i < boundingGrid.Height - 1; i++)
+        var offset = 2;
+
+        if (_entity.System<StorageSystem>().NestedStorage && rows > 0)
         {
-            _sidebar.AddChild(new TextureRect
+            _backButton = new TextureButton
             {
-                Texture = _sidebarMiddleTexture,
-                TextureScale = new Vector2(2, 2),
-            });
+                TextureNormal = _backTexture,
+                Scale = new Vector2(2, 2),
+            };
+            _backButton.OnPressed += _ =>
+            {
+                var containerSystem = _entity.System<SharedContainerSystem>();
+
+                if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) &&
+                    _entity.TryGetComponent(container.Owner, out StorageComponent? storage))
+                {
+                    Close();
+
+                    if (_entity.System<SharedUserInterfaceSystem>()
+                        .TryGetOpenUi<StorageBoundUserInterface>(container.Owner,
+                            StorageComponent.StorageUiKey.Key,
+                            out var parentBui))
+                    {
+                        parentBui.Show();
+                    }
+                }
+            };
+
+            var backContainer = new BoxContainer
+            {
+                Name = "ExitContainer",
+                Children =
+                {
+                    new TextureRect
+                    {
+                        Texture = rows > 2 ? _sidebarMiddleTexture : _sidebarBottomTexture,
+                        TextureScale = new Vector2(2, 2),
+                        Children =
+                        {
+                            _backButton,
+                        }
+                    }
+                }
+            };
+
+            _sidebar.AddChild(backContainer);
         }
 
-        if (boundingGrid.Height > 0)
+        var fillerRows = rows - offset;
+
+        for (var i = 0; i < fillerRows; i++)
         {
             _sidebar.AddChild(new TextureRect
             {
-                Texture = _sidebarBottomTexture,
+                Texture = i != (fillerRows - 1) ? _sidebarMiddleTexture : _sidebarBottomTexture,
                 TextureScale = new Vector2(2, 2),
             });
         }
 
         #endregion
 
-        BuildItemPieces();
+        FlagDirty();
     }
 
     public void BuildBackground()
@@ -240,6 +342,34 @@ public void BuildBackground()
         }
     }
 
+    public void Reclaim(ItemStorageLocation location, ItemGridPiece draggingGhost)
+    {
+        draggingGhost.OnPiecePressed += OnPiecePressed;
+        draggingGhost.OnPieceUnpressed += OnPieceUnpressed;
+        _pieces[draggingGhost.Entity] = (location, draggingGhost);
+        draggingGhost.Location = location;
+        var controlIndex = GetGridIndex(draggingGhost);
+        _controlGrid[controlIndex].AddChild(draggingGhost);
+    }
+
+    private int GetGridIndex(ItemGridPiece piece)
+    {
+        return piece.Location.Position.X + piece.Location.Position.Y * _pieceGrid.Columns;
+    }
+
+    public void FlagDirty()
+    {
+        _isDirty = true;
+    }
+
+    public void RemoveGrid(ItemGridPiece control)
+    {
+        control.Orphan();
+        _pieces.Remove(control.Entity);
+        control.OnPiecePressed -= OnPiecePressed;
+        control.OnPieceUnpressed -= OnPieceUnpressed;
+    }
+
     public void BuildItemPieces()
     {
         if (!_entity.EntityExists(StorageEntity))
@@ -248,65 +378,94 @@ public void BuildItemPieces()
         if (!_entity.TryGetComponent<StorageComponent>(StorageEntity, out var storageComp))
             return;
 
-        if (!storageComp.Grid.Any())
+        if (storageComp.Grid.Count == 0)
             return;
 
         var boundingGrid = storageComp.Grid.GetBoundingBox();
         var size = _emptyTexture!.Size * 2;
-        var containedEntities = storageComp.Container.ContainedEntities.Reverse().ToArray();
+        _contained.Clear();
+        _contained.AddRange(storageComp.Container.ContainedEntities.Reverse());
 
-        //todo. at some point, we may want to only rebuild the pieces that have actually received new data.
-
-        _pieceGrid.RemoveAllChildren();
-        _pieceGrid.Rows = boundingGrid.Height + 1;
-        _pieceGrid.Columns = boundingGrid.Width + 1;
-        for (var y = boundingGrid.Bottom; y <= boundingGrid.Top; y++)
+        // Build the grid representation
+        if (_pieceGrid.Rows - 1 != boundingGrid.Height || _pieceGrid.Columns - 1 != boundingGrid.Width)
         {
-            for (var x = boundingGrid.Left; x <= boundingGrid.Right; x++)
+            _pieceGrid.Rows = boundingGrid.Height + 1;
+            _pieceGrid.Columns = boundingGrid.Width + 1;
+            _controlGrid.Clear();
+
+            for (var y = boundingGrid.Bottom; y <= boundingGrid.Top; y++)
             {
-                var control = new Control
+                for (var x = boundingGrid.Left; x <= boundingGrid.Right; x++)
                 {
-                    MinSize = size
-                };
+                    var control = new Control
+                    {
+                        MinSize = size
+                    };
 
-                var currentPosition = new Vector2i(x, y);
+                    _controlGrid.Add(control);
+                    _pieceGrid.AddChild(control);
+                }
+            }
+        }
+
+        _toRemove.Clear();
 
-                foreach (var (itemEnt, itemPos) in storageComp.StoredItems)
+        // Remove entities no longer relevant / Update existing ones
+        foreach (var (ent, data) in _pieces)
+        {
+            if (storageComp.StoredItems.TryGetValue(ent, out var updated))
+            {
+                if (data.Loc.Equals(updated))
                 {
-                    if (itemPos.Position != currentPosition)
-                        continue;
+                    DebugTools.Assert(data.Control.Location == updated);
+                    continue;
+                }
 
-                    if (_entity.TryGetComponent<ItemComponent>(itemEnt, out var itemEntComponent))
-                    {
-                        ItemGridPiece gridPiece;
+                // Update
+                data.Control.Location = updated;
+                var index = GetGridIndex(data.Control);
+                data.Control.Orphan();
+                _controlGrid[index].AddChild(data.Control);
+                _pieces[ent] = (updated, data.Control);
+                continue;
+            }
 
-                        if (_storageController.CurrentlyDragging?.Entity is { } dragging
-                            && dragging == itemEnt)
-                        {
-                            _storageController.CurrentlyDragging.Orphan();
-                            gridPiece = _storageController.CurrentlyDragging;
-                        }
-                        else
-                        {
-                            gridPiece = new ItemGridPiece((itemEnt, itemEntComponent), itemPos, _entity)
-                            {
-                                MinSize = size,
-                                Marked = Array.IndexOf(containedEntities, itemEnt) switch
-                                {
-                                    0 => ItemGridPieceMarks.First,
-                                    1 => ItemGridPieceMarks.Second,
-                                    _ => null,
-                                }
-                            };
-                            gridPiece.OnPiecePressed += OnPiecePressed;
-                            gridPiece.OnPieceUnpressed += OnPieceUnpressed;
-                        }
+            _toRemove.Add(ent);
+        }
+
+        foreach (var ent in _toRemove)
+        {
+            _pieces.Remove(ent, out var data);
+            data.Control.Orphan();
+        }
+
+        // Add new ones
+        foreach (var (ent, loc) in storageComp.StoredItems)
+        {
+            if (_pieces.TryGetValue(ent, out var existing))
+            {
+                DebugTools.Assert(existing.Loc == loc);
+                continue;
+            }
 
-                        control.AddChild(gridPiece);
+            if (_entity.TryGetComponent<ItemComponent>(ent, out var itemEntComponent))
+            {
+                var gridPiece = new ItemGridPiece((ent, itemEntComponent), loc, _entity)
+                {
+                    MinSize = size,
+                    Marked = _contained.IndexOf(ent) switch
+                    {
+                        0 => ItemGridPieceMarks.First,
+                        1 => ItemGridPieceMarks.Second,
+                        _ => null,
                     }
-                }
+                };
+                gridPiece.OnPiecePressed += OnPiecePressed;
+                gridPiece.OnPieceUnpressed += OnPieceUnpressed;
+                var controlIndex = loc.Position.X + loc.Position.Y * (boundingGrid.Width + 1);
 
-                _pieceGrid.AddChild(control);
+                _controlGrid[controlIndex].AddChild(gridPiece);
+                _pieces[ent] = (loc, gridPiece);
             }
         }
     }
@@ -318,6 +477,35 @@ protected override void FrameUpdate(FrameEventArgs args)
         if (!IsOpen)
             return;
 
+        if (_isDirty)
+        {
+            _isDirty = false;
+            BuildItemPieces();
+        }
+
+        var containerSystem = _entity.System<SharedContainerSystem>();
+
+        if (_backButton != null)
+        {
+            if (StorageEntity != null && _entity.System<StorageSystem>().NestedStorage)
+            {
+                if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) &&
+                    _entity.HasComponent<StorageComponent>(container.Owner))
+                {
+                    _backButton.Visible = true;
+                }
+                else
+                {
+                    _backButton.Visible = false;
+                }
+            }
+            // Hide the button.
+            else
+            {
+                _backButton.Visible = false;
+            }
+        }
+
         var itemSystem = _entity.System<ItemSystem>();
         var storageSystem = _entity.System<StorageSystem>();
         var handsSystem = _entity.System<HandsSystem>();
@@ -327,7 +515,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             child.ModulateSelfOverride = Color.FromHex("#222222");
         }
 
-        if (UserInterfaceManager.CurrentlyHovered is StorageContainer con && con != this)
+        if (UserInterfaceManager.CurrentlyHovered is StorageWindow con && con != this)
             return;
 
         if (!_entity.TryGetComponent<StorageComponent>(StorageEntity, out var storageComponent))
@@ -376,7 +564,7 @@ protected override void FrameUpdate(FrameEventArgs args)
                 continue;
 
             float spot = 0;
-            var marked = new List<Control>();
+            var marked = new ValueList<Control>();
 
             foreach (var location in locations.Value)
             {
@@ -503,14 +691,4 @@ protected override void KeyBindDown(GUIBoundKeyEventArgs args)
             }
         }
     }
-
-    public override void Close()
-    {
-        base.Close();
-
-        if (StorageEntity == null)
-            return;
-
-        _entity.System<StorageSystem>().CloseStorageWindow(StorageEntity.Value);
-    }
 }
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 97c9d8b7959..d73cacf67ca 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -1,17 +1,20 @@
+using System.Linq;
 using System.Numerics;
 using Content.Client.Examine;
 using Content.Client.Hands.Systems;
 using Content.Client.Interaction;
+using Content.Client.Storage;
 using Content.Client.Storage.Systems;
 using Content.Client.UserInterface.Systems.Hotbar.Widgets;
+using Content.Client.UserInterface.Systems.Info;
 using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Client.Verbs.UI;
 using Content.Shared.CCVar;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
-using Content.Shared.Item;
 using Content.Shared.Storage;
 using Robust.Client.Input;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.UserInterface.Controls;
@@ -23,26 +26,39 @@ namespace Content.Client.UserInterface.Systems.Storage;
 
 public sealed class StorageUIController : UIController, IOnSystemChanged<StorageSystem>
 {
+    /*
+     * Things are a bit over the shop but essentially
+     * - Clicking into storagewindow is handled via storagewindow
+     * - Clicking out of it is via ItemGridPiece
+     * - Dragging around is handled here
+     * - Drawing is handled via ItemGridPiece
+     * - StorageSystem handles any sim stuff around open windows.
+     */
+
     [Dependency] private readonly IConfigurationManager _configuration = default!;
-    [Dependency] private readonly IEntityManager _entity = default!;
     [Dependency] private readonly IInputManager _input = default!;
-    [Dependency] private readonly IUserInterfaceManager _ui = default!;
-
-    private readonly DragDropHelper<ItemGridPiece> _menuDragHelper;
-    private StorageContainer? _container;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly CloseRecentWindowUIController _closeRecentWindowUIController = default!;
+    [UISystemDependency] private readonly StorageSystem _storage = default!;
 
-    private Vector2? _lastContainerPosition;
+    /// <summary>
+    /// Cached positions for opening nested storage.
+    /// </summary>
+    private readonly Dictionary<EntityUid, Vector2> _reservedStorage = new();
 
-    private HotbarGui? Hotbar => UIManager.GetActiveUIWidgetOrNull<HotbarGui>();
+    private readonly DragDropHelper<ItemGridPiece> _menuDragHelper;
 
-    public ItemGridPiece? DraggingGhost;
+    public ItemGridPiece? DraggingGhost => _menuDragHelper.Dragged;
     public Angle DraggingRotation = Angle.Zero;
     public bool StaticStorageUIEnabled;
     public bool OpaqueStorageWindow;
+    private int _openStorageLimit = -1;
 
     public bool IsDragging => _menuDragHelper.IsDragging;
     public ItemGridPiece? CurrentlyDragging => _menuDragHelper.Dragged;
 
+    public bool WindowTitle { get; private set; } = false;
+
     public StorageUIController()
     {
         _menuDragHelper = new DragDropHelper<ItemGridPiece>(OnMenuBeginDrag, OnMenuContinueDrag, OnMenuEndDrag);
@@ -52,106 +68,137 @@ public override void Initialize()
     {
         base.Initialize();
 
+        UIManager.OnScreenChanged += OnScreenChange;
+
         _configuration.OnValueChanged(CCVars.StaticStorageUI, OnStaticStorageChanged, true);
         _configuration.OnValueChanged(CCVars.OpaqueStorageWindow, OnOpaqueWindowChanged, true);
+        _configuration.OnValueChanged(CCVars.StorageWindowTitle, OnStorageWindowTitle, true);
+        _configuration.OnValueChanged(CCVars.StorageLimit, OnStorageLimitChanged, true);
     }
 
-    public void OnSystemLoaded(StorageSystem system)
+    private void OnStorageLimitChanged(int obj)
     {
-        _input.FirstChanceOnKeyEvent += OnMiddleMouse;
-        system.StorageUpdated += OnStorageUpdated;
-        system.StorageOrderChanged += OnStorageOrderChanged;
-    }
-
-    public void OnSystemUnloaded(StorageSystem system)
-    {
-        _input.FirstChanceOnKeyEvent -= OnMiddleMouse;
-        system.StorageUpdated -= OnStorageUpdated;
-        system.StorageOrderChanged -= OnStorageOrderChanged;
+        _openStorageLimit = obj;
     }
 
-    private void OnStorageOrderChanged(Entity<StorageComponent>? nullEnt)
+    private void OnScreenChange((UIScreen? Old, UIScreen? New) obj)
     {
-        if (_container == null)
+        // Handle reconnects with hotbargui.
+
+        // Essentially HotbarGui / the screen gets loaded AFTER gamestates at the moment (because clientgameticker manually changes it via event)
+        // and changing this may be a massive change.
+        // So instead we'll just manually reload it for now.
+        if (!StaticStorageUIEnabled ||
+            obj.New == null ||
+            !EntityManager.TryGetComponent(_player.LocalEntity, out UserInterfaceUserComponent? userComp))
+        {
             return;
+        }
 
-        if (IsDragging)
-            _menuDragHelper.EndDrag();
-
-        _container.UpdateContainer(nullEnt);
+        // UISystemDependency not injected at this point so do it the old fashion way, I love ordering issues.
+        var uiSystem = EntityManager.System<SharedUserInterfaceSystem>();
 
-        if (nullEnt is not null)
+        foreach (var bui in uiSystem.GetActorUis((_player.LocalEntity.Value, userComp)))
         {
-            // center it if we knock it off screen somehow.
-            if (!StaticStorageUIEnabled &&
-                (_lastContainerPosition == null ||
-                _lastContainerPosition.Value.X < 0 ||
-                _lastContainerPosition.Value.Y < 0 ||
-                _lastContainerPosition.Value.X > _ui.WindowRoot.Width ||
-                _lastContainerPosition.Value.Y > _ui.WindowRoot.Height))
-            {
-                _container.OpenCenteredAt(new Vector2(0.5f, 0.75f));
-            }
-            else
-            {
-                _container.Open();
+            if (!uiSystem.TryGetOpenUi<StorageBoundUserInterface>(bui.Entity, StorageComponent.StorageUiKey.Key, out var storageBui))
+                continue;
 
-                var pos = !StaticStorageUIEnabled && _lastContainerPosition != null
-                    ? _lastContainerPosition.Value
-                    : Vector2.Zero;
+            storageBui.ReOpen();
+        }
+    }
 
-                LayoutContainer.SetPosition(_container, pos);
-            }
+    private void OnStorageWindowTitle(bool obj)
+    {
+        WindowTitle = obj;
+    }
 
-            if (StaticStorageUIEnabled)
-            {
-                // we have to orphan it here because Open() sets the parent.
-                _container.Orphan();
-                Hotbar?.StorageContainer.AddChild(_container);
-            }
-            _lastContainerPosition = _container.GlobalPosition;
-        }
-        else
-        {
-            _lastContainerPosition = _container.GlobalPosition;
-            _container.Close();
-        }
+    private void OnOpaqueWindowChanged(bool obj)
+    {
+        OpaqueStorageWindow = obj;
     }
 
     private void OnStaticStorageChanged(bool obj)
     {
-        if (StaticStorageUIEnabled == obj)
-            return;
-
         StaticStorageUIEnabled = obj;
-        _lastContainerPosition = null;
+    }
 
-        if (_container == null)
-            return;
+    public StorageWindow CreateStorageWindow(EntityUid uid)
+    {
+        var window = new StorageWindow();
+        window.MouseFilter = Control.MouseFilterMode.Pass;
 
-        if (!_container.IsOpen)
-            return;
+        window.OnPiecePressed += (args, piece) =>
+        {
+            OnPiecePressed(args, window, piece);
+        };
+        window.OnPieceUnpressed += (args, piece) =>
+        {
+            OnPieceUnpressed(args, window, piece);
+        };
 
-        _container.Orphan();
         if (StaticStorageUIEnabled)
         {
-            Hotbar?.StorageContainer.AddChild(_container);
+            var hotbar = UIManager.GetActiveUIWidgetOrNull<HotbarGui>();
+            // this lambda handles the nested storage case
+            // during nested storage, a parent window hides and a child window is
+            // immediately inserted to the end of the list
+            // we can reorder the newly inserted to the same index as the invisible
+            // window in order to prevent an invisible window from being replaced
+            // with a visible one in a different position
+            Action<Control?, Control> reorder = (parent, child) =>
+            {
+                if (parent is null)
+                    return;
+
+                var parentChildren = parent.Children.ToList();
+                var invisibleIndex = parentChildren.FindIndex(c => c.Visible == false);
+                if (invisibleIndex == -1)
+                    return;
+                child.SetPositionInParent(invisibleIndex);
+            };
+
+            if (_openStorageLimit == 2)
+            {
+                if (hotbar?.LeftStorageContainer.Children.Count(c => c.Visible) == 0)
+                {
+                    hotbar?.LeftStorageContainer.AddChild(window);
+                    reorder(hotbar?.LeftStorageContainer, window);
+                }
+                else
+                {
+                    hotbar?.RightStorageContainer.AddChild(window);
+                    reorder(hotbar?.RightStorageContainer, window);
+                }
+            }
+            else
+            {
+                hotbar?.SingleStorageContainer.AddChild(window);
+                reorder(hotbar?.SingleStorageContainer, window);
+            }
+
+            _closeRecentWindowUIController.SetMostRecentlyInteractedWindow(window);
         }
         else
         {
-            _ui.WindowRoot.AddChild(_container);
+            window.OpenCenteredLeft();
+
+            if (_reservedStorage.Remove(uid, out var pos))
+            {
+                LayoutContainer.SetPosition(window, pos);
+            }
         }
 
-        if (_entity.TryGetComponent<StorageComponent>(_container.StorageEntity, out var comp))
-            OnStorageOrderChanged((_container.StorageEntity.Value, comp));
+        return window;
     }
 
-    private void OnOpaqueWindowChanged(bool obj)
+    public void OnSystemLoaded(StorageSystem system)
     {
-        if (OpaqueStorageWindow == obj)
-            return;
-        OpaqueStorageWindow = obj;
-        _container?.BuildBackground();
+        _input.FirstChanceOnKeyEvent += OnMiddleMouse;
+    }
+
+    public void OnSystemUnloaded(StorageSystem system)
+    {
+        _input.FirstChanceOnKeyEvent -= OnMiddleMouse;
     }
 
     /// One might ask, Hey Emo, why are you parsing raw keyboard input just to rotate a rectangle?
@@ -190,7 +237,7 @@ private void OnMiddleMouse(KeyEventArgs keyEvent, KeyEventType type)
               binding.Mod3 == Keyboard.Key.Control))
             return;
 
-        if (!IsDragging && _entity.System<HandsSystem>().GetActiveHandEntity() == null)
+        if (!IsDragging && EntityManager.System<HandsSystem>().GetActiveHandEntity() == null)
             return;
 
         //clamp it to a cardinal.
@@ -198,43 +245,18 @@ private void OnMiddleMouse(KeyEventArgs keyEvent, KeyEventType type)
         if (DraggingGhost != null)
             DraggingGhost.Location.Rotation = DraggingRotation;
 
-        if (IsDragging || (_container != null && UIManager.CurrentlyHovered == _container))
+        if (IsDragging || UIManager.CurrentlyHovered is StorageWindow)
             keyEvent.Handle();
     }
 
-    private void OnStorageUpdated(Entity<StorageComponent> uid)
-    {
-        if (_container?.StorageEntity != uid)
-            return;
-
-        _container.BuildItemPieces();
-    }
-
-    public void RegisterStorageContainer(StorageContainer container)
-    {
-        if (_container != null)
-        {
-            container.OnPiecePressed -= OnPiecePressed;
-            container.OnPieceUnpressed -= OnPieceUnpressed;
-        }
-
-        _container = container;
-        container.OnPiecePressed += OnPiecePressed;
-        container.OnPieceUnpressed += OnPieceUnpressed;
-
-        if (!StaticStorageUIEnabled)
-            _container.Orphan();
-    }
-
-    private void OnPiecePressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
+    private void OnPiecePressed(GUIBoundKeyEventArgs args, StorageWindow window, ItemGridPiece control)
     {
-        if (IsDragging || !_container?.IsOpen == true)
+        if (IsDragging || !window.IsOpen)
             return;
 
         if (args.Function == ContentKeyFunctions.MoveStoredItem)
         {
             DraggingRotation = control.Location.Rotation;
-
             _menuDragHelper.MouseDown(control);
             _menuDragHelper.Update(0f);
 
@@ -242,17 +264,17 @@ private void OnPiecePressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
         }
         else if (args.Function == ContentKeyFunctions.SaveItemLocation)
         {
-            if (_container?.StorageEntity is not {} storage)
+            if (window.StorageEntity is not {} storage)
                 return;
 
-            _entity.RaisePredictiveEvent(new StorageSaveItemLocationEvent(
-                _entity.GetNetEntity(control.Entity),
-                _entity.GetNetEntity(storage)));
+            EntityManager.RaisePredictiveEvent(new StorageSaveItemLocationEvent(
+                EntityManager.GetNetEntity(control.Entity),
+                EntityManager.GetNetEntity(storage)));
             args.Handle();
         }
         else if (args.Function == ContentKeyFunctions.ExamineEntity)
         {
-            _entity.System<ExamineSystem>().DoExamine(control.Entity);
+            EntityManager.System<ExamineSystem>().DoExamine(control.Entity);
             args.Handle();
         }
         else if (args.Function == EngineKeyFunctions.UseSecondary)
@@ -262,68 +284,102 @@ private void OnPiecePressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
         }
         else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
         {
-            _entity.RaisePredictiveEvent(
-                new InteractInventorySlotEvent(_entity.GetNetEntity(control.Entity), altInteract: false));
+            EntityManager.RaisePredictiveEvent(
+                new InteractInventorySlotEvent(EntityManager.GetNetEntity(control.Entity), altInteract: false));
             args.Handle();
         }
         else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
         {
-            _entity.RaisePredictiveEvent(new InteractInventorySlotEvent(_entity.GetNetEntity(control.Entity), altInteract: true));
+            EntityManager.RaisePredictiveEvent(new InteractInventorySlotEvent(EntityManager.GetNetEntity(control.Entity), altInteract: true));
             args.Handle();
         }
+
+        window.FlagDirty();
     }
 
-    private void OnPieceUnpressed(GUIBoundKeyEventArgs args, ItemGridPiece control)
+    private void OnPieceUnpressed(GUIBoundKeyEventArgs args, StorageWindow window, ItemGridPiece control)
     {
         if (args.Function != ContentKeyFunctions.MoveStoredItem)
             return;
 
-        if (_container?.StorageEntity is not { } storageEnt|| !_entity.TryGetComponent<StorageComponent>(storageEnt, out var storageComp))
+        // Want to get the control under the dragged control.
+        // This means we can drag the original control around (and not hide the original).
+        control.MouseFilter = Control.MouseFilterMode.Ignore;
+        var targetControl = UIManager.MouseGetControl(args.PointerLocation);
+        var targetStorage = targetControl as StorageWindow;
+        control.MouseFilter = Control.MouseFilterMode.Pass;
+
+        var localPlayer = _player.LocalEntity;
+        window.RemoveGrid(control);
+        window.FlagDirty();
+
+        // If we tried to drag it on top of another grid piece then cancel out.
+        if (targetControl is ItemGridPiece || window.StorageEntity is not { } sourceStorage || localPlayer == null)
+        {
+            window.Reclaim(control.Location, control);
+            args.Handle();
+            _menuDragHelper.EndDrag();
             return;
+        }
 
-        if (DraggingGhost is { } draggingGhost)
+        if (_menuDragHelper.IsDragging && DraggingGhost is { } draggingGhost)
         {
             var dragEnt = draggingGhost.Entity;
             var dragLoc = draggingGhost.Location;
-            var itemSys = _entity.System<SharedItemSystem>();
-
-            var position = _container.GetMouseGridPieceLocation(dragEnt, dragLoc);
-            var itemBounding = itemSys.GetAdjustedItemShape(dragEnt, dragLoc).GetBoundingBox();
-            var gridBounding = storageComp.Grid.GetBoundingBox();
-
-            // The extended bounding box for if this is out of the window is the grid bounding box dimensions combined
-            // with the item shape bounding box dimensions. Plus 1 on the left for the sidebar. This makes it so that.
-            // dropping an item on the floor requires dragging it all the way out of the window.
-            var left = gridBounding.Left - itemBounding.Width - 1;
-            var bottom = gridBounding.Bottom - itemBounding.Height;
-            var top = gridBounding.Top;
-            var right = gridBounding.Right;
-            var lenientBounding = new Box2i(left, bottom, right, top);
-
-            if (lenientBounding.Contains(position))
+
+            // Dragging in the same storage
+            // The existing ItemGridPiece just stops rendering but still exists so check if it's hovered.
+            if (targetStorage == window)
             {
-                _entity.RaisePredictiveEvent(new StorageSetItemLocationEvent(
-                    _entity.GetNetEntity(draggingGhost.Entity),
-                    _entity.GetNetEntity(storageEnt),
-                    new ItemStorageLocation(DraggingRotation, position)));
+                var position = targetStorage.GetMouseGridPieceLocation(dragEnt, dragLoc);
+                var newLocation = new ItemStorageLocation(DraggingRotation, position);
+
+                EntityManager.RaisePredictiveEvent(new StorageSetItemLocationEvent(
+                    EntityManager.GetNetEntity(draggingGhost.Entity),
+                    EntityManager.GetNetEntity(sourceStorage),
+                    newLocation));
+
+                window.Reclaim(newLocation, control);
             }
-            else
+            // Dragging to new storage
+            else if (targetStorage?.StorageEntity != null && targetStorage != window)
             {
-                _entity.RaisePredictiveEvent(new StorageRemoveItemEvent(
-                    _entity.GetNetEntity(draggingGhost.Entity),
-                    _entity.GetNetEntity(storageEnt)));
+                var position = targetStorage.GetMouseGridPieceLocation(dragEnt, dragLoc);
+                var newLocation = new ItemStorageLocation(DraggingRotation, position);
+
+                // Check it fits and we can move to hand (no free transfers).
+                if (_storage.ItemFitsInGridLocation(
+                        (dragEnt, null),
+                        (targetStorage.StorageEntity.Value, null),
+                        newLocation))
+                {
+                    // Can drop and move.
+                    EntityManager.RaisePredictiveEvent(new StorageTransferItemEvent(
+                        EntityManager.GetNetEntity(dragEnt),
+                        EntityManager.GetNetEntity(targetStorage.StorageEntity.Value),
+                        newLocation));
+
+                    targetStorage.Reclaim(newLocation, control);
+                    DraggingRotation = Angle.Zero;
+                }
+                else
+                {
+                    // Cancel it (rather than dropping).
+                    window.Reclaim(dragLoc, control);
+                }
             }
 
-            _menuDragHelper.EndDrag();
-            _container?.BuildItemPieces();
+            targetStorage?.FlagDirty();
         }
-        else //if we just clicked, then take it out of the bag.
+        // If we just clicked, then take it out of the bag.
+        else
         {
-            _menuDragHelper.EndDrag();
-            _entity.RaisePredictiveEvent(new StorageInteractWithItemEvent(
-                _entity.GetNetEntity(control.Entity),
-                _entity.GetNetEntity(storageEnt)));
+            EntityManager.RaisePredictiveEvent(new StorageInteractWithItemEvent(
+                EntityManager.GetNetEntity(control.Entity),
+                EntityManager.GetNetEntity(sourceStorage)));
         }
+
+        _menuDragHelper.EndDrag();
         args.Handle();
     }
 
@@ -332,14 +388,8 @@ private bool OnMenuBeginDrag()
         if (_menuDragHelper.Dragged is not { } dragged)
             return false;
 
+        DraggingGhost!.Orphan();
         DraggingRotation = dragged.Location.Rotation;
-        DraggingGhost = new ItemGridPiece(
-            (dragged.Entity, _entity.GetComponent<ItemComponent>(dragged.Entity)),
-            dragged.Location,
-            _entity);
-        DraggingGhost.MouseFilter = Control.MouseFilterMode.Ignore;
-        DraggingGhost.Visible = true;
-        DraggingGhost.Orphan();
 
         UIManager.PopupRoot.AddChild(DraggingGhost);
         SetDraggingRotation();
@@ -350,6 +400,7 @@ private bool OnMenuContinueDrag(float frameTime)
     {
         if (DraggingGhost == null)
             return false;
+
         SetDraggingRotation();
         return true;
     }
@@ -362,7 +413,7 @@ private void SetDraggingRotation()
         var offset = ItemGridPiece.GetCenterOffset(
             (DraggingGhost.Entity, null),
             new ItemStorageLocation(DraggingRotation, Vector2i.Zero),
-            _entity);
+            EntityManager);
 
         // I don't know why it divides the position by 2. Hope this helps! -emo
         LayoutContainer.SetPosition(DraggingGhost, UIManager.MousePositionScaled.Position / 2 - offset );
@@ -372,18 +423,13 @@ private void OnMenuEndDrag()
     {
         if (DraggingGhost == null)
             return;
-        DraggingGhost.Visible = false;
-        DraggingGhost = null;
+
         DraggingRotation = Angle.Zero;
     }
 
     public override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
-
         _menuDragHelper.Update(args.DeltaSeconds);
-
-        if (!StaticStorageUIEnabled && _container?.Parent != null && _lastContainerPosition != null)
-            _lastContainerPosition = _container.GlobalPosition;
     }
-}
+}
\ No newline at end of file
diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
index ccd9636d776..d9548d0f02b 100644
--- a/Content.Client/Viewport/ScalingViewport.cs
+++ b/Content.Client/Viewport/ScalingViewport.cs
@@ -144,7 +144,7 @@ protected override void KeyBindUp(GUIBoundKeyEventArgs args)
             _inputManager.ViewportKeyEvent(this, args);
         }
 
-        protected override void Draw(DrawingHandleScreen handle)
+        protected override void Draw(IRenderHandle handle)
         {
             EnsureViewportCreated();
 
@@ -170,7 +170,7 @@ protected override void Draw(DrawingHandleScreen handle)
             var drawBox = GetDrawBox();
             var drawBoxGlobal = drawBox.Translated(GlobalPixelPosition);
             _viewport.RenderScreenOverlaysBelow(handle, this, drawBoxGlobal);
-            handle.DrawTextureRect(_viewport.RenderTarget.Texture, drawBox);
+            handle.DrawingHandleScreen.DrawTextureRect(_viewport.RenderTarget.Texture, drawBox);
             _viewport.RenderScreenOverlaysAbove(handle, this, drawBoxGlobal);
         }
 
diff --git a/Content.IntegrationTests/PoolManagerTestEventHandler.cs b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
index cd35c7c7bdd..79d77c96b7e 100644
--- a/Content.IntegrationTests/PoolManagerTestEventHandler.cs
+++ b/Content.IntegrationTests/PoolManagerTestEventHandler.cs
@@ -4,7 +4,7 @@
 public sealed class PoolManagerTestEventHandler
 {
     // This value is completely arbitrary.
-    private static TimeSpan MaximumTotalTestingTimeLimit => TimeSpan.FromMinutes(20);
+    private static TimeSpan MaximumTotalTestingTimeLimit => TimeSpan.FromMinutes(120);
     private static TimeSpan HardStopTimeLimit => MaximumTotalTestingTimeLimit.Add(TimeSpan.FromMinutes(1));
 
     [OneTimeSetUp]
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 22b746d2c92..32d4a81b809 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -52,27 +52,27 @@ public sealed class PostMapInitTest
             "CentCommHarmony",
             "MeteorArena",
             "NukieOutpost",
-            "Core",
-            "Pebble", //DeltaV
-            "Edge", //DeltaV
-            "Saltern",
-            "Shoukou", //DeltaV
-            "Tortuga", //DeltaV
-            "Arena", //DeltaV
-            "Asterisk", //DeltaV
-            "Glacier", //DeltaV
-            "TheHive", //DeltaV
-            "Hammurabi", //DeltaV
-            "Lighthouse", //DeltaV
-            "Submarine", //DeltaV
-            "Gax",
-            "Rad",
-            "Europa",
-            "Meta",
-            "Box",
-            "Lambda",
-            "Bagel",
-            "Northway"
+            "Core", // No current maintainer. In need of a rework...
+            // "Pebble", // De-rotated, no current maintainer.
+            // "Edge", // De-rotated, no current maintainer.
+            "Saltern", // Maintained by the Sin Mapping Team, ODJ, and TCJ.
+            "Shoukou", // Maintained by Violet
+            // "Tortuga", // De-rotated, no current maintainer.
+            // "Arena", // De-rotated, no current maintainer.
+            // "Asterisk", // De-rotated, no current maintainer.
+            "Glacier", // Maintained by Violet
+            // "TheHive", // De-rotated, no current maintainer.
+            // "Hammurabi", // De-rotated, no current maintainer.
+            "Lighthouse", // Maintained by Violet
+            // "Submarine", // De-rotated, no current maintainer.
+            "Gax", // Maintained by Estacao Pirata
+            "Rad", // Maintained by Estacao Pirata
+            // "Europa", // De-rotated, has significant issues.
+            "Meta", // Maintained by Estacao Pirata
+            "Box", // Maintained by Estacao Pirata
+            "Lambda", // Maintained by Estacao Pirata
+            "Bagel", // Maintained by Estacao Pirata
+            "Northway" // Maintained by Violet
         };
 
         /// <summary>
diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
index 213da5d7862..1bfcd8ab608 100644
--- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
+++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs
@@ -39,12 +39,12 @@ await server.WaitAssertion(() =>
                 {
                     var mapGrid = mapManager.CreateGridEntity(mapId);
                     xformSystem.SetWorldPosition(mapGrid, new Vector2(10, 10));
-                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(1, (TileRenderFlag) 1, 255));
+                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(typeId: 1, flags: 1, variant: 255));
                 }
                 {
                     var mapGrid = mapManager.CreateGridEntity(mapId);
                     xformSystem.SetWorldPosition(mapGrid, new Vector2(-8, -8));
-                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(2, (TileRenderFlag) 1, 254));
+                    mapSystem.SetTile(mapGrid, new Vector2i(0, 0), new Tile(typeId: 2, flags: 1, variant: 254));
                 }
 
                 Assert.Multiple(() => mapLoader.SaveMap(mapId, mapPath));
@@ -73,7 +73,7 @@ await server.WaitAssertion(() =>
                     Assert.Multiple(() =>
                     {
                         Assert.That(xformSystem.GetWorldPosition(gridXform), Is.EqualTo(new Vector2(10, 10)));
-                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(1, (TileRenderFlag) 1, 255)));
+                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(typeId: 1, flags: 1, variant: 255)));
                     });
                 }
                 {
@@ -87,7 +87,7 @@ await server.WaitAssertion(() =>
                     Assert.Multiple(() =>
                     {
                         Assert.That(xformSystem.GetWorldPosition(gridXform), Is.EqualTo(new Vector2(-8, -8)));
-                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(2, (TileRenderFlag) 1, 254)));
+                        Assert.That(mapSystem.GetTileRef(gridUid, mapGrid, new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(typeId: 2, flags: 1, variant: 254)));
                     });
                 }
             });
diff --git a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
index 34402dd5e62..1145449055f 100644
--- a/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
+++ b/Content.IntegrationTests/Tests/Storage/StorageInteractionTest.cs
@@ -69,7 +69,7 @@ private ItemGridPiece GetStorageControl(NetEntity target)
     {
         var uid = ToClient(target);
         var hotbar = GetWidget<HotbarGui>();
-        var storageContainer  = GetControlFromField<Control>(nameof(HotbarGui.StorageContainer), hotbar);
+        var storageContainer  = GetControlFromField<Control>(nameof(HotbarGui.SingleStorageContainer), hotbar);
         return GetControlFromChildren<ItemGridPiece>(c => c.Entity == uid, storageContainer);
     }
 }
diff --git a/Content.IntegrationTests/Tests/StoreTests.cs b/Content.IntegrationTests/Tests/StoreTests.cs
index 6bb43443152..1fdcbdbe727 100644
--- a/Content.IntegrationTests/Tests/StoreTests.cs
+++ b/Content.IntegrationTests/Tests/StoreTests.cs
@@ -5,6 +5,7 @@
 using Content.Server.Traitor.Uplink;
 using Content.Shared.FixedPoint;
 using Content.Shared.Inventory;
+using Content.Shared.Mind;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
 using Content.Shared.StoreDiscount.Components;
@@ -64,6 +65,7 @@ public async Task StoreDiscountAndRefund()
         await server.WaitAssertion(() =>
         {
             var invSystem = entManager.System<InventorySystem>();
+            var mindSystem = entManager.System<SharedMindSystem>();
 
             human = entManager.SpawnEntity("HumanUniformDummy", coordinates);
             uniform = entManager.SpawnEntity("UniformDummy", coordinates);
@@ -72,6 +74,9 @@ await server.WaitAssertion(() =>
             Assert.That(invSystem.TryEquip(human, uniform, "jumpsuit"));
             Assert.That(invSystem.TryEquip(human, pda, "id"));
 
+            var mind = mindSystem.CreateMind(null);
+            mindSystem.TransferTo(mind, human, mind: mind);
+
             FixedPoint2 originalBalance = 20;
             uplinkSystem.AddUplink(human, originalBalance, null, true);
 
@@ -79,11 +84,11 @@ await server.WaitAssertion(() =>
             var discountComponent = entManager.GetComponent<StoreDiscountComponent>(pda);
             Assert.That(
                 discountComponent.Discounts,
-                Has.Exactly(3).Items,
-                $"After applying discount total discounted items count was expected to be '3' "
+                Has.Exactly(6).Items,
+                $"After applying discount total discounted items count was expected to be '6' "
                 + $"but was actually {discountComponent.Discounts.Count}- this can be due to discount "
                 + $"categories settings (maxItems, weight) not being realistically set, or default "
-                + $"discounted count being changed from '3' in StoreDiscountSystem.InitializeDiscounts."
+                + $"discounted count being changed from '6' in StoreDiscountSystem.InitializeDiscounts."
             );
             var discountedListingItems = storeComponent.FullListingsCatalog
                                                        .Where(x => x.IsCostModified)
diff --git a/Content.Server/Cargo/Components/StationStockMarketComponent.cs b/Content.Server/Cargo/Components/StationStockMarketComponent.cs
index 4ea9bd43133..b52290c50a3 100644
--- a/Content.Server/Cargo/Components/StationStockMarketComponent.cs
+++ b/Content.Server/Cargo/Components/StationStockMarketComponent.cs
@@ -16,7 +16,7 @@ public sealed partial class StationStockMarketComponent : Component
     /// The list of companies you can invest in
     /// </summary>
     [DataField]
-    public List<StockCompanyStruct> Companies = [];
+    public List<StockCompany> Companies = [];
 
     /// <summary>
     /// The list of shares owned by the station
@@ -53,19 +53,12 @@ public sealed partial class StationStockMarketComponent : Component
     [DataField]
     public List<MarketChange> MarketChanges =
     [
-        new() { Chance = 0.86f, Range = new Vector2(-0.05f, 0.05f) }, // Minor
-        new() { Chance = 0.10f, Range = new Vector2(-0.3f, 0.2f) }, // Moderate
-        new() { Chance = 0.03f, Range = new Vector2(-0.5f, 1.5f) }, // Major
-        new() { Chance = 0.01f, Range = new Vector2(-0.9f, 4.0f) }, // Catastrophic
+        new(0.86f, new Vector2(-0.05f, 0.05f)), // Minor
+        new(0.10f, new Vector2(-0.3f, 0.2f)), // Moderate
+        new(0.03f, new Vector2(-0.5f, 1.5f)), // Major
+        new(0.01f, new Vector2(-0.9f, 4.0f)), // Catastrophic
     ];
 }
 
-[DataDefinition]
-public sealed partial class MarketChange
-{
-    [DataField(required: true)]
-    public float Chance;
-
-    [DataField(required: true)]
-    public Vector2 Range;
-}
+[DataRecord]
+public record struct MarketChange(float Chance, Vector2 Range);
diff --git a/Content.Server/Cargo/Systems/StockMarketSystem.cs b/Content.Server/Cargo/Systems/StockMarketSystem.cs
index 20c840728e0..53c9bb957a0 100644
--- a/Content.Server/Cargo/Systems/StockMarketSystem.cs
+++ b/Content.Server/Cargo/Systems/StockMarketSystem.cs
@@ -9,9 +9,7 @@
 using Content.Shared.CartridgeLoader;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.Database;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -22,15 +20,14 @@ namespace Content.Server.DeltaV.Cargo.Systems;
 /// </summary>
 public sealed class StockMarketSystem : EntitySystem
 {
-    [Dependency] private readonly AccessReaderSystem _accessSystem = default!;
+    [Dependency] private readonly AccessReaderSystem _access = default!;
     [Dependency] private readonly CargoSystem _cargo = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly ILogManager _log = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+    [Dependency] private readonly IdCardSystem _idCard = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;
 
     private ISawmill _sawmill = default!;
     private const float MaxPrice = 262144; // 1/64 of max safe integer
@@ -64,38 +61,27 @@ private void OnStockTradingMessage(Entity<StockTradingCartridgeComponent> ent, r
         if (args is not StockTradingUiMessageEvent message)
             return;
 
+        var user = args.Actor;
         var companyIndex = message.CompanyIndex;
-        var amount = (int)message.Amount;
-        var station = ent.Comp.Station;
+        var amount = message.Amount;
         var loader = GetEntity(args.LoaderUid);
-        var xform = Transform(loader);
 
         // Ensure station and stock market components are valid
-        if (station == null || !TryComp<StationStockMarketComponent>(station, out var stockMarket))
+        if (ent.Comp.Station is not {} station || !TryComp<StationStockMarketComponent>(station, out var stockMarket))
             return;
 
         // Validate company index
         if (companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
             return;
 
-        if (!TryComp<AccessReaderComponent>(ent.Owner, out var access))
+        if (!TryComp<AccessReaderComponent>(ent, out var access))
             return;
 
-        // Attempt to retrieve ID card from loader
-        IdCardComponent? idCard = null;
-        if (_idCardSystem.TryGetIdCard(loader, out var pdaId))
-            idCard = pdaId;
-
-        // Play deny sound and exit if access is not allowed
-        if (idCard == null || !_accessSystem.IsAllowed(pdaId.Owner, ent.Owner, access))
+        // Attempt to retrieve ID card from loader,
+        // play deny sound and exit if access is not allowed
+        if (!_idCard.TryGetIdCard(loader, out var idCard) || !_access.IsAllowed(idCard, ent.Owner, access))
         {
-            _audio.PlayEntity(
-                stockMarket.DenySound,
-                Filter.Empty().AddInRange(_transform.GetMapCoordinates(loader, xform), 0.05f),
-                loader,
-                true,
-                AudioParams.Default.WithMaxDistance(0.05f)
-            );
+            _audio.PlayEntity(stockMarket.DenySound, loader, user);
             return;
         }
 
@@ -110,15 +96,15 @@ private void OnStockTradingMessage(Entity<StockTradingCartridgeComponent> ent, r
                 case StockTradingUiAction.Buy:
                     _adminLogger.Add(LogType.Action,
                         LogImpact.Medium,
-                        $"{ToPrettyString(loader)} attempting to buy {amount} stocks of {company.LocalizedDisplayName}");
-                    success = TryBuyStocks(station.Value, stockMarket, companyIndex, amount);
+                        $"{ToPrettyString(user):user} attempting to buy {amount} stocks of {company.LocalizedDisplayName}");
+                    success = TryChangeStocks(station, stockMarket, companyIndex, amount, user);
                     break;
 
                 case StockTradingUiAction.Sell:
                     _adminLogger.Add(LogType.Action,
                         LogImpact.Medium,
-                        $"{ToPrettyString(loader)} attempting to sell {amount} stocks of {company.LocalizedDisplayName}");
-                    success = TrySellStocks(station.Value, stockMarket, companyIndex, amount);
+                        $"{ToPrettyString(user):user} attempting to sell {amount} stocks of {company.LocalizedDisplayName}");
+                    success = TryChangeStocks(station, stockMarket, companyIndex, -amount, user);
                     break;
 
                 default:
@@ -126,23 +112,29 @@ private void OnStockTradingMessage(Entity<StockTradingCartridgeComponent> ent, r
             }
 
             // Play confirmation sound if the transaction was successful
-            _audio.PlayEntity(success ? stockMarket.ConfirmSound : stockMarket.DenySound, loader, args.Actor);
+            _audio.PlayEntity(success ? stockMarket.ConfirmSound : stockMarket.DenySound, loader, user);
         }
         finally
         {
             // Raise the event to update the UI regardless of outcome
-            var ev = new StockMarketUpdatedEvent(station.Value);
-            RaiseLocalEvent(ev);
+            UpdateStockMarket(station);
         }
     }
 
-    private bool TryBuyStocks(
+    private void UpdateStockMarket(EntityUid station)
+    {
+        var ev = new StockMarketUpdatedEvent(station);
+        RaiseLocalEvent(ref ev);
+    }
+
+    private bool TryChangeStocks(
         EntityUid station,
         StationStockMarketComponent stockMarket,
         int companyIndex,
-        int amount)
+        int amount,
+        EntityUid user)
     {
-        if (amount <= 0 || companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
+        if (amount == 0 || companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
             return false;
 
         // Check if the station has a bank account
@@ -152,58 +144,37 @@ private bool TryBuyStocks(
         var company = stockMarket.Companies[companyIndex];
         var totalValue = (int)Math.Round(company.CurrentPrice * amount);
 
-        // See if we can afford it
-        if (bank.Balance < totalValue)
-            return false;
-
         if (!stockMarket.StockOwnership.TryGetValue(companyIndex, out var currentOwned))
             currentOwned = 0;
 
-        // Update the bank account
-        _cargo.UpdateBankAccount(station, bank, -totalValue);
-        stockMarket.StockOwnership[companyIndex] = currentOwned + amount;
-
-        // Log the transaction
-        _adminLogger.Add(LogType.Action,
-            LogImpact.Medium,
-            $"[StockMarket] Bought {amount} stocks of {company.LocalizedDisplayName} at {company.CurrentPrice:F2} credits each (Total: {totalValue})");
-
-        return true;
-    }
-
-    private bool TrySellStocks(
-        EntityUid station,
-        StationStockMarketComponent stockMarket,
-        int companyIndex,
-        int amount)
-    {
-        if (amount <= 0 || companyIndex < 0 || companyIndex >= stockMarket.Companies.Count)
-            return false;
-
-        // Check if the station has a bank account
-        if (!TryComp<StationBankAccountComponent>(station, out var bank))
-            return false;
-
-        if (!stockMarket.StockOwnership.TryGetValue(companyIndex, out var currentOwned) || currentOwned < amount)
-            return false;
-
-        var company = stockMarket.Companies[companyIndex];
-        var totalValue = (int)Math.Round(company.CurrentPrice * amount);
+        if (amount > 0)
+        {
+            // Buying: see if we can afford it
+            if (bank.Balance < totalValue)
+                return false;
+        }
+        else
+        {
+            // Selling: see if we have enough stocks to sell
+            var selling = -amount;
+            if (currentOwned < selling)
+                return false;
+        }
 
-        // Update stock ownership
-        var newAmount = currentOwned - amount;
+        var newAmount = currentOwned + amount;
         if (newAmount > 0)
             stockMarket.StockOwnership[companyIndex] = newAmount;
         else
             stockMarket.StockOwnership.Remove(companyIndex);
 
-        // Update the bank account
-        _cargo.UpdateBankAccount(station, bank, totalValue);
+        // Update the bank account (take away for buying and give for selling)
+        _cargo.UpdateBankAccount(station, bank, -totalValue);
 
         // Log the transaction
+        var verb = amount > 0 ? "bought" : "sold";
         _adminLogger.Add(LogType.Action,
             LogImpact.Medium,
-            $"[StockMarket] Sold {amount} stocks of {company.LocalizedDisplayName} at {company.CurrentPrice:F2} credits each (Total: {totalValue})");
+            $"[StockMarket] {ToPrettyString(user):user} {verb} {Math.Abs(amount)} stocks of {company.LocalizedDisplayName} at {company.CurrentPrice:F2} credits each (Total: {totalValue})");
 
         return true;
     }
@@ -216,7 +187,7 @@ private void UpdateStockPrices(EntityUid station, StationStockMarketComponent st
             var changeType = DetermineMarketChange(stockMarket.MarketChanges);
             var multiplier = CalculatePriceMultiplier(changeType);
 
-            UpdatePriceHistory(company);
+            UpdatePriceHistory(ref company);
 
             // Update price with multiplier
             var oldPrice = company.CurrentPrice;
@@ -234,8 +205,7 @@ private void UpdateStockPrices(EntityUid station, StationStockMarketComponent st
             var percentChange = (company.CurrentPrice - oldPrice) / oldPrice * 100;
 
             // Raise the event
-            var ev = new StockMarketUpdatedEvent(station);
-            RaiseLocalEvent(ev);
+            UpdateStockMarket(station);
 
             // Log it
             _adminLogger.Add(LogType.Action,
@@ -264,13 +234,12 @@ public bool TryChangeStocksPrice(EntityUid station,
             return false;
 
         var company = stockMarket.Companies[companyIndex];
-        UpdatePriceHistory(company);
+        UpdatePriceHistory(ref company);
 
         company.CurrentPrice = MathF.Max(newPrice, company.BasePrice * 0.1f);
         stockMarket.Companies[companyIndex] = company;
 
-        var ev = new StockMarketUpdatedEvent(station);
-        RaiseLocalEvent(ev);
+        UpdateStockMarket(station);
         return true;
     }
 
@@ -284,7 +253,7 @@ public bool TryAddCompany(EntityUid station,
         string displayName)
     {
         // Create a new company struct with the specified parameters
-        var company = new StockCompanyStruct
+        var company = new StockCompany
         {
             LocalizedDisplayName = displayName, // Assume there's no Loc for it
             BasePrice = basePrice,
@@ -292,36 +261,33 @@ public bool TryAddCompany(EntityUid station,
             PriceHistory = [],
         };
 
+        UpdatePriceHistory(ref company);
         stockMarket.Companies.Add(company);
-        UpdatePriceHistory(company);
 
-        var ev = new StockMarketUpdatedEvent(station);
-        RaiseLocalEvent(ev);
+        UpdateStockMarket(station);
 
         return true;
     }
 
     /// <summary>
-    /// Attempts to add a new company to the station using the StockCompanyStruct
+    /// Attempts to add a new company to the station using the StockCompany
     /// </summary>
     /// <returns>False if the company already exists, true otherwise</returns>
-    public bool TryAddCompany(EntityUid station,
-        StationStockMarketComponent stockMarket,
-        StockCompanyStruct company)
+    public bool TryAddCompany(Entity<StationStockMarketComponent> station,
+        StockCompany company)
     {
-        // Add the new company to the dictionary
-        stockMarket.Companies.Add(company);
-
         // Make sure it has a price history
-        UpdatePriceHistory(company);
+        UpdatePriceHistory(ref company);
 
-        var ev = new StockMarketUpdatedEvent(station);
-        RaiseLocalEvent(ev);
+        // Add the new company to the dictionary
+        station.Comp.Companies.Add(company);
+
+        UpdateStockMarket(station);
 
         return true;
     }
 
-    private static void UpdatePriceHistory(StockCompanyStruct company)
+    private static void UpdatePriceHistory(ref StockCompany company)
     {
         // Create if null
         company.PriceHistory ??= [];
@@ -370,7 +336,9 @@ private float CalculatePriceMultiplier(MarketChange change)
         return Math.Clamp(result, change.Range.X, change.Range.Y);
     }
 }
-public sealed class StockMarketUpdatedEvent(EntityUid station) : EntityEventArgs
-{
-    public EntityUid Station = station;
-}
+
+/// <summary>
+/// Broadcast whenever a stock market is updated.
+/// </summary>
+[ByRefEvent]
+public record struct StockMarketUpdatedEvent(EntityUid Station);
diff --git a/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
new file mode 100644
index 00000000000..7c0f29efa6e
--- /dev/null
+++ b/Content.Server/Chemistry/EntitySystems/FillableOneTimeInjectorSystem.cs
@@ -0,0 +1,438 @@
+using Content.Server.Abilities.Chitinid;
+using Content.Server.Body.Components;
+using Content.Server.Body.Systems;
+using Content.Server.Chat.Managers;
+using Content.Shared.Chat;
+using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Components.SolutionManager;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Database;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Forensics;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Interaction;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Stacks;
+using Robust.Server.Player;
+
+namespace Content.Server.Chemistry.EntitySystems;
+
+public sealed class FillableOneTimeInjectorSystem : SharedFillableOneTimeInjectorSystem
+{
+    [Dependency] private readonly BloodstreamSystem _blood = default!;
+    [Dependency] private readonly ReactiveSystem _reactiveSystem = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+    private const ChatChannel BlockInjectionDenyChannel = ChatChannel.Emotes;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FillableOneTimeInjectorComponent, InjectorDoAfterEvent>(OnInjectDoAfter);
+        SubscribeLocalEvent<FillableOneTimeInjectorComponent, AfterInteractEvent>(OnInjectorAfterInteract);
+    }
+
+    private void UseInjector(Entity<FillableOneTimeInjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        bool isDrawing = injector.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Draw;
+
+        // Is the one-time use fillable injector already spent?
+        if (injector.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Spent)
+            return;
+
+        // Handle injecting/drawing for solutions
+        if (!isDrawing)
+        {
+            if (SolutionContainers.TryGetInjectableSolution(target, out var injectableSolution, out _))
+            {
+                TryInject(injector, target, injectableSolution.Value, user, false);
+            }
+            else if (SolutionContainers.TryGetRefillableSolution(target, out var refillableSolution, out _))
+            {
+                TryInject(injector, target, refillableSolution.Value, user, true);
+            }
+            else if (TryComp<BloodstreamComponent>(target, out var bloodstream))
+            {
+                TryInjectIntoBloodstream(injector, (target, bloodstream), user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-transfer-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector, user);
+            }
+        }
+        else if (isDrawing)
+        {
+            // Draw from a bloodstream, if the target has that
+            if (TryComp<BloodstreamComponent>(target, out var stream) &&
+                SolutionContainers.ResolveSolution(target, stream.BloodSolutionName, ref stream.BloodSolution))
+            {
+                TryDraw(injector, (target, stream), stream.BloodSolution.Value, user);
+                return;
+            }
+
+            // Draw from an object (food, beaker, etc)
+            if (SolutionContainers.TryGetDrawableSolution(target, out var drawableSolution, out _))
+            {
+                TryDraw(injector, target, drawableSolution.Value, user);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-cannot-draw-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            }
+        }
+    }
+
+    private void OnInjectDoAfter(Entity<FillableOneTimeInjectorComponent> entity, ref InjectorDoAfterEvent args)
+    {
+        if (args.Cancelled || args.Handled || args.Args.Target == null || entity.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Spent)
+            return;
+
+        UseInjector(entity, args.Args.Target.Value, args.Args.User);
+        args.Handled = true;
+    }
+
+    private void OnInjectorAfterInteract(Entity<FillableOneTimeInjectorComponent> entity, ref AfterInteractEvent args)
+    {
+        if (args.Handled || !args.CanReach || entity.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Spent)
+            return;
+
+        //Make sure we have the attacking entity
+        if (args.Target is not { Valid: true } target || !HasComp<SolutionContainerManagerComponent>(entity))
+            return;
+
+        // Is the target a mob? If yes, use a do-after to give them time to respond.
+        if (HasComp<MobStateComponent>(target) || HasComp<BloodstreamComponent>(target))
+        {
+            InjectDoAfter(entity, target, args.User);
+            args.Handled = true;
+            return;
+        }
+
+        UseInjector(entity, target, args.User);
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Send informative pop-up messages and wait for a do-after to complete.
+    /// </summary>
+    private void InjectDoAfter(Entity<FillableOneTimeInjectorComponent> injector, EntityUid target, EntityUid user)
+    {
+        if (injector.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Spent)
+            return;
+
+        if (TryComp<BlockInjectionComponent>(target, out var blockComponent)) // DeltaV
+        {
+            var msg = Loc.GetString($"injector-component-deny-{blockComponent.BlockReason}");
+            Popup.PopupEntity(msg, target, user);
+
+            if (!_playerManager.TryGetSessionByEntity(target, out var session))
+                return;
+
+            _chat.ChatMessageToOne(
+                BlockInjectionDenyChannel,
+                msg,
+                msg,
+                EntityUid.Invalid,
+                false,
+                session.Channel);
+            return;
+        }
+
+        bool isDrawing = injector.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Draw;
+
+        // Create a pop-up for the user
+        if (isDrawing)
+        {
+            Popup.PopupEntity(Loc.GetString("injector-component-drawing-user"), target, user);
+        }
+        else
+        {
+            Popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
+        }
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out _, out var solution))
+            return;
+
+        var actualDelay = MathHelper.Max(injector.Comp.Delay, TimeSpan.FromSeconds(1));
+        float amountToInject;
+        if (isDrawing)
+        {
+            // additional delay is based on actual volume left to draw in syringe when smaller than transfer amount
+            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), (solution.MaxVolume - solution.Volume).Float());
+        }
+        else
+        {
+            // additional delay is based on actual volume left to inject in syringe when smaller than transfer amount
+            amountToInject = Math.Min(injector.Comp.TransferAmount.Float(), solution.Volume.Float());
+        }
+
+        // Injections take 0.5 seconds longer per 5u of possible space/content
+        actualDelay += TimeSpan.FromSeconds(amountToInject / 10);
+
+        var isTarget = user != target;
+
+        if (isTarget)
+        {
+            // Create a pop-up for the target
+            var userName = Identity.Entity(user, EntityManager);
+            if (isDrawing)
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-drawing-target",
+    ("user", userName)), user, target);
+            }
+            else
+            {
+                Popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
+    ("user", userName)), user, target);
+            }
+
+            // Check if the target is incapacitated or in combat mode and modify time accordingly.
+            if (MobState.IsIncapacitated(target))
+            {
+                actualDelay /= 2.5f;
+            }
+            else if (Combat.IsInCombatMode(target))
+            {
+                // Slightly increase the delay when the target is in combat mode. Helps prevents cheese injections in
+                // combat with fast syringes & lag.
+                actualDelay += TimeSpan.FromSeconds(1);
+            }
+
+            // Add an admin log, using the "force feed" log type. It's not quite feeding, but the effect is the same.
+            if (!isDrawing)
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject {EntityManager.ToPrettyString(target):target} with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from {EntityManager.ToPrettyString(target):target}");
+            }
+        }
+        else
+        {
+            // Self-injections take half as long.
+            actualDelay /= 2;
+
+            if (!isDrawing)
+            {
+                AdminLogger.Add(LogType.Ingestion,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to inject themselves with a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution}.");
+            }
+            else
+            {
+                AdminLogger.Add(LogType.ForceFeed,
+                    $"{EntityManager.ToPrettyString(user):user} is attempting to draw {injector.Comp.TransferAmount.ToString()} units from themselves.");
+            }
+        }
+
+        DoAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, actualDelay, new InjectorDoAfterEvent(), injector.Owner, target: target, used: injector.Owner)
+        {
+            BreakOnMove = true,
+            BreakOnWeightlessMove = false,
+            BreakOnDamage = true,
+            NeedHand = true,
+            BreakOnHandChange = true,
+            MovementThreshold = 0.1f,
+        });
+    }
+
+    private void TryInjectIntoBloodstream(Entity<FillableOneTimeInjectorComponent> injector, Entity<BloodstreamComponent> target,
+        EntityUid user)
+    {
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        if (!SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution, out var chemSolution) || injector.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Inject)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
+                out var solution) || solution.Volume == 0)
+            return;
+
+        var realTransferAmount = FixedPoint2.Min(injector.Comp.TransferAmount, chemSolution.AvailableVolume);
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-cannot-inject-message",
+                    ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, realTransferAmount);
+
+        _blood.TryAddToChemicals(target, removedSolution, target.Comp);
+
+        _reactiveSystem.DoEntityReaction(target, removedSolution, ReactionMethod.Injection);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-inject-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, target);
+    }
+
+    private void TryInject(Entity<FillableOneTimeInjectorComponent> injector, EntityUid targetEntity,
+        Entity<SolutionComponent> targetSolution, EntityUid user, bool asRefill)
+    {
+        if (HasComp<BlockInjectionComponent>(targetEntity))  // DeltaV
+            return;
+
+        if (injector.Comp.ToggleState == FillableOneTimeInjectorToggleMode.Spent)
+            return;
+
+        if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
+                out var solution) || solution.Volume == 0)
+            return;
+
+        // Get transfer amount. May be smaller than _transferAmount if not enough room
+        var realTransferAmount =
+            FixedPoint2.Min(injector.Comp.TransferAmount, targetSolution.Comp.Solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-already-full-message",
+                    ("target", Identity.Entity(targetEntity, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        Solution removedSolution;
+        if (TryComp<StackComponent>(targetEntity, out var stack))
+            removedSolution = SolutionContainers.SplitStackSolution(soln.Value, realTransferAmount, stack.Count);
+        else
+            removedSolution = SolutionContainers.SplitSolution(soln.Value, realTransferAmount);
+
+        _reactiveSystem.DoEntityReaction(targetEntity, removedSolution, ReactionMethod.Injection);
+
+        if (!asRefill)
+            SolutionContainers.Inject(targetEntity, targetSolution, removedSolution);
+        else
+            SolutionContainers.Refill(targetEntity, targetSolution, removedSolution);
+
+        Popup.PopupEntity(Loc.GetString("injector-component-transfer-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(targetEntity, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterInject(injector, targetEntity);
+    }
+
+    private void AfterInject(Entity<FillableOneTimeInjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to draw after draining it.
+        if (SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var user,
+                out var solution) && solution.Volume == 0)
+        {
+            SetMode(injector, FillableOneTimeInjectorToggleMode.Spent);
+            Popup.PopupClient(Loc.GetString("injector-spent-text"), injector, user);
+        }
+        // Leave some DNA from the injectee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void AfterDraw(Entity<FillableOneTimeInjectorComponent> injector, EntityUid target)
+    {
+        // Automatically set syringe to inject after filling it completely.
+        if (SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var user,
+                out var solution) && solution.AvailableVolume == 0)
+        {
+            SetMode(injector, FillableOneTimeInjectorToggleMode.Inject);
+            Popup.PopupClient(Loc.GetString("injector-component-injecting-locked-text"), injector, user);
+        }
+
+        // Leave some DNA from the drawee on it
+        var ev = new TransferDnaEvent { Donor = target, Recipient = injector };
+        RaiseLocalEvent(target, ref ev);
+    }
+
+    private void TryDraw(Entity<FillableOneTimeInjectorComponent> injector, Entity<BloodstreamComponent?> target,
+        Entity<SolutionComponent> targetSolution, EntityUid user)
+    {
+        if (!SolutionContainers.TryGetSolution(injector.Owner, injector.Comp.SolutionName, out var soln,
+                out var solution) || solution.AvailableVolume == 0)
+        {
+            return;
+        }
+
+        // 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,
+            solution.AvailableVolume);
+
+        if (realTransferAmount <= 0)
+        {
+            Popup.PopupEntity(
+                Loc.GetString("injector-component-target-is-empty-message",
+                    ("target", Identity.Entity(target, EntityManager))),
+                injector.Owner, user);
+            return;
+        }
+
+        // We have some snowflaked behavior for streams.
+        if (target.Comp != null)
+        {
+            DrawFromBlood(injector, (target.Owner, target.Comp), soln.Value, realTransferAmount, user);
+            return;
+        }
+
+        // Move units from attackSolution to targetSolution
+        var removedSolution = SolutionContainers.Draw(target.Owner, targetSolution, realTransferAmount);
+
+        if (!SolutionContainers.TryAddSolution(soln.Value, removedSolution))
+        {
+            return;
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", removedSolution.Volume),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+
+    private void DrawFromBlood(Entity<FillableOneTimeInjectorComponent> injector, Entity<BloodstreamComponent> target,
+        Entity<SolutionComponent> injectorSolution, FixedPoint2 transferAmount, EntityUid user)
+    {
+        var drawAmount = (float) transferAmount;
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.ChemicalSolutionName,
+                ref target.Comp.ChemicalSolution))
+        {
+            var chemTemp = SolutionContainers.SplitSolution(target.Comp.ChemicalSolution.Value, drawAmount * 0.15f);
+            SolutionContainers.TryAddSolution(injectorSolution, chemTemp);
+            drawAmount -= (float) chemTemp.Volume;
+        }
+
+        if (SolutionContainers.ResolveSolution(target.Owner, target.Comp.BloodSolutionName,
+                ref target.Comp.BloodSolution))
+        {
+            var bloodTemp = SolutionContainers.SplitSolution(target.Comp.BloodSolution.Value, drawAmount);
+            SolutionContainers.TryAddSolution(injectorSolution, bloodTemp);
+        }
+
+        Popup.PopupEntity(Loc.GetString("injector-component-draw-success-message",
+            ("amount", transferAmount),
+            ("target", Identity.Entity(target, EntityManager))), injector.Owner, user);
+
+        Dirty(injector);
+        AfterDraw(injector, target);
+    }
+}
diff --git a/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
index cd68c5adb43..06870da232d 100644
--- a/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
+++ b/Content.Server/DeltaV/CartridgeLoader/Cartridges/StockTradingCartridgeSystem.cs
@@ -27,7 +27,7 @@ public override void Initialize()
 
     private void OnBalanceUpdated(Entity<StockTradingCartridgeComponent> ent, ref BankBalanceUpdatedEvent args)
     {
-            UpdateAllCartridges(args.Station);
+        UpdateAllCartridges(args.Station);
     }
 
     private void OnUiReady(Entity<StockTradingCartridgeComponent> ent, ref CartridgeUiReadyEvent args)
@@ -35,7 +35,7 @@ private void OnUiReady(Entity<StockTradingCartridgeComponent> ent, ref Cartridge
         UpdateUI(ent, args.Loader);
     }
 
-    private void OnStockMarketUpdated(StockMarketUpdatedEvent args)
+    private void OnStockMarketUpdated(ref StockMarketUpdatedEvent args)
     {
         UpdateAllCartridges(args.Station);
     }
@@ -81,17 +81,9 @@ private void UpdateUI(Entity<StockTradingCartridgeComponent> ent, EntityUid load
             !TryComp<StationBankAccountComponent>(ent.Comp.Station, out var bankAccount))
             return;
 
-        // Convert company data to UI state format
-        var entries = stockMarket.Companies.Select(company => new StockCompanyStruct(
-            displayName: company.LocalizedDisplayName,
-                currentPrice: company.CurrentPrice,
-                basePrice: company.BasePrice,
-                priceHistory: company.PriceHistory))
-            .ToList();
-
         // Send the UI state with balance and owned stocks
         var state = new StockTradingUiState(
-            entries: entries,
+            entries: stockMarket.Companies,
             ownedStocks: stockMarket.StockOwnership,
             balance: bankAccount.Balance
         );
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
new file mode 100644
index 00000000000..5776463ce71
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPotency.cs
@@ -0,0 +1,28 @@
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles increase or decrease of plant potency.
+/// </summary>
+
+public sealed partial class PlantAdjustPotency : PlantAdjustAttribute
+{
+    public override string GuidebookAttributeName { get; set; } = "plant-attribute-potency";
+
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (!CanMetabolize(args.TargetEntity, out var plantHolderComp, args.EntityManager))
+            return;
+
+        if (plantHolderComp.Seed == null)
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+
+        plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+
+        plantHolderComp.Seed.Potency = Math.Max(plantHolderComp.Seed.Potency + Amount, 1);
+    }
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
new file mode 100644
index 00000000000..2929bb6ee9e
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantDestroySeeds.cs
@@ -0,0 +1,42 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles removal of seeds on a plant.
+/// </summary>
+
+public sealed partial class PlantDestroySeeds : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (
+            !args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+            || plantHolderComp.Seed == null
+            || plantHolderComp.Dead
+            || plantHolderComp.Seed.Immutable
+        )
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var popupSystem = args.EntityManager.System<SharedPopupSystem>();
+
+        if (plantHolderComp.Seed.Seedless == false)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            popupSystem.PopupEntity(
+                Loc.GetString("botany-plant-seedsdestroyed"),
+                args.TargetEntity,
+                PopupType.SmallCaution
+            );
+            plantHolderComp.Seed.Seedless = true;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-remove", ("chance", Probability));
+}
diff --git a/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
new file mode 100644
index 00000000000..11af8d511fe
--- /dev/null
+++ b/Content.Server/EntityEffects/Effects/PlantMetabolism/PlantRestoreSeeds.cs
@@ -0,0 +1,38 @@
+using Content.Server.Botany.Components;
+using Content.Server.Botany.Systems;
+using Content.Shared.EntityEffects;
+using Content.Shared.Popups;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.EntityEffects.Effects.PlantMetabolism;
+
+/// <summary>
+///     Handles restoral of seeds on a plant.
+/// </summary>
+
+public sealed partial class PlantRestoreSeeds : EntityEffect
+{
+    public override void Effect(EntityEffectBaseArgs args)
+    {
+        if (
+            !args.EntityManager.TryGetComponent(args.TargetEntity, out PlantHolderComponent? plantHolderComp)
+            || plantHolderComp.Seed == null
+            || plantHolderComp.Dead
+            || plantHolderComp.Seed.Immutable
+        )
+            return;
+
+        var plantHolder = args.EntityManager.System<PlantHolderSystem>();
+        var popupSystem = args.EntityManager.System<SharedPopupSystem>();
+
+        if (plantHolderComp.Seed.Seedless)
+        {
+            plantHolder.EnsureUniqueSeed(args.TargetEntity, plantHolderComp);
+            popupSystem.PopupEntity(Loc.GetString("botany-plant-seedsrestored"), args.TargetEntity);
+            plantHolderComp.Seed.Seedless = false;
+        }
+    }
+
+    protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) =>
+        Loc.GetString("reagent-effect-guidebook-plant-seeds-add", ("chance", Probability));
+}
diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
index 44bfbdffe0a..b2fb16fbd6f 100644
--- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
@@ -64,7 +64,7 @@ public sealed partial class NukeopsRuleComponent : Component
     ///     This amount of TC will be given to each nukie
     /// </summary>
     [DataField]
-    public int WarTcAmountPerNukie = 40;
+    public int WarTcAmountPerNukie = 200;
 
     /// <summary>
     ///     Delay between war declaration and nuke ops arrival on station map. Gives crew time to prepare
diff --git a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
index 623da7a1745..cbc519bcfdb 100644
--- a/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
+++ b/Content.Server/GameTicking/Rules/Components/TraitorRuleComponent.cs
@@ -87,5 +87,5 @@ public enum SelectionState
     /// The amount of TC traitors start with.
     /// </summary>
     [DataField]
-    public FixedPoint2 StartingBalance = 20;
+    public FixedPoint2 StartingBalance = 100;
 }
diff --git a/Content.Server/Light/Components/SetRoofComponent.cs b/Content.Server/Light/Components/SetRoofComponent.cs
new file mode 100644
index 00000000000..6bfe64aa03d
--- /dev/null
+++ b/Content.Server/Light/Components/SetRoofComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Server.Light.Components;
+
+/// <summary>
+/// Applies the roof flag to this tile and deletes the entity.
+/// </summary>
+[RegisterComponent]
+public sealed partial class SetRoofComponent : Component
+{
+    [DataField(required: true)]
+    public bool Value;
+}
diff --git a/Content.Server/Light/EntitySystems/LightCycleSystem.cs b/Content.Server/Light/EntitySystems/LightCycleSystem.cs
new file mode 100644
index 00000000000..7d2eacc8bbb
--- /dev/null
+++ b/Content.Server/Light/EntitySystems/LightCycleSystem.cs
@@ -0,0 +1,22 @@
+using Content.Shared;
+using Content.Shared.Light.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Light.EntitySystems;
+
+/// <inheritdoc/>
+public sealed class LightCycleSystem : SharedLightCycleSystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    protected override void OnCycleMapInit(Entity<LightCycleComponent> ent, ref MapInitEvent args)
+    {
+        base.OnCycleMapInit(ent, ref args);
+
+        if (ent.Comp.InitialOffset)
+        {
+            ent.Comp.Offset = _random.Next(ent.Comp.Duration);
+            Dirty(ent);
+        }
+    }
+}
diff --git a/Content.Server/Light/EntitySystems/RoofSystem.cs b/Content.Server/Light/EntitySystems/RoofSystem.cs
new file mode 100644
index 00000000000..a3b8cb18361
--- /dev/null
+++ b/Content.Server/Light/EntitySystems/RoofSystem.cs
@@ -0,0 +1,33 @@
+using Content.Server.Light.Components;
+using Content.Shared.Light.EntitySystems;
+using Robust.Shared.Map.Components;
+
+namespace Content.Server.Light.EntitySystems;
+
+/// <inheritdoc/>
+public sealed class RoofSystem : SharedRoofSystem
+{
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+
+    private EntityQuery<MapGridComponent> _gridQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        _gridQuery = GetEntityQuery<MapGridComponent>();
+        SubscribeLocalEvent<SetRoofComponent, ComponentStartup>(OnFlagStartup);
+    }
+
+    private void OnFlagStartup(Entity<SetRoofComponent> ent, ref ComponentStartup args)
+    {
+        var xform = Transform(ent.Owner);
+
+        if (_gridQuery.TryComp(xform.GridUid, out var grid))
+        {
+            var index = _maps.LocalToTile(xform.GridUid.Value, grid, xform.Coordinates);
+            SetRoof((xform.GridUid.Value, grid, null), index, ent.Comp.Value);
+        }
+
+        QueueDel(ent.Owner);
+    }
+}
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index 0543518dcc9..04c024d887f 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Atmos;
 using Content.Shared.Decals;
 using Content.Shared.Gravity;
+using Content.Shared.Light.Components;
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Parallax.Biomes.Layers;
 using Content.Shared.Parallax.Biomes.Markers;
@@ -311,6 +312,9 @@ public override void Update(float frameTime)
 
         while (biomes.MoveNext(out var biome))
         {
+            if (biome.LifeStage < ComponentLifeStage.Running)
+                continue;
+
             _activeChunks.Add(biome, _tilePool.Get());
             _markerChunks.GetOrNew(biome);
         }
@@ -358,6 +362,10 @@ public override void Update(float frameTime)
 
         while (loadBiomes.MoveNext(out var gridUid, out var biome, out var grid))
         {
+            // If not MapInit don't run it.
+            if (biome.LifeStage < ComponentLifeStage.Running)
+                continue;
+
             if (!biome.Enabled)
                 continue;
 
@@ -727,7 +735,10 @@ private void LoadChunkMarkers(
         }
 
         if (modified.Count == 0)
+        {
+            component.ModifiedTiles.Remove(chunk);
             _tilePool.Return(modified);
+        }
 
         component.PendingMarkers.Remove(chunk);
     }
@@ -996,11 +1007,14 @@ public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate,
         // Midday: #E6CB8B
         // Moonlight: #2b3143
         // Lava: #A34931
-
         var light = EnsureComp<MapLightComponent>(mapUid);
         light.AmbientLightColor = mapLight ?? Color.FromHex("#D8B059");
         Dirty(mapUid, light, metadata);
 
+        EnsureComp<RoofComponent>(mapUid);
+
+        EnsureComp<LightCycleComponent>(mapUid);
+
         var moles = new float[Atmospherics.AdjustedNumberOfGases];
         moles[(int) Gas.Oxygen] = 21.824779f;
         moles[(int) Gas.Nitrogen] = 82.10312f;
diff --git a/Content.Server/Shuttles/Components/ShuttleComponent.cs b/Content.Server/Shuttles/Components/ShuttleComponent.cs
index 949d8ea5bb2..23cbaa42ef9 100644
--- a/Content.Server/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleComponent.cs
@@ -64,5 +64,17 @@ public sealed partial class ShuttleComponent : Component
 
         [DataField("angularDamping"), ViewVariables(VVAccess.ReadWrite)]
         public float AngularDamping = 0.05f;
+
+        /// <summary>
+        ///     How far from the shuttle's bounding box will it crush and destroy things?
+        /// </summary>
+        [DataField]
+        public float SmimshDistance = 0.2f;
+
+        /// <summary>
+        ///     Whether or not the shuttle calls the DoTheDinosaur function upon FTL'ing. I'm not explaining this, you owe it to yourself to do a code search for it.
+        /// </summary>
+        [DataField]
+        public bool DoTheDinosaur = true;
     }
 }
diff --git a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
index 03e262cef50..2cdbaabdd88 100644
--- a/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
+++ b/Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
@@ -20,5 +20,35 @@ public sealed partial class ShuttleConsoleComponent : SharedShuttleConsoleCompon
         /// </summary>
         [ViewVariables(VVAccess.ReadWrite), DataField("whitelistSpecific")]
         public List<EntityUid> FTLWhitelist = new List<EntityUid>();
+
+        /// <summary>
+        ///     How far the shuttle is allowed to jump(in meters).
+        ///     TODO: This technically won't work until this component is migrated to Shared. The client console screen will only ever know the hardcoded 512 meter constant otherwise. Fix it in ShuttleMapControl.xaml.cs when that's done.
+        /// </summary>
+        [DataField]
+        public float FTLRange = 512f;
+
+        /// <summary>
+        ///     If the shuttle is allowed to "Forcibly" land on planet surfaces, destroying anything it lands on. Used for SSTO capable shuttles.
+        /// </summary>
+        [DataField]
+        public bool FtlToPlanets;
+
+        /// <summary>
+        ///     If the shuttle is allowed to forcibly land on stations, smimshing everything it lands on. This is where the hypothetical "Nukie drop pod" comes into play.
+        /// </summary>
+        [DataField]
+        public bool IgnoreExclusionZones;
+
+        /// <summary>
+        ///     If the shuttle is only ever allowed to FTL once. Also used for the hypothetical "Nukie drop pod."
+        /// </summary>
+        [DataField]
+        public bool OneWayTrip;
+
+        /// <summary>
+        ///     Tracks whether or not the above "One way trip" has been taken.
+        /// </summary>
+        public bool OneWayTripTaken;
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
index e2bb5887aa8..85260d2967b 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
@@ -114,6 +114,12 @@ private void GetExclusions(ref List<ShuttleExclusionObject>? exclusions)
     /// </summary>
     private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates targetCoordinates, Angle targetAngle, MapId targetMap)
     {
+        if (ent.Comp.OneWayTrip && ent.Comp.OneWayTripTaken)
+        {
+            // TODO: Play a popup and a message in chat explaining you've already taken the one way trip.
+            return;
+        }
+
         var consoleUid = GetDroneConsole(ent.Owner);
 
         if (consoleUid == null)
@@ -143,7 +149,7 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         List<ShuttleExclusionObject>? exclusions = null;
         GetExclusions(ref exclusions);
 
-        if (!_shuttle.FTLFree(shuttleUid.Value, targetCoordinates, targetAngle, exclusions))
+        if (!_shuttle.FTLFree(shuttleUid.Value, targetCoordinates, targetAngle, exclusions, ent.Comp.FtlToPlanets, ent.Comp.IgnoreExclusionZones, ent.Comp.FTLRange))
         {
             return;
         }
@@ -163,5 +169,7 @@ private void ConsoleFTL(Entity<ShuttleConsoleComponent> ent, EntityCoordinates t
         RaiseLocalEvent(ref ev);
 
         _shuttle.FTLToCoordinates(shuttleUid.Value, shuttleComp, adjustedCoordinates, targetAngle);
+        if (ent.Comp.OneWayTrip)
+            ent.Comp.OneWayTripTaken = true;
     }
 }
diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
index dfeb8aaa3ef..1ba185fa9f8 100644
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -381,7 +381,9 @@ private void UpdateFTLStarting(Entity<FTLComponent, ShuttleComponent> entity)
         var uid = entity.Owner;
         var comp = entity.Comp1;
         var xform = _xformQuery.GetComponent(entity);
-        DoTheDinosaur(xform);
+
+        if (entity.Comp2.DoTheDinosaur)
+            DoTheDinosaur(xform);
 
         comp.State = FTLState.Travelling;
         var fromMapUid = xform.MapUid;
@@ -558,7 +560,7 @@ private void UpdateFTLArriving(Entity<FTLComponent, ShuttleComponent> entity)
         comp.StateTime = StartEndTime.FromCurTime(_gameTiming, FTLCooldown);
         _console.RefreshShuttleConsoles(uid);
         _mapManager.SetMapPaused(mapId, false);
-        Smimsh(uid, xform: xform);
+        Smimsh(uid, xform: xform, smimshDistance: entity.Comp2.SmimshDistance);
 
         var ftlEvent = new FTLCompletedEvent(uid, _mapSystem.GetMap(mapId));
         RaiseLocalEvent(uid, ref ftlEvent, true);
@@ -959,7 +961,7 @@ public bool TryFTLProximity(Entity<TransformComponent?> shuttle, EntityCoordinat
     /// <summary>
     /// Flattens / deletes everything under the grid upon FTL.
     /// </summary>
-    private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridComponent? grid = null, TransformComponent? xform = null)
+    private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridComponent? grid = null, TransformComponent? xform = null, float smimshDistance = 0.2f)
     {
         if (!Resolve(uid, ref manager, ref grid, ref xform) || xform.MapUid == null)
             return;
@@ -981,7 +983,7 @@ private void Smimsh(EntityUid uid, FixturesComponent? manager = null, MapGridCom
 
             // Shift it slightly
             // Create a small border around it.
-            aabb = aabb.Enlarged(0.2f);
+            aabb = aabb.Enlarged(smimshDistance);
             aabbs.Add(aabb);
 
             // Handle clearing biome stuff as relevant.
diff --git a/Content.Server/Station/Components/StationBiomeComponent.cs b/Content.Server/Station/Components/StationBiomeComponent.cs
index 0eb64aaff80..de3e5db226e 100644
--- a/Content.Server/Station/Components/StationBiomeComponent.cs
+++ b/Content.Server/Station/Components/StationBiomeComponent.cs
@@ -1,5 +1,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.Parallax.Biomes;
+using Content.Shared.Parallax.Biomes.Markers;
+using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Station.Components;
@@ -13,6 +15,24 @@ public sealed partial class StationBiomeComponent : Component
     [DataField(required: true)]
     public ProtoId<BiomeTemplatePrototype> Biome = "Grasslands";
 
+    /// <summary>
+    ///     Adds a list of biome marker layers after creating the planet. Useful if you wish to make your planet station also have ores to mine.
+    /// </summary>
+    [DataField]
+    public List<ProtoId<BiomeMarkerLayerPrototype>> BiomeLayers;
+
+    /// <summary>
+    ///     Whether your station comes with one or more complimentary dungeons somewhere in the world.
+    /// </summary>
+    [DataField]
+    public List<DungeonConfigPrototype> Dungeons;
+
+    [DataField]
+    public float DungeonMinDistance = 100f;
+
+    [DataField]
+    public float DungeonMaxDistance = 500f;
+
     // If null, its random
     [DataField]
     public int? Seed = null;
diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs
index 8c80806ccf5..cecf5153cbc 100644
--- a/Content.Server/Station/Systems/StationBiomeSystem.cs
+++ b/Content.Server/Station/Systems/StationBiomeSystem.cs
@@ -1,17 +1,22 @@
 using Content.Server.Parallax;
+using Content.Server.Procedural;
 using Content.Server.Station.Components;
 using Content.Server.Station.Events;
-using Content.Server.Station.Systems;
-using Robust.Shared.Map;
+using Content.Shared.Parallax.Biomes;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 
 namespace Content.Server.Station.Systems;
 public sealed partial class StationBiomeSystem : EntitySystem
 {
     [Dependency] private readonly BiomeSystem _biome = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
+    [Dependency] private readonly DungeonSystem _dungeon = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -28,8 +33,32 @@ private void OnStationPostInit(Entity<StationBiomeComponent> map, ref StationPos
         if (station == null) return;
 
         var mapId = Transform(station.Value).MapID;
-        var mapUid = _mapManager.GetMapEntityId(mapId);
+        if (!_mapSystem.TryGetMap(mapId, out var mapUid)
+            || mapUid is null) // WHAT, IT'S LITERALLY CALLED TRYGET. WHY DO I NEED TO CHECK NULL?
+            return;
+
+        _biome.EnsurePlanet(mapUid!.Value, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
+
+        if (!TryComp<BiomeComponent>(mapUid, out var biomeComp))
+            return; // Yea we JUST made a biome component one line above this trycomp. It turns out I need an engine PR to retrieve the component just added.
+                    // Imagine my frustration. On the other hand AddComps like above aren't guaranteed to return a component anyway.
+
+        foreach (var layer in map.Comp.BiomeLayers)
+        {
+            if (biomeComp.MarkerLayers.Contains(layer))
+                continue;
+
+            biomeComp.MarkerLayers.Add(layer);
+            biomeComp.ForcedMarkerLayers.Add(layer);
+        }
+        if (!TryComp(mapUid, out MapGridComponent? mapGrid))
+            return;
 
-        _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
+        foreach (var dungeonProto in map.Comp.Dungeons)
+        {
+            // TODO: Pester TCJ about adding a _random.NextVector2i to Supermatter Engine, as well as adding methods for "officially" casting vector 2s as integer vectors.
+            var distVector = (Vector2i) _random.NextVector2(map.Comp.DungeonMinDistance, map.Comp.DungeonMaxDistance).Rounded();
+            _dungeon.GenerateDungeon(dungeonProto, mapUid!.Value, mapGrid, distVector, _random.Next());
+        }
     }
 }
diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
index c1352baf113..1e3bad4e06e 100644
--- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
+++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
@@ -71,7 +71,7 @@ private void OnStoreInitialized(ref StoreInitializedEvent ev)
 
     private IReadOnlyList<StoreDiscountData> InitializeDiscounts(
         IReadOnlyCollection<ListingDataWithCostModifiers> listings,
-        int totalAvailableDiscounts = 3
+        int totalAvailableDiscounts = 6
     )
     {
         // Get list of categories with cumulative weights.
diff --git a/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs b/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs
index 1cddaef0154..ba703e89ea1 100644
--- a/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs
+++ b/Content.Server/WhiteDream/BloodCult/Runes/Revive/CultRuneReviveComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Damage;
+using Content.Shared.Damage;
 using Content.Shared.FixedPoint;
 
 namespace Content.Server.WhiteDream.BloodCult.Runes.Revive;
@@ -14,9 +14,12 @@ public sealed partial class CultRuneReviveComponent : Component
     {
         DamageDict = new Dictionary<string, FixedPoint2>
         {
-            ["Brute"] = -100,
-            ["Burn"] = -100,
-            ["Heat"] = -100,
+            ["Blunt"] = -33,
+            ["Slash"] = -33,
+            ["Piercing"] = -33,
+            ["Heat"] = -33,
+            ["Cold"] = -33,
+            ["Shock"] = -33,
             ["Asphyxiation"] = -100,
             ["Bloodloss"] = -100,
             ["Poison"] = -50,
diff --git a/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibComponent.cs b/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibComponent.cs
new file mode 100644
index 00000000000..6f35f7714cc
--- /dev/null
+++ b/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Atmos;
+
+namespace Content.Server._EE.SpawnGasOnGib;
+
+// <summary>
+//   Spawns a gas mixture upon being gibbed.
+// </summary>
+[RegisterComponent]
+public sealed partial class SpawnGasOnGibComponent : Component
+{
+    // <summary>
+    //   The gas mixture to spawn.
+    // </summary>
+    [DataField("gasMixture", required: true)]
+    public GasMixture Gas = new();
+}
diff --git a/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibSystem.cs b/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibSystem.cs
new file mode 100644
index 00000000000..8dd88308da5
--- /dev/null
+++ b/Content.Server/_EE/SpawnGasOnGib/SpawnGasOnGibSystem.cs
@@ -0,0 +1,24 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Body.Components;
+
+namespace Content.Server._EE.SpawnGasOnGib;
+
+public sealed partial class SpawnGasOnGibSystem : EntitySystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmos = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<SpawnGasOnGibComponent, BeingGibbedEvent>(OnBeingGibbed);
+    }
+
+    private void OnBeingGibbed(EntityUid uid, SpawnGasOnGibComponent comp, BeingGibbedEvent args)
+    {
+        if (_atmos.GetContainingMixture(uid, false, true) is not { } air)
+            return;
+
+        _atmos.Merge(air, comp.Gas);
+    }
+}
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index a34709807b1..e13540eb6f3 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -90,6 +90,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefJustice",  // DeltaV - Add Chief Justice access
         "Justice",  // DeltaV - Add Justice access
         "Prosecutor", // Delta V - Add Prosecutor access
+        "Clerk", // Delta V - Add Clerk access
     };
 
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs
index ee9798e020d..4f1b70457b4 100644
--- a/Content.Shared/Body/Organ/OrganComponent.cs
+++ b/Content.Shared/Body/Organ/OrganComponent.cs
@@ -29,13 +29,13 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent //
     ///     without referencing the prototype or hardcoding.
     /// </summary>
 
-    [DataField, AlwaysPushInheritance]
-    public string SlotId = "";
+    [DataField]
+    public string SlotId = string.Empty;
 
-    [DataField, AlwaysPushInheritance]
+    [DataField]
     public string ToolName { get; set; } = "An organ";
 
-    [DataField, AlwaysPushInheritance]
+    [DataField]
     public float Speed { get; set; } = 1f;
 
     /// <summary>
diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs
index 2071d13a55b..8a8aa4ac927 100644
--- a/Content.Shared/Body/Part/BodyPartComponent.cs
+++ b/Content.Shared/Body/Part/BodyPartComponent.cs
@@ -37,16 +37,16 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     [DataField, AutoNetworkedField]
     public FixedPoint2 VitalDamage = 100;
 
-    [DataField, AlwaysPushInheritance]
+    [DataField]
     public string ToolName { get; set; } = "A body part";
 
-    [DataField, AlwaysPushInheritance]
-    public string SlotId = "";
+    [DataField]
+    public string SlotId = string.Empty;
 
     [DataField, AutoNetworkedField]
     public bool? Used { get; set; } = null;
 
-    [DataField, AlwaysPushInheritance]
+    [DataField]
     public float Speed { get; set; } = 1f;
 
     /// <summary>
@@ -125,7 +125,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     /// <summary>
     ///     Shitmed Change: The ID of the base layer for this body part.
     /// </summary>
-    [DataField, AutoNetworkedField, AlwaysPushInheritance]
+    [DataField, AutoNetworkedField]
     public string? BaseLayerId;
 
     /// <summary>
@@ -146,7 +146,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     };
 
 
-    [DataField, AutoNetworkedField, AlwaysPushInheritance]
+    [DataField, AutoNetworkedField]
     public BodyPartType PartType = BodyPartType.Other;
 
 
@@ -158,7 +158,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent
     [DataField("vital"), AutoNetworkedField]
     public bool IsVital;
 
-    [DataField, AutoNetworkedField, AlwaysPushInheritance]
+    [DataField, AutoNetworkedField]
     public BodyPartSymmetry Symmetry = BodyPartSymmetry.None;
 
     /// <summary>
diff --git a/Content.Shared/CCVar/CCVars.Interactions.cs b/Content.Shared/CCVar/CCVars.Interactions.cs
index 6838dde363d..2a190720660 100644
--- a/Content.Shared/CCVar/CCVars.Interactions.cs
+++ b/Content.Shared/CCVar/CCVars.Interactions.cs
@@ -57,4 +57,23 @@ public sealed partial class CCVars
     /// </summary>
     public static readonly CVarDef<bool> OpaqueStorageWindow =
         CVarDef.Create("control.opaque_storage_background", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// Whether or not the storage window has a title of the entity name.
+    /// </summary>
+    public static readonly CVarDef<bool> StorageWindowTitle =
+        CVarDef.Create("control.storage_window_title", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    /// How many storage windows are allowed to be open at once.
+    /// Recommended that you utilise this in conjunction with <see cref="StaticStorageUI"/>
+    /// </summary>
+    public static readonly CVarDef<int> StorageLimit =
+        CVarDef.Create("control.storage_limit", 1, CVar.REPLICATED | CVar.SERVER);
+
+    /// <summary>
+    /// Whether or not storage can be opened recursively.
+    /// </summary>
+    public static readonly CVarDef<bool> NestedStorage =
+        CVarDef.Create("control.nested_storage", true, CVar.REPLICATED | CVar.SERVER);
 }
diff --git a/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs b/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs
new file mode 100644
index 00000000000..e74563c531f
--- /dev/null
+++ b/Content.Shared/Chemistry/Components/FillableOneTimeInjectorComponent.cs
@@ -0,0 +1,85 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Chemistry.Components;
+
+/// <summary>
+/// Implements draw/inject behavior for syringes that can be filled once and then injected once.
+/// </summary>
+/// <seealso cref="SharedInjectorSystem"/>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FillableOneTimeInjectorComponent : Component
+{
+    [DataField]
+    public string SolutionName = "injector";
+
+    /// <summary>
+    ///     The minimum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("minTransferAmount")]
+    public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(1);
+
+    /// <summary>
+    ///     The maximum amount of solution that can be transferred at once from this solution.
+    /// </summary>
+    [DataField("maxTransferAmount")]
+    public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(15);
+
+    /// <summary>
+    /// Amount to inject or draw on each usage. If the injector is inject only, it will
+    /// attempt to inject it's entire contents upon use.
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public FixedPoint2 TransferAmount = FixedPoint2.New(1);
+
+    /// <summary>
+    /// Injection delay (seconds) when the target is a mob.
+    /// </summary>
+    /// <remarks>
+    /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or
+    /// in combat mode.
+    /// </remarks>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// The state of the injector. Determines it's attack behavior. Containers must have the
+    /// right SolutionCaps to support injection/drawing.
+    /// </summary>
+    [AutoNetworkedField]
+    [DataField]
+    public FillableOneTimeInjectorToggleMode ToggleState = FillableOneTimeInjectorToggleMode.Draw;
+
+    [AutoNetworkedField]
+    [DataField]
+    public bool HasDrawn = false;
+
+    [AutoNetworkedField]
+    [DataField]
+    public bool HasInjected = false;
+}
+
+/// <summary>
+/// Possible modes for an <see cref="FillableOneTimeInjectorComponent"/>.
+/// </summary>
+public enum FillableOneTimeInjectorToggleMode : byte
+{
+    /// <summary>
+    /// The injector will try to inject reagent into things.
+    /// </summary>
+    Inject,
+
+    /// <summary>
+    /// The injector will try to draw reagent from things.
+    /// </summary>
+    Draw,
+
+    /// <summary>
+    /// The injector can no longer be used.
+    /// </summary>
+    Spent,
+}
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs
new file mode 100644
index 00000000000..6e7f2287097
--- /dev/null
+++ b/Content.Shared/Chemistry/EntitySystems/SharedFillableOneTimeInjectorSystem.cs
@@ -0,0 +1,111 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.CombatMode;
+using Content.Shared.DoAfter;
+using Content.Shared.FixedPoint;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.Player;
+
+namespace Content.Shared.Chemistry.EntitySystems;
+
+public abstract class SharedFillableOneTimeInjectorSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedPopupSystem Popup = default!;
+    [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainers = default!;
+    [Dependency] protected readonly MobStateSystem MobState = default!;
+    [Dependency] protected readonly SharedCombatModeSystem Combat = default!;
+    [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!;
+    [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FillableOneTimeInjectorComponent, GetVerbsEvent<AlternativeVerb>>(AddSetTransferVerbs);
+        SubscribeLocalEvent<FillableOneTimeInjectorComponent, ComponentStartup>(OnInjectorStartup);
+        SubscribeLocalEvent<FillableOneTimeInjectorComponent, UseInHandEvent>(OnInjectorUse);
+    }
+
+    private void AddSetTransferVerbs(Entity<FillableOneTimeInjectorComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract || args.Hands == null || entity.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Draw)
+            return;
+
+        var user = args.User;
+        var (_, component) = entity;
+
+        var min = component.MinimumTransferAmount;
+        var max = component.MaximumTransferAmount;
+        var cur = component.TransferAmount;
+
+        var toggleAmount = cur == max ? min : max;
+
+        var priority = 0;
+        AlternativeVerb toggleVerb = new()
+        {
+            Text = Loc.GetString("comp-solution-transfer-verb-toggle", ("amount", toggleAmount)),
+            Category = VerbCategory.SetTransferAmount,
+            Act = () =>
+            {
+                component.TransferAmount = toggleAmount;
+                Popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", toggleAmount)), user, user);
+                Dirty(entity);
+            },
+
+            Priority = priority
+        };
+        args.Verbs.Add(toggleVerb);
+
+        priority -= 1;
+
+        // Add specific transfer verbs according to the container's size
+        for (var amount = entity.Comp.MinimumTransferAmount; amount <= entity.Comp.MaximumTransferAmount; amount += 1)
+        {
+            var transferAmount = amount;
+            AlternativeVerb verb = new()
+            {
+                Text = Loc.GetString("comp-solution-transfer-verb-amount", ("amount", amount)),
+                Category = VerbCategory.SetTransferAmount,
+                Act = () =>
+                {
+                    component.TransferAmount = transferAmount;
+                    Popup.PopupClient(Loc.GetString("comp-solution-transfer-set-amount", ("amount", transferAmount)), user, user);
+                    Dirty(entity);
+                },
+
+                // we want to sort by size, not alphabetically by the verb text.
+                Priority = priority
+            };
+
+            priority -= 1;
+
+            args.Verbs.Add(verb);
+        }
+    }
+
+    private void OnInjectorUse(Entity<FillableOneTimeInjectorComponent> entity, ref UseInHandEvent args)
+    {
+        if (args.Handled || entity.Comp.ToggleState != FillableOneTimeInjectorToggleMode.Draw)
+            return;
+
+        SetMode(entity, FillableOneTimeInjectorToggleMode.Inject);
+        args.Handled = true;
+    }
+
+    private void OnInjectorStartup(Entity<FillableOneTimeInjectorComponent> entity, ref ComponentStartup args)
+    {
+        // ???? why ?????
+        Dirty(entity);
+    }
+
+    public void SetMode(Entity<FillableOneTimeInjectorComponent> injector, FillableOneTimeInjectorToggleMode mode)
+    {
+        injector.Comp.ToggleState = mode;
+
+        if (mode == FillableOneTimeInjectorToggleMode.Inject)
+            injector.Comp.TransferAmount = injector.Comp.MaximumTransferAmount;
+
+        Dirty(injector);
+    }
+}
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
index a80f8c6b8a8..5981f03b28e 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiMessageEvent.cs
@@ -3,12 +3,12 @@
 namespace Content.Shared.CartridgeLoader.Cartridges;
 
 [Serializable, NetSerializable]
-public sealed class StockTradingUiMessageEvent(StockTradingUiAction action, int companyIndex, float amount)
+public sealed class StockTradingUiMessageEvent(StockTradingUiAction action, int companyIndex, int amount)
     : CartridgeMessageEvent
 {
     public readonly StockTradingUiAction Action = action;
     public readonly int CompanyIndex = companyIndex;
-    public readonly float Amount = amount;
+    public readonly int Amount = amount;
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
index aea4ba5aa1d..42adb6feaa8 100644
--- a/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
+++ b/Content.Shared/DeltaV/CartridgeLoader/Cartridges/StockTradingUiState.cs
@@ -4,19 +4,19 @@ namespace Content.Shared.CartridgeLoader.Cartridges;
 
 [Serializable, NetSerializable]
 public sealed class StockTradingUiState(
-    List<StockCompanyStruct> entries,
+    List<StockCompany> entries,
     Dictionary<int, int> ownedStocks,
     float balance)
     : BoundUserInterfaceState
 {
-    public readonly List<StockCompanyStruct> Entries = entries;
+    public readonly List<StockCompany> Entries = entries;
     public readonly Dictionary<int, int> OwnedStocks = ownedStocks;
     public readonly float Balance = balance;
 }
 
 // No structure, zero fucks given
 [DataDefinition, Serializable]
-public partial struct StockCompanyStruct
+public partial struct StockCompany
 {
     /// <summary>
     /// The displayed name of the company shown in the UI.
@@ -55,7 +55,7 @@ public string LocalizedDisplayName
     [DataField]
     public List<float>? PriceHistory;
 
-    public StockCompanyStruct(string displayName, float currentPrice, float basePrice, List<float>? priceHistory)
+    public StockCompany(string displayName, float currentPrice, float basePrice, List<float>? priceHistory)
     {
         DisplayName = displayName;
         _displayName = null;
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
index 2ce008da262..2f8fabae5a4 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs
@@ -65,6 +65,11 @@ private void AddSpillVerb(Entity<SpillableComponent> entity, ref GetVerbsEvent<V
                     injectorComp.ToggleState = InjectorToggleMode.Draw;
                     Dirty(entity, injectorComp);
                 }
+                else if (TryComp<FillableOneTimeInjectorComponent>(entity, out var fillableOneTimeInjectorComponent))
+                {
+                    fillableOneTimeInjectorComponent.ToggleState = FillableOneTimeInjectorToggleMode.Spent;
+                    Dirty(entity, fillableOneTimeInjectorComponent);
+                }
             };
         }
         else
diff --git a/Content.Shared/Light/Components/LightCycleComponent.cs b/Content.Shared/Light/Components/LightCycleComponent.cs
new file mode 100644
index 00000000000..a6ce63bdbc2
--- /dev/null
+++ b/Content.Shared/Light/Components/LightCycleComponent.cs
@@ -0,0 +1,56 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Map.Components;
+
+namespace Content.Shared.Light.Components;
+
+/// <summary>
+/// Cycles through colors AKA "Day / Night cycle" on <see cref="MapLightComponent"/>
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class LightCycleComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public Color OriginalColor = Color.Transparent;
+
+    /// <summary>
+    /// How long an entire cycle lasts
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public TimeSpan Duration = TimeSpan.FromMinutes(30);
+
+    [DataField, AutoNetworkedField]
+    public TimeSpan Offset;
+
+    [DataField, AutoNetworkedField]
+    public bool Enabled = true;
+
+    /// <summary>
+    /// Should the offset be randomised upon MapInit.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool InitialOffset = true;
+
+    /// <summary>
+    /// Trench of the oscillation.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float MinLightLevel = 0f;
+
+    /// <summary>
+    /// Peak of the oscillation
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float MaxLightLevel = 3f;
+
+    [DataField, AutoNetworkedField]
+    public float ClipLight = 1.25f;
+
+    [DataField, AutoNetworkedField]
+    public Color ClipLevel = new Color(1f, 1f, 1.25f);
+
+    [DataField, AutoNetworkedField]
+    public Color MinLevel = new Color(0.1f, 0.15f, 0.50f);
+
+    [DataField, AutoNetworkedField]
+    public Color MaxLevel = new Color(2f, 2f, 5f);
+}
diff --git a/Content.Shared/Light/Components/RoofComponent.cs b/Content.Shared/Light/Components/RoofComponent.cs
new file mode 100644
index 00000000000..0e2adf527cd
--- /dev/null
+++ b/Content.Shared/Light/Components/RoofComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Light.Components;
+
+/// <summary>
+/// Will draw shadows over tiles flagged as roof tiles on the attached map.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class RoofComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public Color Color = Color.Black;
+}
diff --git a/Content.Shared/Light/Components/TileEmissionComponent.cs b/Content.Shared/Light/Components/TileEmissionComponent.cs
new file mode 100644
index 00000000000..0eec19702d8
--- /dev/null
+++ b/Content.Shared/Light/Components/TileEmissionComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Light.Components;
+
+/// <summary>
+/// Will draw lighting in a range around the tile.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class TileEmissionComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public float Range = 0.25f;
+
+    [DataField(required: true), AutoNetworkedField]
+    public Color Color = Color.Transparent;
+}
diff --git a/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs b/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs
new file mode 100644
index 00000000000..d06b5bcb0ce
--- /dev/null
+++ b/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs
@@ -0,0 +1,42 @@
+using Content.Shared.Light.Components;
+using Content.Shared.Maps;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+
+namespace Content.Shared.Light.EntitySystems;
+
+/// <summary>
+/// Handles the roof flag for tiles that gets used for the RoofOverlay.
+/// </summary>
+public abstract class SharedRoofSystem : EntitySystem
+{
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+
+    public void SetRoof(Entity<MapGridComponent?, RoofComponent?> grid, Vector2i index, bool value)
+    {
+        if (!Resolve(grid, ref grid.Comp1, ref grid.Comp2, false))
+            return;
+
+        if (!_maps.TryGetTile(grid.Comp1, index, out var tile))
+            return;
+
+        var mask = (tile.Flags & (byte)TileFlag.Roof);
+        var rooved = mask != 0x0;
+
+        if (rooved == value)
+            return;
+
+        Tile newTile;
+
+        if (value)
+        {
+            newTile = tile.WithFlag((byte)(tile.Flags | (ushort)TileFlag.Roof));
+        }
+        else
+        {
+            newTile = tile.WithFlag((byte)(tile.Flags & ~(ushort)TileFlag.Roof));
+        }
+
+        _maps.SetTile((grid.Owner, grid.Comp1), index, newTile);
+    }
+}
diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs
index be171559d02..0ded8f4db81 100644
--- a/Content.Shared/Maps/ContentTileDefinition.cs
+++ b/Content.Shared/Maps/ContentTileDefinition.cs
@@ -1,9 +1,11 @@
 using Content.Shared.Atmos;
+using Content.Shared.Light.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Tools;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array;
 using Robust.Shared.Utility;
@@ -128,4 +130,11 @@ public void AssignTileId(ushort id)
         [DataField]
         public float TileRipResistance = 125f;
     }
+
+    [Flags]
+    public enum TileFlag : byte
+    {
+        None = 0,
+        Roof = 1 << 0,
+    }
 }
diff --git a/Content.Shared/Parallax/Biomes/BiomeComponent.cs b/Content.Shared/Parallax/Biomes/BiomeComponent.cs
index 8446febfb25..ea981e682df 100644
--- a/Content.Shared/Parallax/Biomes/BiomeComponent.cs
+++ b/Content.Shared/Parallax/Biomes/BiomeComponent.cs
@@ -1,15 +1,13 @@
 using Content.Shared.Parallax.Biomes.Layers;
 using Content.Shared.Parallax.Biomes.Markers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Parallax.Biomes;
 
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedBiomeSystem))]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class BiomeComponent : Component
 {
     /// <summary>
diff --git a/Content.Shared/Parallax/Biomes/Layers/BiomeTileLayer.cs b/Content.Shared/Parallax/Biomes/Layers/BiomeTileLayer.cs
index 0ac9f1894c7..114b6b20b92 100644
--- a/Content.Shared/Parallax/Biomes/Layers/BiomeTileLayer.cs
+++ b/Content.Shared/Parallax/Biomes/Layers/BiomeTileLayer.cs
@@ -1,28 +1,36 @@
 using Content.Shared.Maps;
 using Robust.Shared.Noise;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 
 namespace Content.Shared.Parallax.Biomes.Layers;
 
 [Serializable, NetSerializable]
 public sealed partial class BiomeTileLayer : IBiomeLayer
 {
-    [DataField("noise")] public FastNoiseLite Noise { get; private set; } = new(0);
+    [DataField] public FastNoiseLite Noise { get; private set; } = new(0);
 
     /// <inheritdoc/>
-    [DataField("threshold")]
+    [DataField]
     public float Threshold { get; private set; } = 0.5f;
 
     /// <inheritdoc/>
-    [DataField("invert")] public bool Invert { get; private set; } = false;
+    [DataField] public bool Invert { get; private set; } = false;
 
     /// <summary>
     /// Which tile variants to use for this layer. Uses all of the tile's variants if none specified
     /// </summary>
-    [DataField("variants")]
+    [DataField]
     public List<byte>? Variants = null;
 
-    [DataField("tile", required: true, customTypeSerializer: typeof(PrototypeIdSerializer<ContentTileDefinition>))]
-    public string Tile = string.Empty;
+    [DataField(required: true)]
+    public ProtoId<ContentTileDefinition> Tile = string.Empty;
+
+    // TODO: Need some good engine solution to this, see FlagSerializer for what needs changing.
+    /// <summary>
+    /// Flags to set on the tile when placed.
+    /// </summary>
+    [DataField]
+    public byte Flags = 0;
 }
diff --git a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
index b14baba9817..ec20ae1209b 100644
--- a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
+++ b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs
@@ -129,7 +129,7 @@ public bool TryGetTile(Vector2i indices, List<IBiomeLayer> layers, int seed, Map
             if (layer is not BiomeTileLayer tileLayer)
                 continue;
 
-            if (TryGetTile(indices, noiseCopy, tileLayer.Invert, tileLayer.Threshold, ProtoManager.Index<ContentTileDefinition>(tileLayer.Tile), tileLayer.Variants, out tile))
+            if (TryGetTile(indices, noiseCopy, tileLayer.Invert, tileLayer.Threshold, ProtoManager.Index(tileLayer.Tile), tileLayer.Flags, tileLayer.Variants, out tile))
             {
                 return true;
             }
@@ -142,7 +142,7 @@ public bool TryGetTile(Vector2i indices, List<IBiomeLayer> layers, int seed, Map
     /// <summary>
     /// Gets the underlying biome tile, ignoring any existing tile that may be there.
     /// </summary>
-    private bool TryGetTile(Vector2i indices, FastNoiseLite noise, bool invert, float threshold, ContentTileDefinition tileDef, List<byte>? variants, [NotNullWhen(true)] out Tile? tile)
+    private bool TryGetTile(Vector2i indices, FastNoiseLite noise, bool invert, float threshold, ContentTileDefinition tileDef, byte tileFlags, List<byte>? variants, [NotNullWhen(true)] out Tile? tile)
     {
         var found = noise.GetNoise(indices.X, indices.Y);
         found = invert ? found * -1 : found;
@@ -163,7 +163,7 @@ private bool TryGetTile(Vector2i indices, FastNoiseLite noise, bool invert, floa
             variant = _tile.PickVariant(tileDef, (int) variantValue);
         }
 
-        tile = new Tile(tileDef.TileId, 0, variant);
+        tile = new Tile(tileDef.TileId, flags: tileFlags, variant);
         return true;
     }
 
diff --git a/Content.Shared/SharedLightCycleSystem.cs b/Content.Shared/SharedLightCycleSystem.cs
new file mode 100644
index 00000000000..1ba947f78ac
--- /dev/null
+++ b/Content.Shared/SharedLightCycleSystem.cs
@@ -0,0 +1,116 @@
+using Content.Shared.Light.Components;
+using Robust.Shared.Map.Components;
+
+namespace Content.Shared;
+
+public abstract class SharedLightCycleSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<LightCycleComponent, MapInitEvent>(OnCycleMapInit);
+        SubscribeLocalEvent<LightCycleComponent, ComponentShutdown>(OnCycleShutdown);
+    }
+
+    protected virtual void OnCycleMapInit(Entity<LightCycleComponent> ent, ref MapInitEvent args)
+    {
+        if (TryComp(ent.Owner, out MapLightComponent? mapLight))
+        {
+            ent.Comp.OriginalColor = mapLight.AmbientLightColor;
+            Dirty(ent);
+        }
+    }
+
+    private void OnCycleShutdown(Entity<LightCycleComponent> ent, ref ComponentShutdown args)
+    {
+        if (TryComp(ent.Owner, out MapLightComponent? mapLight))
+        {
+            mapLight.AmbientLightColor = ent.Comp.OriginalColor;
+            Dirty(ent.Owner, mapLight);
+        }
+    }
+
+    public static Color GetColor(Entity<LightCycleComponent> cycle, Color color, float time)
+    {
+        if (cycle.Comp.Enabled)
+        {
+            var lightLevel = CalculateLightLevel(cycle.Comp, time);
+            var colorLevel = CalculateColorLevel(cycle.Comp, time);
+            return new Color(
+                (byte)Math.Min(255, color.RByte * colorLevel.R * lightLevel),
+                (byte)Math.Min(255, color.GByte * colorLevel.G * lightLevel),
+                (byte)Math.Min(255, color.BByte * colorLevel.B * lightLevel)
+            );
+        }
+
+        return color;
+    }
+
+    /// <summary>
+    /// Calculates light intensity as a function of time.
+    /// </summary>
+    public static double CalculateLightLevel(LightCycleComponent comp, float time)
+    {
+        var waveLength = MathF.Max(1, (float) comp.Duration.TotalSeconds);
+        var crest = MathF.Max(0f, comp.MaxLightLevel);
+        var shift = MathF.Max(0f, comp.MinLightLevel);
+        return Math.Min(comp.ClipLight, CalculateCurve(time, waveLength, crest, shift, 6));
+    }
+
+    /// <summary>
+    /// It is important to note that each color must have a different exponent, to modify how early or late one color should stand out in relation to another.
+    /// This "simulates" what the atmosphere does and is what generates the effect of dawn and dusk.
+    /// The blue component must be a cosine function with half period, so that its minimum is at dawn and dusk, generating the "warm" color corresponding to these periods.
+    /// As you can see in the values, the maximums of the function serve more to define the curve behavior,
+    /// they must be "clipped" so as not to distort the original color of the lighting. In practice, the maximum values, in fact, are the clip thresholds.
+    /// </summary>
+    public static Color CalculateColorLevel(LightCycleComponent comp, float time)
+    {
+        var waveLength = MathF.Max(1f, (float) comp.Duration.TotalSeconds);
+
+        var red = MathF.Min(comp.ClipLevel.R,
+            CalculateCurve(time,
+                waveLength,
+                MathF.Max(0f, comp.MaxLevel.R),
+                MathF.Max(0f, comp.MinLevel.R),
+                4f));
+
+        var green = MathF.Min(comp.ClipLevel.G,
+            CalculateCurve(time,
+                waveLength,
+                MathF.Max(0f, comp.MaxLevel.G),
+                MathF.Max(0f, comp.MinLevel.G),
+                10f));
+
+        var blue = MathF.Min(comp.ClipLevel.B,
+            CalculateCurve(time,
+                waveLength / 2f,
+                MathF.Max(0f, comp.MaxLevel.B),
+                MathF.Max(0f, comp.MinLevel.B),
+                2,
+                waveLength / 4f));
+
+        return new Color(red, green, blue);
+    }
+
+    /// <summary>
+    /// Generates a sinusoidal curve as a function of x (time). The other parameters serve to adjust the behavior of the curve.
+    /// </summary>
+    /// <param name="x"> It corresponds to the independent variable of the function, which in the context of this algorithm is the current time. </param>
+    /// <param name="waveLength"> It's the wavelength of the function, it can be said to be the total duration of the light cycle. </param>
+    /// <param name="crest"> It's the maximum point of the function, where it will have its greatest value. </param>
+    /// <param name="shift"> It's the vertical displacement of the function, in practice it corresponds to the minimum value of the function. </param>
+    /// <param name="exponent"> It is the exponent of the sine, serves to "flatten" the function close to its minimum points and make it "steeper" close to its maximum. </param>
+    /// <param name="phase"> It changes the phase of the wave, like a "horizontal shift". It is important to transform the sinusoidal function into cosine, when necessary. </param>
+    /// <returns> The result of the function. </returns>
+    public static float CalculateCurve(float x,
+        float waveLength,
+        float crest,
+        float shift,
+        float exponent,
+        float phase = 0)
+    {
+        var sen = MathF.Pow(MathF.Sin((MathF.PI * (phase + x)) / waveLength), exponent);
+        return (crest - shift) * sen + shift;
+    }
+}
diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
index f6929278ed7..31b8d9c608f 100644
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Containers.ItemSlots;
-using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.UI.MapObjects;
 using Content.Shared.Whitelist;
@@ -171,7 +170,13 @@ public float GetFTLBufferRange(EntityUid shuttleUid, MapGridComponent? grid = nu
     /// <summary>
     /// Returns true if the spot is free to be FTLd to (not close to any objects and in range).
     /// </summary>
-    public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle angle, List<ShuttleExclusionObject>? exclusionZones)
+    public bool FTLFree(EntityUid shuttleUid,
+        EntityCoordinates coordinates,
+        Angle angle,
+        List<ShuttleExclusionObject>? exclusionZones,
+        bool travelToPlanets = false,
+        bool ignoreExclusionZones = false,
+        float ftlRange = 512f)
     {
         if (!_physicsQuery.TryGetComponent(shuttleUid, out var shuttlePhysics) ||
             !_xformQuery.TryGetComponent(shuttleUid, out var shuttleXform))
@@ -179,9 +184,12 @@ public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle a
             return false;
         }
 
+        if (travelToPlanets && ignoreExclusionZones)
+            return true; // We're skipping both checks anyways so uhhh. Have fun with that.
+
         // Just checks if any grids inside of a buffer range at the target position.
         _grids.Clear();
-        var mapCoordinates = coordinates.ToMap(EntityManager, XformSystem);
+        var mapCoordinates = XformSystem.ToMapCoordinates(coordinates);
 
         var ourPos = Maps.GetGridPosition((shuttleUid, shuttlePhysics, shuttleXform));
 
@@ -189,14 +197,14 @@ public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle a
         var targetPosition = mapCoordinates.Position;
 
         // Check range even if it's cross-map.
-        if ((targetPosition - ourPos).Length() > FTLRange)
+        if ((targetPosition - ourPos).Length() > ftlRange)
         {
             return false;
         }
 
         // Check exclusion zones.
         // This needs to be passed in manually due to PVS.
-        if (exclusionZones != null)
+        if (!ignoreExclusionZones && exclusionZones != null)
         {
             foreach (var exclusion in exclusionZones)
             {
@@ -210,6 +218,9 @@ public bool FTLFree(EntityUid shuttleUid, EntityCoordinates coordinates, Angle a
             }
         }
 
+        if (travelToPlanets)
+            return true;
+
         var ourFTLBuffer = GetFTLBufferRange(shuttleUid);
         var circle = new PhysShapeCircle(ourFTLBuffer + FTLBufferRange, targetPosition);
 
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 868d26c3aea..e4c74aec46f 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
+using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
 using Content.Shared.Destructible;
@@ -26,6 +27,7 @@
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
 using Robust.Shared.Input.Binding;
@@ -34,36 +36,46 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
 namespace Content.Shared.Storage.EntitySystems;
 
 public abstract class SharedStorageSystem : EntitySystem
 {
+    [Dependency] private   readonly IConfigurationManager _cfg = default!;
+    [Dependency] protected readonly IGameTiming Timing = default!;
     [Dependency] private   readonly IPrototypeManager _prototype = default!;
     [Dependency] protected readonly IRobustRandom Random = default!;
+    [Dependency] private   readonly ISharedAdminLogManager _adminLog = default!;
+
     [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!;
     [Dependency] private   readonly EntityLookupSystem _entityLookupSystem = default!;
+    [Dependency] private   readonly EntityWhitelistSystem _whitelistSystem = default!;
+    [Dependency] private   readonly InventorySystem _inventory = default!;
     [Dependency] private   readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
-    [Dependency] private   readonly SharedContainerSystem _containerSystem = default!;
+    [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
     [Dependency] private   readonly SharedDoAfterSystem _doAfterSystem = default!;
     [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!;
     [Dependency] private   readonly SharedInteractionSystem _interactionSystem = default!;
-    [Dependency] private   readonly InventorySystem _inventory = default!;
     [Dependency] protected readonly SharedItemSystem ItemSystem = default!;
     [Dependency] private   readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private   readonly SharedHandsSystem _sharedHandsSystem = default!;
     [Dependency] private   readonly SharedStackSystem _stack = default!;
     [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
-    [Dependency] private   readonly SharedUserInterfaceSystem _ui = default!;
+    [Dependency] protected readonly SharedUserInterfaceSystem UI = default!;
     [Dependency] protected readonly UseDelaySystem UseDelay = default!;
-    [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
-    [Dependency] private readonly ISharedAdminLogManager _adminLog = default!;
 
     private EntityQuery<ItemComponent> _itemQuery;
     private EntityQuery<StackComponent> _stackQuery;
     private EntityQuery<TransformComponent> _xformQuery;
+    private EntityQuery<UserInterfaceUserComponent> _userQuery;
+
+    /// <summary>
+    /// Whether we're allowed to go up-down storage via UI.
+    /// </summary>
+    public bool NestedStorage = true;
 
     [ValidatePrototypeId<ItemSizePrototype>]
     public const string DefaultStorageMaxItemSize = "Normal";
@@ -75,10 +87,15 @@ public abstract class SharedStorageSystem : EntitySystem
 
     private ItemSizePrototype _defaultStorageMaxItemSize = default!;
 
+    /// <summary>
+    /// Flag for whether we're checking for nested storage interactions.
+    /// </summary>
+    private bool _nestedCheck;
+
     public bool CheckingCanInsert;
 
-    private List<EntityUid> _entList = new();
-    private HashSet<EntityUid> _entSet = new();
+    private readonly List<EntityUid> _entList = new();
+    private readonly HashSet<EntityUid> _entSet = new();
 
     private readonly List<ItemSizePrototype> _sortedSizes = new();
     private FrozenDictionary<string, ItemSizePrototype> _nextSmallest = FrozenDictionary<string, ItemSizePrototype>.Empty;
@@ -86,6 +103,11 @@ public abstract class SharedStorageSystem : EntitySystem
     private const string QuickInsertUseDelayID = "quickInsert";
     private const string OpenUiUseDelayID = "storage";
 
+    /// <summary>
+    /// How many storage windows are allowed to be open at once.
+    /// </summary>
+    private int _openStorageLimit = -1;
+
     protected readonly List<string> CantFillReasons = [];
 
     /// <inheritdoc />
@@ -96,8 +118,11 @@ public override void Initialize()
         _itemQuery = GetEntityQuery<ItemComponent>();
         _stackQuery = GetEntityQuery<StackComponent>();
         _xformQuery = GetEntityQuery<TransformComponent>();
+        _userQuery = GetEntityQuery<UserInterfaceUserComponent>();
         _prototype.PrototypesReloaded += OnPrototypesReloaded;
 
+        Subs.CVar(_cfg, CCVars.StorageLimit, OnStorageLimitChanged, true);
+
         Subs.BuiEvents<StorageComponent>(StorageComponent.StorageUiKey.Key, subs =>
         {
             subs.Event<BoundUIClosedEvent>(OnBoundUIClosed);
@@ -107,7 +132,6 @@ public override void Initialize()
         SubscribeLocalEvent<StorageComponent, MapInitEvent>(OnMapInit);
         SubscribeLocalEvent<StorageComponent, GetVerbsEvent<ActivationVerb>>(AddUiVerb);
         SubscribeLocalEvent<StorageComponent, ComponentGetState>(OnStorageGetState);
-        SubscribeLocalEvent<StorageComponent, ComponentHandleState>(OnStorageHandleState);
         SubscribeLocalEvent<StorageComponent, ComponentInit>(OnComponentInit, before: new[] { typeof(SharedContainerSystem) });
         SubscribeLocalEvent<StorageComponent, GetVerbsEvent<UtilityVerb>>(AddTransferVerbs);
         SubscribeLocalEvent<StorageComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(ItemSlotsSystem) });
@@ -115,6 +139,7 @@ public override void Initialize()
         SubscribeLocalEvent<StorageComponent, OpenStorageImplantEvent>(OnImplantActivate);
         SubscribeLocalEvent<StorageComponent, AfterInteractEvent>(AfterInteract);
         SubscribeLocalEvent<StorageComponent, DestructionEventArgs>(OnDestroy);
+        SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundUIAttempt);
         SubscribeLocalEvent<StorageComponent, BoundUIOpenedEvent>(OnBoundUIOpen);
         SubscribeLocalEvent<StorageComponent, LockToggledEvent>(OnLockToggled);
         SubscribeLocalEvent<MetaDataComponent, StackCountChangedEvent>(OnStackCountChanged);
@@ -125,10 +150,11 @@ public override void Initialize()
 
         SubscribeLocalEvent<StorageComponent, AreaPickupDoAfterEvent>(OnDoAfter);
 
+        SubscribeAllEvent<OpenNestedStorageEvent>(OnStorageNested);
+        SubscribeAllEvent<StorageTransferItemEvent>(OnStorageTransfer);
         SubscribeAllEvent<StorageInteractWithItemEvent>(OnInteractWithItem);
         SubscribeAllEvent<StorageSetItemLocationEvent>(OnSetItemLocation);
         SubscribeAllEvent<StorageInsertItemIntoLocationEvent>(OnInsertItemIntoLocation);
-        SubscribeAllEvent<StorageRemoveItemEvent>(OnRemoveItem);
         SubscribeAllEvent<StorageSaveItemLocationEvent>(OnSaveItemLocation);
 
         SubscribeLocalEvent<StorageComponent, GotReclaimedEvent>(OnReclaimed);
@@ -138,12 +164,24 @@ public override void Initialize()
             .Bind(ContentKeyFunctions.OpenBelt, InputCmdHandler.FromDelegate(HandleOpenBelt, handle: false))
             .Register<SharedStorageSystem>();
 
+        Subs.CVar(_cfg, CCVars.NestedStorage, OnNestedStorageCvar, true);
+
         UpdatePrototypeCache();
     }
 
+    private void OnNestedStorageCvar(bool obj)
+    {
+        NestedStorage = obj;
+    }
+
+    private void OnStorageLimitChanged(int obj)
+    {
+        _openStorageLimit = obj;
+    }
+
     private void OnRemove(Entity<StorageComponent> entity, ref ComponentRemove args)
     {
-        _ui.CloseUi(entity.Owner, StorageComponent.StorageUiKey.Key);
+        UI.CloseUi(entity.Owner, StorageComponent.StorageUiKey.Key);
     }
 
     private void OnMapInit(Entity<StorageComponent> entity, ref MapInitEvent args)
@@ -172,28 +210,6 @@ private void OnStorageGetState(EntityUid uid, StorageComponent component, ref Co
         };
     }
 
-    private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref ComponentHandleState args)
-    {
-        if (args.Current is not StorageComponentState state)
-            return;
-
-        component.Grid.Clear();
-        component.Grid.AddRange(state.Grid);
-        component.MaxItemSize = state.MaxItemSize;
-        component.Whitelist = state.Whitelist;
-        component.Blacklist = state.Blacklist;
-
-        component.StoredItems.Clear();
-
-        foreach (var (nent, location) in state.StoredItems)
-        {
-            var ent = EnsureEntity<StorageComponent>(nent, uid);
-            component.StoredItems[ent] = location;
-        }
-
-        component.SavedLocations = state.SavedLocations;
-    }
-
     public override void Shutdown()
     {
         _prototype.PrototypesReloaded -= OnPrototypesReloaded;
@@ -228,7 +244,7 @@ private void UpdatePrototypeCache()
 
     private void OnComponentInit(EntityUid uid, StorageComponent storageComp, ComponentInit args)
     {
-        storageComp.Container = _containerSystem.EnsureContainer<Container>(uid, StorageComponent.ContainerId);
+        storageComp.Container = ContainerSystem.EnsureContainer<Container>(uid, StorageComponent.ContainerId);
         UpdateAppearance((uid, storageComp, null));
     }
 
@@ -247,7 +263,7 @@ private void CloseNestedInterfaces(EntityUid uid, EntityUid actor, StorageCompon
         // close ui
         foreach (var entity in storageComp.Container.ContainedEntities)
         {
-            _ui.CloseUis(entity, actor);
+            UI.CloseUis(entity, actor);
         }
     }
 
@@ -256,7 +272,7 @@ private void OnBoundUIClosed(EntityUid uid, StorageComponent storageComp, BoundU
         CloseNestedInterfaces(uid, args.Actor, storageComp);
 
         // If UI is closed for everyone
-        if (!_ui.IsUiOpen(uid, args.UiKey))
+        if (!UI.IsUiOpen(uid, args.UiKey))
         {
             UpdateAppearance((uid, storageComp, null));
             Audio.PlayPredicted(storageComp.StorageCloseSound, uid, args.Actor);
@@ -269,7 +285,7 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<
             return;
 
         // Does this player currently have the storage UI open?
-        var uiOpen = _ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User);
+        var uiOpen = UI.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User);
 
         ActivationVerb verb = new()
         {
@@ -277,7 +293,7 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<
             {
                 if (uiOpen)
                 {
-                    _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.User);
+                    UI.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.User);
                 }
                 else
                 {
@@ -315,16 +331,16 @@ public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? sto
         if (!CanInteract(entity, (uid, storageComp), silent: silent))
             return;
 
+        if (!UI.TryOpenUi(uid, StorageComponent.StorageUiKey.Key, entity))
+            return;
+
         if (!silent)
         {
-            if (!_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key))
-                Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity);
+            Audio.PlayPredicted(storageComp.StorageOpenSound, uid, entity);
 
             if (useDelay != null)
                 UseDelay.TryResetDelay((uid, useDelay), id: OpenUiUseDelayID);
         }
-
-        _ui.OpenUi(uid, StorageComponent.StorageUiKey.Key, entity);
     }
 
     public virtual void UpdateUI(Entity<StorageComponent?> entity) {}
@@ -382,18 +398,43 @@ private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInW
             return;
 
         // Toggle
-        if (_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User))
+        if (UI.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.User))
         {
-            _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.User);
+            UI.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.User);
         }
         else
         {
-            OpenStorageUI(uid, args.User, storageComp, false);
+            // Handle recursively opening nested storages.
+            if (ContainerSystem.TryGetContainingContainer((args.Target, null, null), out var container) &&
+                UI.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, args.User))
+            {
+                _nestedCheck = true;
+                HideStorageWindow(container.Owner, args.User);
+                OpenStorageUI(uid, args.User, storageComp, silent: true);
+                _nestedCheck = false;
+            }
+            else
+            {
+                // If you need something more sophisticated for multi-UI you'll need to code some smarter
+                // interactions.
+                if (_openStorageLimit == 1)
+                    UI.CloseUserUis<StorageComponent.StorageUiKey>(args.User);
+
+                OpenStorageUI(uid, args.User, storageComp, silent: false);
+            }
         }
 
         args.Handled = true;
     }
 
+    protected virtual void HideStorageWindow(EntityUid uid, EntityUid actor)
+    {
+    }
+
+    protected virtual void ShowStorageWindow(EntityUid uid, EntityUid actor)
+    {
+    }
+
     /// <summary>
     /// Specifically for storage implants.
     /// </summary>
@@ -402,7 +443,13 @@ private void OnImplantActivate(EntityUid uid, StorageComponent storageComp, Open
         if (args.Handled)
             return;
 
-        OpenStorageUI(uid, args.Performer, storageComp, false);
+        var uiOpen = UI.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, args.Performer);
+
+        if (uiOpen)
+            UI.CloseUi(uid, StorageComponent.StorageUiKey.Key, args.Performer);
+        else
+            OpenStorageUI(uid, args.Performer, storageComp, false);
+
         args.Handled = true;
     }
 
@@ -466,7 +513,7 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
             if (args.Target is not { Valid: true } target)
                 return;
 
-            if (_containerSystem.IsEntityInContainer(target)
+            if (ContainerSystem.IsEntityInContainer(target)
                 || target == args.User
                 || !_itemQuery.HasComponent(target))
             {
@@ -517,7 +564,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
             var entity = GetEntity(args.Entities[i]);
 
             // Check again, situation may have changed for some entities, but we'll still pick up any that are valid
-            if (_containerSystem.IsEntityInContainer(entity)
+            if (ContainerSystem.IsEntityInContainer(entity)
                 || entity == args.Args.User
                 || !_itemQuery.HasComponent(entity))
             {
@@ -562,7 +609,7 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
 
     private void OnReclaimed(EntityUid uid, StorageComponent storageComp, GotReclaimedEvent args)
     {
-        _containerSystem.EmptyContainer(storageComp.Container, destination: args.ReclaimerCoordinates);
+        ContainerSystem.EmptyContainer(storageComp.Container, destination: args.ReclaimerCoordinates);
     }
 
     private void OnDestroy(EntityUid uid, StorageComponent storageComp, DestructionEventArgs args)
@@ -570,7 +617,7 @@ private void OnDestroy(EntityUid uid, StorageComponent storageComp, DestructionE
         var coordinates = TransformSystem.GetMoverCoordinates(uid);
 
         // Being destroyed so need to recalculate.
-        _containerSystem.EmptyContainer(storageComp.Container, destination: coordinates);
+        ContainerSystem.EmptyContainer(storageComp.Container, destination: coordinates);
     }
 
     /// <summary>
@@ -622,17 +669,52 @@ private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEve
         TrySetItemStorageLocation(item!, storage!, msg.Location);
     }
 
-    private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args)
+    private void OnStorageNested(OpenNestedStorageEvent msg, EntitySessionEventArgs args)
     {
-        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item))
+        if (!NestedStorage)
+            return;
+
+        if (!TryGetEntity(msg.InteractedItemUid, out var itemEnt))
+            return;
+
+        _nestedCheck = true;
+
+        var result = ValidateInput(args,
+            msg.StorageUid,
+            msg.InteractedItemUid,
+            out var player,
+            out var storage,
+            out var item);
+
+        if (!result)
+        {
+            _nestedCheck = false;
+            return;
+        }
+
+        HideStorageWindow(storage.Owner, player.Owner);
+        OpenStorageUI(item.Owner, player.Owner, silent: true);
+        _nestedCheck = false;
+    }
+
+    private void OnStorageTransfer(StorageTransferItemEvent msg, EntitySessionEventArgs args)
+    {
+        if (!TryGetEntity(msg.ItemEnt, out var itemEnt))
+            return;
+
+        var localPlayer = args.SenderSession.AttachedEntity;
+
+        if (!TryComp(localPlayer, out HandsComponent? handsComp) || !_sharedHandsSystem.TryPickup(localPlayer.Value, itemEnt.Value, handsComp: handsComp, animate: false))
+            return;
+
+        if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true))
             return;
 
         _adminLog.Add(
             LogType.Storage,
             LogImpact.Low,
-            $"{ToPrettyString(player):player} is removing {ToPrettyString(item):item} from {ToPrettyString(storage):storage}");
-        TransformSystem.DropNextTo(item.Owner, player.Owner);
-        Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams);
+            $"{ToPrettyString(player):player} is inserting {ToPrettyString(item):item} into {ToPrettyString(storage):storage}");
+        InsertAt(storage!, item!, msg.Location, out _, player, stackAutomatically: false);
     }
 
     private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args)
@@ -655,9 +737,46 @@ private void OnSaveItemLocation(StorageSaveItemLocationEvent msg, EntitySessionE
         SaveItemLocation(storage!, item.Owner);
     }
 
-    private void OnBoundUIOpen(EntityUid uid, StorageComponent storageComp, BoundUIOpenedEvent args)
+    private void OnBoundUIOpen(Entity<StorageComponent> ent, ref BoundUIOpenedEvent args)
     {
-        UpdateAppearance((uid, storageComp, null));
+        UpdateAppearance((ent.Owner, ent.Comp, null));
+    }
+
+    private void OnBoundUIAttempt(BoundUserInterfaceMessageAttempt args)
+    {
+        if (args.UiKey is not StorageComponent.StorageUiKey.Key ||
+            _openStorageLimit == -1 ||
+            _nestedCheck ||
+            args.Message is not OpenBoundInterfaceMessage)
+            return;
+
+        var uid = args.Target;
+        var actor = args.Actor;
+        var count = 0;
+
+        if (_userQuery.TryComp(actor, out var userComp))
+        {
+            foreach (var (ui, keys) in userComp.OpenInterfaces)
+            {
+                if (ui == uid)
+                    continue;
+
+                foreach (var key in keys)
+                {
+                    if (key is not StorageComponent.StorageUiKey)
+                        continue;
+
+                    count++;
+
+                    if (count >= _openStorageLimit)
+                    {
+                        args.Cancel();
+                    }
+
+                    break;
+                }
+            }
+        }
     }
 
     private void OnEntInserted(Entity<StorageComponent> entity, ref EntInsertedIntoContainerMessage args)
@@ -673,7 +792,7 @@ private void OnEntInserted(Entity<StorageComponent> entity, ref EntInsertedIntoC
         {
             if (!TryGetAvailableGridSpace((entity.Owner, entity.Comp), (args.Entity, null), out var location))
             {
-                _containerSystem.Remove(args.Entity, args.Container, force: true);
+                ContainerSystem.Remove(args.Entity, args.Container, force: true);
                 return;
             }
 
@@ -735,7 +854,7 @@ public void UpdateAppearance(Entity<StorageComponent?, AppearanceComponent?> ent
         var capacity = storage.Grid.GetArea();
         var used = GetCumulativeItemAreas((uid, storage));
 
-        var isOpen = _ui.IsUiOpen(entity.Owner, StorageComponent.StorageUiKey.Key);
+        var isOpen = UI.IsUiOpen(entity.Owner, StorageComponent.StorageUiKey.Key);
 
         _appearance.SetData(uid, StorageVisuals.StorageUsed, used, appearance);
         _appearance.SetData(uid, StorageVisuals.Capacity, capacity, appearance);
@@ -845,7 +964,7 @@ public bool CanInsert(
         }
 
         CheckingCanInsert = true;
-        if (!_containerSystem.CanInsert(insertEnt, storageComp.Container))
+        if (!ContainerSystem.CanInsert(insertEnt, storageComp.Container))
         {
             CheckingCanInsert = false;
             reason = null;
@@ -946,7 +1065,7 @@ public bool Insert(
 
         if (!stackAutomatically || !_stackQuery.TryGetComponent(insertEnt, out var insertStack))
         {
-            if (!_containerSystem.Insert(insertEnt, storageComp.Container))
+            if (!ContainerSystem.Insert(insertEnt, storageComp.Container))
                 return false;
 
             if (playSound)
@@ -972,7 +1091,7 @@ public bool Insert(
 
         // Still stackable remaining
         if (insertStack.Count > 0
-            && !_containerSystem.Insert(insertEnt, storageComp.Container)
+            && !ContainerSystem.Insert(insertEnt, storageComp.Container)
             && toInsertCount == insertStack.Count)
         {
             // Failed to insert anything.
@@ -1050,6 +1169,7 @@ public bool TrySetItemStorageLocation(Entity<ItemComponent?> itemEnt, Entity<Sto
             return false;
 
         storageEnt.Comp.StoredItems[itemEnt] = location;
+        UpdateUI(storageEnt);
         Dirty(storageEnt, storageEnt.Comp);
         return true;
     }
@@ -1182,6 +1302,7 @@ public void SaveItemLocation(Entity<StorageComponent?> ent, Entity<MetaDataCompo
         }
 
         Dirty(ent, ent.Comp);
+        UpdateUI((ent.Owner, ent.Comp));
     }
 
     /// <summary>
@@ -1353,16 +1474,16 @@ private void OnLockToggled(EntityUid uid, StorageComponent component, ref LockTo
             return;
 
         // Gets everyone looking at the UI
-        foreach (var actor in _ui.GetActors(uid, StorageComponent.StorageUiKey.Key).ToList())
+        foreach (var actor in UI.GetActors(uid, StorageComponent.StorageUiKey.Key).ToList())
         {
             if (!CanInteract(actor, (uid, component)))
-                _ui.CloseUi(uid, StorageComponent.StorageUiKey.Key, actor);
+                UI.CloseUi(uid, StorageComponent.StorageUiKey.Key, actor);
         }
     }
 
     private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args)
     {
-        if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
+        if (ContainerSystem.TryGetContainingContainer((uid, null, component), out var container) &&
             container.ID == StorageComponent.ContainerId)
         {
             UpdateAppearance(container.Owner);
@@ -1394,13 +1515,13 @@ private void HandleToggleSlotUI(ICommonSession? session, string slot)
         if (!ActionBlocker.CanInteract(playerEnt, storageEnt))
             return;
 
-        if (!_ui.IsUiOpen(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt))
+        if (!UI.IsUiOpen(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt))
         {
             OpenStorageUI(storageEnt.Value, playerEnt, silent: false);
         }
         else
         {
-            _ui.CloseUi(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt);
+            UI.CloseUi(storageEnt.Value, StorageComponent.StorageUiKey.Key, playerEnt);
         }
     }
 
@@ -1455,7 +1576,7 @@ private bool ValidateInput(
         // TODO STORAGE use BUI events
         // This would automatically validate that the UI is open & that the user can interact.
         // However, we still need to manually validate that items being used are in the users hands or in the storage.
-        if (!_ui.IsUiOpen(storageUid.Value, StorageComponent.StorageUiKey.Key, playerUid))
+        if (!UI.IsUiOpen(storageUid.Value, StorageComponent.StorageUiKey.Key, playerUid))
             return false;
 
         if (!ActionBlocker.CanInteract(playerUid, storageUid))
diff --git a/Content.Shared/Storage/StorageComponent.cs b/Content.Shared/Storage/StorageComponent.cs
index d2c607e57f7..d9022e37750 100644
--- a/Content.Shared/Storage/StorageComponent.cs
+++ b/Content.Shared/Storage/StorageComponent.cs
@@ -138,6 +138,19 @@ public enum StorageUiKey : byte
         }
     }
 
+    [Serializable, NetSerializable]
+    public sealed class OpenNestedStorageEvent : EntityEventArgs
+    {
+        public readonly NetEntity InteractedItemUid;
+        public readonly NetEntity StorageUid;
+
+        public OpenNestedStorageEvent(NetEntity interactedItemUid, NetEntity storageUid)
+        {
+            InteractedItemUid = interactedItemUid;
+            StorageUid = storageUid;
+        }
+    }
+
     [Serializable, NetSerializable]
     public sealed class StorageInteractWithItemEvent : EntityEventArgs
     {
@@ -170,16 +183,22 @@ public StorageSetItemLocationEvent(NetEntity itemEnt, NetEntity storageEnt, Item
     }
 
     [Serializable, NetSerializable]
-    public sealed class StorageRemoveItemEvent : EntityEventArgs
+    public sealed class StorageTransferItemEvent : EntityEventArgs
     {
         public readonly NetEntity ItemEnt;
 
+        /// <summary>
+        /// Target storage to receive the transfer.
+        /// </summary>
         public readonly NetEntity StorageEnt;
 
-        public StorageRemoveItemEvent(NetEntity itemEnt, NetEntity storageEnt)
+        public readonly ItemStorageLocation Location;
+
+        public StorageTransferItemEvent(NetEntity itemEnt, NetEntity storageEnt, ItemStorageLocation location)
         {
             ItemEnt = itemEnt;
             StorageEnt = storageEnt;
+            Location = location;
         }
     }
 
diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
index 274828a2086..05daa7060c8 100644
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -19,7 +19,17 @@ private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args
             args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor),
                 ("mode", GetLocSelector(component.SelectedMode))));
             args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor),
-                ("fireRate", $"{component.FireRateModified:0.0}")));
+                ("fireRate", $"{(int) (component.FireRate * 60)}")));
+
+            if (!component.AvailableModes.HasFlag(SelectiveFire.Burst))
+                return;
+
+            if (component.FireRate != component.BurstFireRate)
+                args.PushMarkup(Loc.GetString("gun-burst-fire-rate-examine", ("color", FireRateExamineColor),
+                    ("fireRate", $"{(int) (component.BurstFireRate * 60)}")));
+
+            args.PushMarkup(Loc.GetString("gun-burst-fire-burst-count", ("color", FireRateExamineColor),
+                ("burstcount", $"{component.ShotsPerBurst}")));
         }
     }
 
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
index 5e9f6c946a7..c7feee6d4c6 100644
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryAddMarkingStepComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class SurgeryAddMarkingStepComponent : Component
     ///     against the entity to validate that the marking is not already present.
     /// </summary>
     [DataField]
-    public String MatchString = "";
+    public string MatchString = string.Empty;
 
     /// <summary>
     ///     What type of organ is required for this surgery?
diff --git a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
index d0e4c260e98..ca76fb78900 100644
--- a/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
+++ b/Content.Shared/_Shitmed/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs
@@ -18,12 +18,11 @@ public sealed partial class SurgeryRemoveMarkingStepComponent : Component
     ///     against the entity to validate that the marking is present.
     /// </summary>
     [DataField]
-    public String MatchString = "";
+    public string MatchString = string.Empty;
 
     /// <summary>
     ///     Will this step spawn an item as a result of removing the markings? If so, which?
     /// </summary>
     [DataField]
     public EntProtoId? ItemSpawn = default!;
-
 }
diff --git a/Resources/Audio/Effects/Emotes/attributions.yml b/Resources/Audio/Effects/Emotes/attributions.yml
index 0c62b483660..f351964e467 100644
--- a/Resources/Audio/Effects/Emotes/attributions.yml
+++ b/Resources/Audio/Effects/Emotes/attributions.yml
@@ -23,3 +23,11 @@
   license: "CC-BY-SA-3.0"
   copyright: "Taken from https://github.com/infinitystation/Baystation12/commit/e639451bef42230a3838c085a6c782376e693499. No changes were made"
   source: "https://github.com/infinitystation/Baystation12"
+- files:
+    - harpyHoot1.ogg
+    - harpyHoot2.ogg
+    - harpyHoot3.ogg
+    - harpyHoot4.ogg
+  license: "CC-BY-NC-4.0"
+  copyright: "Taken from https://pixabay.com/sound-effects/owl-hooting-223549/ & https://pixabay.com/sound-effects/owl-humanatone-102805/. Volume lowered for audio balancing purposes and converted to mono."
+  source: "https://pixabay.com/sound-effects/"
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot1.ogg b/Resources/Audio/Effects/Emotes/harpyHoot1.ogg
new file mode 100644
index 00000000000..cad05eee413
Binary files /dev/null and b/Resources/Audio/Effects/Emotes/harpyHoot1.ogg differ
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot2.ogg b/Resources/Audio/Effects/Emotes/harpyHoot2.ogg
new file mode 100644
index 00000000000..ccdff1d1c58
Binary files /dev/null and b/Resources/Audio/Effects/Emotes/harpyHoot2.ogg differ
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot3.ogg b/Resources/Audio/Effects/Emotes/harpyHoot3.ogg
new file mode 100644
index 00000000000..d1b4a899948
Binary files /dev/null and b/Resources/Audio/Effects/Emotes/harpyHoot3.ogg differ
diff --git a/Resources/Audio/Effects/Emotes/harpyHoot4.ogg b/Resources/Audio/Effects/Emotes/harpyHoot4.ogg
new file mode 100644
index 00000000000..33aae2aa693
Binary files /dev/null and b/Resources/Audio/Effects/Emotes/harpyHoot4.ogg differ
diff --git a/Resources/Audio/_EE/Weapons/Guns/Gunshots/attributions.yml b/Resources/Audio/_EE/Weapons/Guns/Gunshots/attributions.yml
new file mode 100644
index 00000000000..521396aec56
--- /dev/null
+++ b/Resources/Audio/_EE/Weapons/Guns/Gunshots/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["fpa-90-suppressed-gunshot"]
+  license: "CC-BY-4.0"
+  copyright: "Taken from https://freesound.org/people/Astronaut77890/sounds/714332/ and modified by VMSolidus"
+  source: "https://freesound.org/people/Astronaut77890/sounds/714332/"
diff --git a/Resources/Audio/_EE/Weapons/Guns/Gunshots/fpa-90-suppressed-gunshot.ogg b/Resources/Audio/_EE/Weapons/Guns/Gunshots/fpa-90-suppressed-gunshot.ogg
new file mode 100644
index 00000000000..f373456e5ab
Binary files /dev/null and b/Resources/Audio/_EE/Weapons/Guns/Gunshots/fpa-90-suppressed-gunshot.ogg differ
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b454a680ab7..549a2eabb2a 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -11623,3 +11623,216 @@ Entries:
   id: 6840
   time: '2025-02-12T17:33:25.0000000+00:00'
   url: https://github.com/Simple-Station/Einstein-Engines/pull/1771
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Removed the following maps from rotation: Pebble, Edge, Tortuga, Arena,
+        Asterisk, Hive, Hammurabi, and Submarine. These maps aren't permanently
+        gone, they just won't appear in the map vote list. If you want to see
+        them return in an official capacity, and have any talent/desire for
+        mapping, feel free to submit a PR to give one of these maps the
+        attention and care it deserves. None of them have received any updates
+        in over a year.
+  id: 6841
+  time: '2025-02-12T18:51:09.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1772
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: The Rouny sprite has been changed back into the old iconic sprite!
+  id: 6842
+  time: '2025-02-12T20:16:04.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1770
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Shuttles can now take off and land from planet surfaces. They however
+        will still respect exclusion zone beacons set by stations. Maybe in the
+        future there might be a special shuttle (drop pod) that is set to ignore
+        these exclusion zones.
+  id: 6843
+  time: '2025-02-13T02:40:00.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1774
+- author: Skubman
+  changes:
+    - type: Tweak
+      message: >-
+        Plasmamen now have a slightly lower density and thus lower weight than
+        the average species (this is a nerf).
+    - type: Tweak
+      message: >-
+        Plasmamen have their Slash resist increased from 15% to 20%, and their
+        Piercing resist increased from 25% to 40% (this is a buff).
+    - type: Tweak
+      message: >-
+        The cost of the envirosuit extinguisher refill in Loadouts has been
+        reduced from 5 points to 4 points.
+  id: 6844
+  time: '2025-02-13T03:21:10.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1769
+- author: The Den Contributors
+  changes:
+    - type: Add
+      message: Added a Trooper Uniform and Hat for Security use. (by Rosycup)
+    - type: Add
+      message: Harpies have gained the ability to hoot. (by KyuPolaris)
+    - type: Add
+      message: Added ability for Arachne to produce silk. (by KyuPolaris)
+    - type: Tweak
+      message: >-
+        Tweaked tool belts to take more tools and mantis belts to be able to fit
+        certain epistemics tools. (by Rosycup)
+    - type: Add
+      message: >-
+        Hopping, that's it. *hop and *hops now triggers the jump emote. (by
+        KyuPolaris)
+    - type: Fix
+      message: >-
+        Shadowkin are now able to select Psionic Power traits without taking the
+        Latent Psychic trait. (by Rosycup)
+  id: 6845
+  time: '2025-02-13T03:23:30.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1773
+- author: GNUtopia
+  changes:
+    - type: Add
+      message: Added .20 rifle rubber ammo box to bartender loadout
+    - type: Add
+      message: >-
+        Added age requirement to Argenti, repeater rifle, .45 magnum rubber ammo
+        box
+  id: 6846
+  time: '2025-02-13T03:32:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1768
+- author: EctoplasmIsGood
+  changes:
+    - type: Tweak
+      message: reenabled war ops
+  id: 6847
+  time: '2025-02-14T01:09:58.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1776
+- author: Erisfiregamer1
+  changes:
+    - type: Add
+      message: >-
+        New chemical, Sedin. It restores seeds on plants 20% of the time with
+        other adverse effects included.
+  id: 6848
+  time: '2025-02-14T19:00:16.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1786
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: >-
+        Nonlethal Ammunition research has been removed. Instead Security
+        Techfabs can manufacture rubber bullets at roundstart.
+  id: 6849
+  time: '2025-02-14T19:02:10.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1784
+- author: VMSolidus
+  changes:
+    - type: Tweak
+      message: 'Added the "Telecrystal Rebalance" from Goob. '
+  id: 6850
+  time: '2025-02-14T19:06:38.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1785
+- author: Skubman
+  changes:
+    - type: Fix
+      message: >-
+        The industrial ore processor can now make plasteel, uranium glass,
+        reinforced uranium glass, and refined diamonds again.
+  id: 6851
+  time: '2025-02-14T19:06:51.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1777
+- author: Sornarok
+  changes: []
+  id: 6852
+  time: '2025-02-14T19:14:37.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1778
+- author: Timfa2112
+  changes:
+    - type: Add
+      message: >-
+        Added disposable syringes! These cheaper, quicker-to-produce syringes
+        let Chemists pick dosages while preparing medicine so that doctors can
+        inject without worrying about volume, but the syringes cannot be used
+        more than once.
+  id: 6853
+  time: '2025-02-14T22:56:04.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1775
+- author: EctoplasmIsGood
+  changes:
+    - type: Add
+      message: High Cap Battery as a loadout item for IPCs
+  id: 6854
+  time: '2025-02-15T03:21:59.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1793
+- author: EctoplasmIsGood
+  changes:
+    - type: Add
+      message: >-
+        Gave BSO access to a filled combat medkit, a portafib, and a handheld
+        crew monitor
+  id: 6855
+  time: '2025-02-15T03:56:25.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1795
+- author: Diggy
+  changes:
+    - type: Add
+      message: >-
+        A trait for IPCs, which is essentially a platelet factories, at the same
+        trait cost, etc, as the normal platelet factories, and bionic legs,
+        which are just speed legs roundstart.
+  id: 6856
+  time: '2025-02-15T07:55:12.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1792
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        Added the FPA-90, an integrally supressed submachine gun. It can be
+        found either in the syndicate uplink, or manufactured at a security
+        techfab after Epistemics unlocks Advanced Weapons.
+    - type: Add
+      message: >-
+        Added the BRDI-R25, an integrally supressed bullpup rifle chambered in
+        .25 Caseless. It has an "Extremely fast" burst fire mode, and a "More
+        controllable" full-auto/semi mode. Unlike the FPA-90, it is not
+        available to syndicate agents. It can be manufactured after researching
+        Prototype Weapons.
+    - type: Add
+      message: >-
+        Antique variant of the BRDI-R25, which can be taken by the Head of
+        Security as his personal weapon.
+    - type: Add
+      message: Added a variety of different ammunition options to Syndicate uplinks.
+    - type: Add
+      message: >-
+        Security Techfabs can now manufacture .25 caseless rifle ammo and
+        magazines.
+  id: 6857
+  time: '2025-02-15T20:06:52.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1794
+- author: sleepyyapril
+  changes:
+    - type: Add
+      message: Ported Storage UI v2.
+    - type: Tweak
+      message: The guidebook will now remember where you left off.
+  id: 6858
+  time: '2025-02-15T22:21:57.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1799
+- author: sleepyyapril
+  changes:
+    - type: Add
+      message: Ported planet lighting for indoor / outdoor areas.
+    - type: Add
+      message: Ported day-night cycle functionality.
+    - type: Add
+      message: Ported some Storage UI v2 fixes.
+  id: 6859
+  time: '2025-02-16T17:27:39.0000000+00:00'
+  url: https://github.com/Simple-Station/Einstein-Engines/pull/1802
diff --git a/Resources/Locale/en-US/botany/seeds.ftl b/Resources/Locale/en-US/botany/seeds.ftl
new file mode 100644
index 00000000000..e2947301974
--- /dev/null
+++ b/Resources/Locale/en-US/botany/seeds.ftl
@@ -0,0 +1,2 @@
+botany-plant-seedsrestored = A healthy green tint returns to the plant's leaves.
+botany-plant-seedsdestroyed = The seeds on the plant start cracking and fall off!
diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
index 13b95c85397..acff55a9bbd 100644
--- a/Resources/Locale/en-US/chat/emotes.ftl
+++ b/Resources/Locale/en-US/chat/emotes.ftl
@@ -38,6 +38,7 @@ chat-emote-name-harpypew = Pew
 chat-emote-name-harpybang = Bang
 chat-emote-name-harpyrev = Rev
 chat-emote-name-harpycaw = Caw
+chat-emote-name-harpyhoot = Hoot
 # Vulp
 chat-emote-name-tailwag = Wag Tail
 chat-emote-name-vulpbark = Bark
diff --git a/Resources/Locale/en-US/chemistry/components/injector-component.ftl b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
index 0b7d485daf5..fc537de8aa1 100644
--- a/Resources/Locale/en-US/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/injector-component.ftl
@@ -2,14 +2,19 @@
 
 injector-draw-text = Draw
 injector-inject-text = Inject
+injector-spent-text = Spent
 injector-invalid-injector-toggle-mode = Invalid
 injector-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
     Mode: [color=white]{$modeString}[/color] ([color=white]{$transferVolume}u[/color])
 
+onetime-injector-simple-volume-label = Volume: [color=white]{$currentVolume}[/color]
+    Mode: [color=white]{$modeString}[/color]
+
 ## Entity
 
 injector-component-drawing-text = Now drawing
 injector-component-injecting-text = Now injecting
+injector-component-injecting-locked-text = Locked to inject
 injector-component-cannot-transfer-message = You aren't able to transfer to {$target}!
 injector-component-cannot-draw-message = You aren't able to draw from {$target}!
 injector-component-cannot-inject-message = You aren't able to inject to {$target}!
diff --git a/Resources/Locale/en-US/deltav/holopad/holopad.ftl b/Resources/Locale/en-US/deltav/holopad/holopad.ftl
new file mode 100644
index 00000000000..df3ca1c2d4b
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/holopad/holopad.ftl
@@ -0,0 +1,61 @@
+# Command
+holopad-command-lo = Command - LO
+holopad-command-mysta = Command - Mysta
+holopad-command-cj = Command - CJ
+holopad-command-evac = Command - Evac
+
+# Epistemics
+holopad-epistemics-anomaly = Epistemics - Anomaly
+holopad-epistemics-artifact = Epistemics - Artifact
+holopad-epistemics-robotics = Epistemics - Robotics
+holopad-epistemics-rnd = Epistemics - R&D
+holopad-epistemics-front = Epistemics - Front
+holopad-epistemics-breakroom = Epistemics - Breakroom
+holopad-epistemics-mantis = Epistemics - Mantis
+holopad-epistemics-oracle = Epistemics - Oracle
+
+# Logistics
+holopad-logistics-front = Logistics - Front
+holopad-logistics-cargo-bay = Logistics - Cargo Bay
+holodpad-logistics-mailroom = Logistics - Mailroom
+holodpad-logistics-mailfront = Logistics - Mail Front
+holopad-logistics-salvage-bay = Logistics - Salvage Bay
+holopad-logistics-breakroom  = Logistics - Breakroom
+holopad-logistics-ats = Logistics - ATS
+holopad-logistics-shuttle = Logistics - Shuttle
+
+# Justice
+holopad-justice-prosecutor = Justice - Prosecutor
+holopad-justice-attorney = Justice - Attorney
+holopad-justice-clerk = Justice - Clerk
+
+# Security
+holopad-security-corpsman = Security - Corpsman
+
+# General
+holopad-general-park = General - Park
+holopad-general-nitrogen-lounge = General - Nitrogen Lounge
+holopad-general-shipyard-dock = General - Shipyard Dock
+
+# Medical
+holopad-medical-psychologist = Medical - Psychologist
+holopad-medical-outpost = Medical - Outpost
+
+# Engineering
+holopad-engineering-pa-control = Engineering - PA Control
+
+# Service
+holopad-service-toolroom = Service - Toolroom
+holopad-service-barber-shop = Service - Barber Shop
+
+# Station Specific
+holopad-security-perma-kitchen = Security - Perma Kitchen
+holopad-security-perma-botany = Security - Perma Botany
+holopad-security-perma-yard-one = Security - Perma Yard One
+holopad-security-perma-yard-two = Security - Perma Yard Two
+holopad-security-perma-workshop = Security - Perma Workshop
+holopad-security-perma-guard-complex = Security - Perma Guard Complex
+holopad-security-perma-mineshaft = Security - Perma Mineshaft
+holopad-security-perma-arena = Security - Arena
+holopad-security-perma-gladiator-lounge = Security - Gladiator Lounge
+holopad-general-spesscar-track = General - Spesscar Track
diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
index 8d2571920ff..e8977c1009b 100644
--- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl
@@ -34,3 +34,4 @@ station-beacon-corpsman = Corpsman
 station-beacon-justice = Justice
 station-beacon-chiefjustice = Chief Justice
 station-beacon-prosecutor = Prosecutor
+station-beacon-clerk = Clerk
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
index 1ea79f2c16d..45574ee856d 100644
--- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -2,5 +2,6 @@ id-card-access-level-orders = Orders
 id-card-access-level-mantis = Mantis
 id-card-access-level-cj = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-clerk = Clerk
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index 705473c2eca..23dec750725 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -377,3 +377,26 @@ reagent-effect-guidebook-add-moodlet =
     }
 
 reagent-effect-guidebook-purify-evil = Purifies evil powers
+reagent-effect-guidebook-plant-diethylamine =
+    { $chance ->
+        [1] Increases
+        *[other] increase
+    } the plant's lifespan and/or base health with 10% chance for each
+
+reagent-effect-guidebook-plant-robust-harvest =
+    { $chance ->
+        [1] Increases
+        *[other] increase
+    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance
+
+reagent-effect-guidebook-plant-seeds-add =
+    { $chance ->
+        [1] Restores the
+        *[other] restore the
+    } seeds of the plant
+
+reagent-effect-guidebook-plant-seeds-remove =
+    { $chance ->
+        [1] Removes the
+        *[other] remove the
+    } seeds of the plant
diff --git a/Resources/Locale/en-US/guidebook/chemistry/plant-attributes.ftl b/Resources/Locale/en-US/guidebook/chemistry/plant-attributes.ftl
new file mode 100644
index 00000000000..ee82be04ad7
--- /dev/null
+++ b/Resources/Locale/en-US/guidebook/chemistry/plant-attributes.ftl
@@ -0,0 +1,10 @@
+plant-attribute-growth = age
+plant-attribute-water = water level
+plant-attribute-potency = potency
+plant-attribute-weeds = weeds level
+plant-attribute-toxins = toxins level
+plant-attribute-nutrition = nutrition level
+plant-attribute-mutation-level = mutation level
+plant-attribute-pests = pests level
+plant-attribute-mutation-mod = mutation modifier
+plant-attribute-health = health
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 65e8a46dc1b..6648eb8ae0e 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -43,6 +43,7 @@ materials-raw-plasma = raw plasma
 materials-raw-uranium = raw uranium
 materials-raw-bananium = raw bananium
 materials-raw-salt = raw salt
+materials-raw-diamond = raw diamond
 materials-raw-bluespace = raw bluespace
 materials-raw-normality = raw normality
 materials-raw-aluminium = raw aluminium
diff --git a/Resources/Locale/en-US/reagents/meta/botany.ftl b/Resources/Locale/en-US/reagents/meta/botany.ftl
index 912ded5cf29..607763dd3ce 100644
--- a/Resources/Locale/en-US/reagents/meta/botany.ftl
+++ b/Resources/Locale/en-US/reagents/meta/botany.ftl
@@ -21,3 +21,6 @@ reagent-desc-ammonia = An effective fertilizer, it gives your plants some nutrie
 
 reagent-name-diethylamine = diethylamine
 reagent-desc-diethylamine = A very potent fertilizer, treats plants with nutrients, eliminates pests, and sometimes it can even speed up growth.
+
+reagent-name-sedin = sedin
+reagent-desc-sedin = A modified version of diethylamine that can restore seeds on plants at the cost of potency.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 6d04cb19fe5..3bb8301b605 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -27,7 +27,6 @@ research-technology-basic-weapons = Basic Weapons
 research-technology-draconic-munitions = Draconic Munitions
 research-technology-uranium-munitions = Uranium Munitions
 research-technology-explosive-technology = Explosive Technology
-research-technology-nonlethal-ammunition = Nonlethal Ammunition
 research-technology-practice-ammunition = Practice Ammunition
 research-technology-advanced-weapons = Advanced Weapons
 research-technology-prototype-weapons = Prototype Weapons
diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
index 1c5272da076..601a24fbacd 100644
--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -85,12 +85,33 @@ uplink-shrapnel-grenade-desc = Launches a spray of sharp fragments dealing great
 uplink-pistol-magazine-name = Pistol Magazine (.35 auto)
 uplink-pistol-magazine-desc = Pistol magazine with 10 catridges. Compatible with the Viper.
 
+uplink-pistol-magazine-rubber-name = Pistol Magazine (.35 auto, rubber)
+uplink-pistol-magazine-rubber-desc = Pistol magazine with 10 cartridges. For when you need to take someone alive.
+
+uplink-pistol-magazine-incendiary-name = Pistol Magazine (.35 auto, incendiary)
+uplink-pistol-magazine-incendiary-desc = A premium magazine for putting burning holes in both your wallet, and your victims.
+
 uplink-pistol-magazine-c20r-name = SMG magazine (.35 auto)
 uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible with C-20r.
 
+uplink-pistol-magazine-c20r-rubber-name = SMG magazine (.35 auto, rubber)
+uplink-pistol-magazine-c20r-rubber-desc = Rifle magazine with 30 catridges. For when you need to take many hostages.
+
+uplink-pistol-magazine-c20r-incendiary-name = SMG magazine (.35 auto, incendiary)
+uplink-pistol-magazine-c20r-incendiary-desc = WAKE THE FUCK UP SAMURAI, WE GOT A STATION TO BURN!
+
 uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless)
 uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra.
 
+uplink-pistol-magazine-caseless-rubber-name = Pistol Magazine (.25 caseless, rubber)
+uplink-pistol-magazine-caseless-rubber-desc = Pistol magazine with 10 catridges. For when you need to (quietly) take someone alive.
+
+uplink-magazine-caseless-name = SMG magazine (.25 caseless)
+uplink-magazine-caseless-desc = Rifle magazine with 30 cartridges. Compatible with the FPA-90.
+
+uplink-magazine-caseless-rubber-name = SMG magazine (.25 caseless, rubber)
+uplink-magazine-caseless-rubber-desc = Rifle magazine with 30 cartridges. For when you need to (quietly) take many hostages.
+
 uplink-speedloader-magnum-name = Speedloader (.45 magnum AP)
 uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python.
 
@@ -116,7 +137,7 @@ uplink-chest-rig-name = Chest Rig
 uplink-chest-rig-desc = Explosion-resistant tactical webbing used for holding traitor goods.
 
 # DeltaV - Correct Emag name, Emag no longer breaks doors
-uplink-emag-name = Cryptographic Sequencer 
+uplink-emag-name = Cryptographic Sequencer
 uplink-emag-desc = The business card of the Syndicate, this sequencer is able to tamper with a variety of station devices. Rendered obsolete against airlocks.
 
 uplink-agent-id-card-name = Agent ID Card
@@ -244,6 +265,9 @@ uplink-surplus-bundle-desc = Contains 50 telecrystals worth of completely random
 uplink-super-surplus-bundle-name = Super Surplus Crate
 uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely random Syndicate items.
 
+uplink-fpa-90-bundle-name = FPA-90 Bundle
+uplink-fpa-90-bundle-desc = A cheap integrally suppressed SMG. Comes bundled with three .25 caseless magazines.
+
 # Tools
 uplink-toolbox-name = Toolbox
 uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves, syndicate gas mask and a utility belt.
@@ -321,8 +345,14 @@ uplink-eva-syndie-desc = A simple EVA suit that offers no protection other than
 uplink-hardsuit-carp-name = Carp Hardsuit
 uplink-hardsuit-carp-desc = Looks like an ordinary carp suit, except fully spaceproof and tricks space carp into thinking you are one of them.
 
-uplink-hardsuit-syndie-name = Syndicate Hardsuit
-uplink-hardsuit-syndie-desc = The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant.
+uplink-hardsuit-syndie-name = Blood-red Tacsuit
+uplink-hardsuit-syndie-desc = The calling card of pirates, outlaws, mercenaries, and deserters. The "Blood Red" Shanlin Tacsuit is an iconic piece of equipment employed by the Syndicate.
+
+uplink-hardsuit-syndie-medic-name = Blood-red Medic Tacsuit
+uplink-hardsuit-syndie-medic-desc = A variant of the "Blood-red" tacsuit that includes medical markings.
+
+uplink-hardsuit-syndie-commander-name = Blood-red "Commander" Tacsuit
+uplink-hardsuit-syndie-commander-desc = An up-armored variant of the iconic "Blood-red" tacsuit.
 
 uplink-hardsuit-syndieelite-name = Syndicate Elite Hardsuit
 uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.
diff --git a/Resources/Locale/en-US/traits/misc.ftl b/Resources/Locale/en-US/traits/misc.ftl
index 13eae985129..3a4b98278f6 100644
--- a/Resources/Locale/en-US/traits/misc.ftl
+++ b/Resources/Locale/en-US/traits/misc.ftl
@@ -1,5 +1,5 @@
 examine-cybereyes-message = {CAPITALIZE(POSS-ADJ($entity))} eyes shine with a faint inner light.
 examine-dermal-armor-message = {CAPITALIZE(POSS-ADJ($entity))} skin seems to be made of a sturdy, yet flexible plastic.
-examine-bionic-arm-message = {CAPITALIZE(POSS-ADJ($entity))} limbs emit an ever present faint chirp of servomotors.
-examine-thermal-vision-message = {CAPITALIZE(POSS-ADJ($entity))} eyes periodically pulse with a menacing red glare.
-
+examine-bionic-arm-message = {CAPITALIZE(POSS-ADJ($entity))} arms emit an ever present faint chirp of servomotors.
+examine-bionic-leg-message = {CAPITALIZE(POSS-ADJ($entity))} legs emit an ever present faint chirp of servomotors.
+examine-thermal-vision-message = {CAPITALIZE(POSS-ADJ($entity))} eyes periodically pulse with a menacing red glare.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index e02e273c08a..617e860729f 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -547,3 +547,12 @@ trait-name-LyreBird = Lyre Bird
 trait-description-LyreBird =
     Your natural talent for mimicry vastly exceeds that of other Harpies. You have the ability to perfectly imitate songs in their entirety.
     Be your own full symphony orchestra, jazz group, or metal band.
+
+trait-name-NaniteAutoRepairBots = Nanite Auto-Repair Bots
+trait-description-NaniteAutoRepairBots =
+    Your chassis has been outfitted with Nanite Repair Drones. Whenever your sensors detect that you've recieved structural damage, the NRDs will activate to bring you back to operational standards.
+
+trait-name-BionicLeg = Bionic Leg
+trait-description-BionicLeg =
+    One or more of your limbs have been replaced with an expensive, state of the art bionic. It could be either one made of highly realistic synthflesh,
+    or a more obvious metal limb. This limb provides enhanced speed to it's user, allowing you to run away from situations faster or get to a place faster.
diff --git a/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl b/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl
index 4a4aaf9f3d2..6eb72d7fe1c 100644
--- a/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl
+++ b/Resources/Locale/en-US/weapons/extenddescriptions/descriptions.ftl
@@ -1 +1,2 @@
 gun-legality-salvage = This weapon is licensed for use in planetary expeditions. It is unlawful to brandish this weapon aboard NanoTrasen stations, and may be confiscated by Security if removed from the station's Salvage Department.
+gun-suppressed = This weapon comes with a built-in suppressor. It will be impossible to hear at a distance.
diff --git a/Resources/Locale/en-US/weapons/ranged/gun.ftl b/Resources/Locale/en-US/weapons/ranged/gun.ftl
index fe60f3eed1d..ec9b1951340 100644
--- a/Resources/Locale/en-US/weapons/ranged/gun.ftl
+++ b/Resources/Locale/en-US/weapons/ranged/gun.ftl
@@ -1,6 +1,8 @@
 
 gun-selected-mode-examine = Current selected fire mode is [color={$color}]{$mode}[/color].
-gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] per second.
+gun-fire-rate-examine = Fire rate is [color={$color}]{$fireRate}[/color] rounds per minute.
+gun-burst-fire-rate-examine = Burst fire rate is [color={$color}]{$fireRate}[/color] rounds per minute.
+gun-burst-fire-burst-count = It can be set to fire in [color={$color}]{$burstcount}[/color] round bursts.
 gun-selector-verb = Change to {$mode}
 gun-selected-mode = Selected {$mode}
 gun-disabled = You can't use guns!
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index a9e3aa0cd8a..51453ad13a8 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -47,6 +47,7 @@
   - Justice # DeltaV - Add Justice dept access
   - ChiefJustice # DeltaV - Add Chief Justice access
   - Prosecutor # DeltaV - Add Prosecutor access
+  - Clerk # DeltaV - Add Clerk access
   - Corpsman # DeltaV - Add Corpsman access
   - BlueshieldOfficer # Goobstation - Add BSO Access
   - NanotrasenRepresentative # Goobstation - Add NTR Access
diff --git a/Resources/Prototypes/Actions/emotes.yml b/Resources/Prototypes/Actions/emotes.yml
index 6ed2b51c1ce..63b97e97723 100644
--- a/Resources/Prototypes/Actions/emotes.yml
+++ b/Resources/Prototypes/Actions/emotes.yml
@@ -32,4 +32,6 @@
   chatTriggers:
   - jump
   - jumps
+  - hop # TheDen
+  - hops # TheDen
   event: !type:AnimationJumpEmoteEvent
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index 73801981830..1ad57136963 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -282,6 +282,36 @@
       - id: DoubleEmergencyNitrogenTankFilled
       - id: DoubleEmergencyPlasmaTankFilled
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateHardsuitCommanderBundle
+  name: syndicate commander hardsuit bundle
+  description: "Contains the Syndicate's signature blood red hardsuit."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitSyndieCommander
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: DoubleEmergencyPlasmaTankFilled
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateHardsuitMedicBundle
+  name: syndicate medic hardsuit bundle
+  description: "Contains the Syndicate's signature blood red hardsuit."
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitSyndieMedic
+      - id: ClothingMaskGasSyndicate
+      - id: ClothingHandsGlovesCombat
+      - id: DoubleEmergencyOxygenTankFilled
+      - id: DoubleEmergencyNitrogenTankFilled
+      - id: DoubleEmergencyPlasmaTankFilled
+
 - type: entity
   parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
@@ -399,3 +429,15 @@
         amount: 2
       - id: SyndieTrickyBomb
         amount: 2
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateFilledFPA90
+  name: FPA-90 bundle
+  description: "A cheap integrally suppressed SMG. Comes bundled with three magazines."
+  components:
+  - type: StorageFill
+    contents:
+      - id: WeaponSubMachineGunFPA90
+      - id: MagazineCaselessRifle
+        amount: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
index 5b9dcec349b..f980fb67f10 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -12,7 +12,7 @@
     ClothingUniformJumpsuitLawyerGood: 1
     ClothingUniformJumpskirtLawyerGood: 1
     ClothingShoesBootsLaceup: 2
-    ClothingHeadsetService: 2
+    ClothingHeadsetJustice: 2 # DeltaV - Justice dept
     ClothingNeckLawyerbadge: 2
     ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
     RubberStampLawyer: 1 # DeltaV
diff --git a/Resources/Prototypes/Catalog/discount_categories.yml b/Resources/Prototypes/Catalog/discount_categories.yml
index 5c512e9009b..8e1ef010f87 100644
--- a/Resources/Prototypes/Catalog/discount_categories.yml
+++ b/Resources/Prototypes/Catalog/discount_categories.yml
@@ -1,7 +1,7 @@
 - type: discountCategory
   id: rareDiscounts # Dirty-cheap items that are rarely used and can be discounted to 0-ish cost to encourage usage.
   weight: 18
-  maxItems: 2
+  maxItems: 4
 
 - type: discountCategory
   id: usualDiscounts # Cheap items that are used not very often.
@@ -10,4 +10,4 @@
 - type: discountCategory
   id: veryRareDiscounts # Casually used items that are widely used but can be (rarely) discounted for epic lulz.
   weight: 2
-  maxItems: 1
+  maxItems: 2
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index e4c3639ef72..9421da3e330 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -8,9 +8,9 @@
   productEntity: WeaponPistolViper
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWeaponry
 
@@ -21,9 +21,9 @@
   productEntity: WeaponRevolverPythonAP
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 8 # Originally was 13 TC but was not used due to high cost
+    Telecrystal: 40
   categories:
   - UplinkWeaponry
 
@@ -35,9 +35,9 @@
   productEntity: WeaponPistolCobra
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkWeaponry
 
@@ -48,7 +48,7 @@
   description: uplink-rifle-mosin-desc
   productEntity: WeaponSniperMosin
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkWeaponry
 
@@ -59,10 +59,10 @@
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   productEntity: EnergySword
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkWeaponry
 
@@ -74,9 +74,9 @@
   productEntity: EnergyDaggerBox
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkWeaponry
 
@@ -88,9 +88,9 @@
   productEntity: ThrowingKnivesKit
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
     - UplinkWeaponry
 
@@ -102,9 +102,9 @@
   productEntity: ClothingHandsGlovesNorthStar
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkWeaponry
 
@@ -115,9 +115,9 @@
   productEntity: ToolboxElectricalTurretFilled
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkWeaponry
   conditions:
@@ -134,9 +134,9 @@
   productEntity: EnergyShield
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 16
+    Telecrystal: 80
   categories:
   - UplinkWeaponry
   conditions:
@@ -153,9 +153,9 @@
   productEntity: BriefcaseSyndieSniperBundleFilled
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 30
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkWeaponry
 
@@ -167,9 +167,9 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledSMG
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 10
+    Telecrystal: 50
   cost:
-    Telecrystal: 17
+    Telecrystal: 85
   categories:
   - UplinkWeaponry
 
@@ -181,9 +181,9 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 12
+    Telecrystal: 60
   cost:
-    Telecrystal: 20
+    Telecrystal: 100
   categories:
   - UplinkWeaponry
 
@@ -195,9 +195,9 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 20
+    Telecrystal: 100
   cost:
-    Telecrystal: 25
+    Telecrystal: 125
   categories:
   - UplinkWeaponry
 
@@ -209,9 +209,23 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledLMG
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 24
+    Telecrystal: 120
   cost:
-    Telecrystal: 30
+    Telecrystal: 150
+  categories:
+  - UplinkWeaponry
+
+- type: listing
+  id: UplinkFPA90Bundle
+  name: uplink-fpa-90-bundle-name
+  description: uplink-fpa-90-bundle-desc
+  icon: { sprite: /Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledFPA90
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 40
+  cost:
+    Telecrystal: 80
   categories:
   - UplinkWeaponry
 
@@ -224,9 +238,9 @@
   productEntity: ExGrenade
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkExplosives
 
@@ -236,7 +250,7 @@
   description: uplink-flash-grenade-desc
   productEntity: GrenadeFlashBang
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkExplosives
 
@@ -246,7 +260,7 @@
   description: uplink-smoke-grenade-desc
   productEntity: SmokeGrenade
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkExplosives
 
@@ -257,9 +271,9 @@
   productEntity: SyndieMiniBomb
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
     - UplinkExplosives
 
@@ -270,9 +284,9 @@
   productEntity: SupermatterGrenade
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
     - UplinkExplosives
 
@@ -283,9 +297,9 @@
   productEntity: WhiteholeGrenade
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
     - UplinkExplosives
 
@@ -296,9 +310,9 @@
   productEntity: MobGrenadePenguin
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
     - UplinkExplosives
   conditions:
@@ -314,9 +328,9 @@
   productEntity: C4
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkExplosives
 
@@ -327,9 +341,9 @@
   productEntity: ClothingBeltMilitaryWebbingGrenadeFilled
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 30
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkExplosives
   conditions:
@@ -345,9 +359,9 @@
   productEntity: ClothingBackpackDuffelSyndicateC4tBundle
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 8
+    Telecrystal: 40
   cost:
-    Telecrystal: 12 #you're buying bulk so its a 25% discount, so no additional random discount over it
+    Telecrystal: 60 #you're buying bulk so its a 25% discount, so no additional random discount over it
   categories:
   - UplinkExplosives
 
@@ -358,9 +372,9 @@
   productEntity: EmpGrenade
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkExplosives
 
@@ -372,9 +386,9 @@
   productEntity: PenExplodingBox
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkExplosives
 
@@ -384,7 +398,7 @@
   description: uplink-exploding-syndicate-bomb-desc
   productEntity: SyndicateBomb
   cost:
-    Telecrystal: 11
+    Telecrystal: 55
   categories:
     - UplinkExplosives
   restockTime: 1800
@@ -400,7 +414,7 @@
   description: uplink-exploding-syndicate-bomb-desc
   productEntity: SyndicateBomb
   cost:
-    Telecrystal: 11
+    Telecrystal: 55
   categories:
     - UplinkExplosives
   conditions:
@@ -416,9 +430,9 @@
   productEntity: ClusterGrenade
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 5
+    Telecrystal: 25
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkExplosives
 
@@ -429,9 +443,9 @@
   productEntity: GrenadeShrapnel
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkExplosives
 
@@ -442,9 +456,9 @@
   productEntity: GrenadeIncendiary
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkExplosives
 
@@ -455,9 +469,9 @@
   productEntity: ElectricalDisruptionKit
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
     - UplinkExplosives
 
@@ -470,7 +484,29 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: red-icon }
   productEntity: MagazinePistol
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkPistol9mmMagazineRubber
+  name: uplink-pistol-magazine-rubber-name
+  description: uplink-pistol-magazine-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: rubber }
+  productEntity: MagazinePistolRubber
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkPistol9mmMagazineIncendiary
+  name: uplink-pistol-magazine-incendiary-name
+  description: uplink-pistol-magazine-incendiary-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi, state: practice }
+  productEntity: MagazinePistolIncendiary
+  cost:
+    Telecrystal: 8
   categories:
   - UplinkAmmo
 
@@ -482,11 +518,33 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: red-icon }
   productEntity: MagazinePistolSubMachineGun
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazinePistolSubMachineGunRubber
+  name: uplink-pistol-magazine-c20r-rubber-name
+  description: uplink-pistol-magazine-c20r-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: rubber }
+  productEntity: MagazinePistolSubMachineGunRubber
+  cost:
+    Telecrystal: 10
   categories:
   - UplinkAmmo
 
-# For the Cobra
+- type: listing
+  id: UplinkMagazinePistolSubMachineGunIncendiary
+  name: uplink-pistol-magazine-c20r-incendiary-name
+  description: uplink-pistol-magazine-c20r-incendiary-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi, state: practice }
+  productEntity: MagazinePistolSubMachineGunIncendiary
+  cost:
+    Telecrystal: 14
+  categories:
+  - UplinkAmmo
+
+# .25 Caseless Rifle, for the Cobra and FPA-90
 - type: listing
   id: UplinkMagazinePistolCaselessRifle
   name: uplink-pistol-magazine-caseless-name
@@ -494,7 +552,40 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: red-icon }
   productEntity: MagazinePistolCaselessRifle
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazinePistolCaselessRifleRubber
+  name: uplink-pistol-magazine-caseless-rubber-name
+  description: uplink-pistol-magazine-caseless-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi, state: rubber }
+  productEntity: MagazinePistolCaselessRifleRubber
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineCaselessRifle
+  name: uplink-magazine-caseless-name
+  description: uplink-magazine-caseless-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: red }
+  productEntity: MagazineCaselessRifle
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkMagazineCaselessRifleRubber
+  name: uplink-magazine-caseless-rubber-name
+  description: uplink-magazine-caseless-rubber-desc
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi, state: rubber }
+  productEntity: MagazineCaselessRifleRubber
+  cost:
+    Telecrystal: 10
   categories:
   - UplinkAmmo
 
@@ -506,7 +597,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon }
   productEntity: SpeedLoaderMagnumAP
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkAmmo
 
@@ -517,7 +608,7 @@
   description: uplink-mosin-ammo-desc
   productEntity: MagazineBoxLightRifle
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkAmmo
 
@@ -528,7 +619,7 @@
   description: uplink-sniper-ammo-desc
   productEntity: MagazineBoxAntiMateriel
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkAmmo
 
@@ -538,7 +629,7 @@
   description: uplink-ammo-bundle-desc
   productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
   cost:
-    Telecrystal: 15
+    Telecrystal: 75
   categories:
   - UplinkAmmo
   conditions:
@@ -561,9 +652,9 @@
   productEntity: HypopenBox
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkChemicals
 
@@ -575,9 +666,9 @@
   productEntity: HypoDartBox
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkChemicals
 
@@ -589,9 +680,9 @@
   productEntity: ChemicalSynthesisKit
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkChemicals
 
@@ -602,7 +693,7 @@
   icon: { sprite: /Textures/Structures/Wallmounts/signs.rsi, state: bio }
   productEntity: ClothingBackpackDuffelZombieBundle
   cost:
-    Telecrystal: 40
+    Telecrystal: 200
   categories:
   - UplinkChemicals
   conditions:
@@ -622,9 +713,9 @@
   productEntity: NocturineChemistryBottle
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkChemicals
 
@@ -635,9 +726,9 @@
   productEntity: MedkitCombatFilled
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 5
+    Telecrystal: 20
   categories:
   - UplinkChemicals
 
@@ -648,9 +739,9 @@
   productEntity: CombatMedipen
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 5
   cost:
-    Telecrystal: 4
+    Telecrystal: 10
   categories:
   - UplinkChemicals
 
@@ -661,9 +752,9 @@
   productEntity: Stimpack
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkChemicals
 
@@ -674,9 +765,9 @@
   productEntity: StimkitFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 8
+    Telecrystal: 40
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkChemicals
 
@@ -687,9 +778,9 @@
   productEntity: CigPackSyndicate
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkChemicals
 
@@ -700,9 +791,9 @@
   productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 16
+    Telecrystal: 80
   cost:
-    Telecrystal: 24
+    Telecrystal: 120
   categories:
   - UplinkChemicals
   conditions:
@@ -724,9 +815,9 @@
   productEntity: AgentIDCard
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkDeception
 
@@ -737,9 +828,9 @@
   productEntity: StealthBox
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
   - UplinkDeception
 
@@ -750,9 +841,9 @@
   productEntity: ChameleonProjector
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 7
+    Telecrystal: 35
   categories:
   - UplinkDeception
 
@@ -764,9 +855,9 @@
   productEntity: BoxEncryptionKeySyndie # Two for the price of one
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkDeception
 
@@ -777,7 +868,7 @@
   icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: ai_label }
   productEntity: EncryptionKeyBinarySyndicate
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkDeception
 
@@ -787,7 +878,7 @@
   description: uplink-cyberpen-desc
   productEntity: CyberPen
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkDeception
 
@@ -797,7 +888,7 @@
   description: uplink-decoy-disk-desc
   productEntity: NukeDiskFake
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkDeception
 
@@ -808,9 +899,9 @@
   productEntity: LanternFlash
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkDeception
 
@@ -821,9 +912,9 @@
   productEntity: BriefcaseSyndieLobbyingBundleFilled
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkDeception
   conditions:
@@ -838,9 +929,9 @@
   productEntity: BriefcaseSyndieLobbyingBundlePlasmamanFilled
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkDeception
   conditions:
@@ -866,7 +957,7 @@
   productEntity: ClothingBackpackDuffelSyndicateDecoyKitFilled
   discountCategory: usualDiscounts
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkDeception
 
@@ -877,9 +968,9 @@
   productEntity: SyndicateBombFake
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkDeception
 
@@ -892,9 +983,9 @@
   productEntity: Emag
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 2 # DV
+    Telecrystal: 10
   cost:
-    Telecrystal: 4 # DV was 8, can no longer emag doors
+    Telecrystal: 20
   categories:
   - UplinkDisruption
 
@@ -905,9 +996,9 @@
   productEntity: RadioJammer
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkDisruption
 
@@ -918,9 +1009,9 @@
   productEntity: BorgModuleSyndicateWeapon
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
   - UplinkDisruption
 
@@ -932,9 +1023,9 @@
   icon: { sprite: /Textures/Objects/Specific/Robotics/borgmodule.rsi, state: syndicateborgbomb }
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkDisruption
 
@@ -944,7 +1035,7 @@
   description: uplink-soap-desc
   productEntity: SoapSyndie
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkDisruption
 
@@ -955,9 +1046,9 @@
   productEntity: SlipocalypseClusterSoap
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkDisruption
 
@@ -968,9 +1059,9 @@
   productEntity: ToolboxSyndicateFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkDisruption
 
@@ -981,9 +1072,9 @@
   productEntity: SyndicateJawsOfLife
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkDisruption
 
@@ -994,9 +1085,9 @@
   productEntity: ClothingBackpackDuffelSyndicateFilledMedical
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkDisruption
 
@@ -1007,9 +1098,9 @@
   productEntity: PowerSink
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkDisruption
   conditions:
@@ -1024,7 +1115,7 @@
   description: uplink-super-surplus-bundle-desc
   productEntity: CrateSyndicateSuperSurplusBundle
   cost:
-    Telecrystal: 40
+    Telecrystal: 200
   categories:
   - UplinkDisruption
   conditions:
@@ -1044,9 +1135,9 @@
   productEntity: SingularityBeacon
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
     - UplinkDisruption
 
@@ -1060,9 +1151,9 @@
   productEntity: BoxHoloparasite
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 8
+    Telecrystal: 40
   cost:
-    Telecrystal: 14
+    Telecrystal: 70
   categories:
   - UplinkAllies
   conditions:
@@ -1079,9 +1170,9 @@
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 7
+    Telecrystal: 35
   cost:
-    Telecrystal: 16
+    Telecrystal: 80
   categories:
   - UplinkAllies
   conditions:
@@ -1097,7 +1188,7 @@
   productEntity: ReinforcementRadioSyndicateNukeops
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
   cost:
-    Telecrystal: 16
+    Telecrystal: 80
   categories:
   - UplinkAllies
   conditions:
@@ -1113,7 +1204,7 @@
   productEntity: ReinforcementRadioSyndicateCyborgAssault
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
   cost:
-    Telecrystal: 65
+    Telecrystal: 325
   categories:
     - UplinkAllies
   conditions:
@@ -1130,9 +1221,9 @@
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkAllies
   conditions:
@@ -1149,9 +1240,9 @@
   icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkAllies
   conditions:
@@ -1167,9 +1258,9 @@
   productEntity: DehydratedSpaceCarp
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkAllies
 
@@ -1181,9 +1272,9 @@
   productEntity: ReinforcementRadioSyndicateSyndiCat
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkAllies
 
@@ -1197,9 +1288,9 @@
   productEntity: StorageImplanter
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
     - UplinkImplants
   conditions:
@@ -1216,9 +1307,9 @@
   productEntity: FreedomImplanter
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
     - UplinkImplants
 
@@ -1230,9 +1321,9 @@
   productEntity: ScramImplanter
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 6 # it's a gamble that may kill you easily so 6 TC per 2 uses, second one more of a backup
+    Telecrystal: 30 # it's a gamble that may kill you easily so 6 TC per 2 uses, second one more of a backup
   categories:
     - UplinkImplants
 
@@ -1244,9 +1335,9 @@
   productEntity: DnaScramblerImplanter
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
     - UplinkImplants
 
@@ -1258,9 +1349,9 @@
   productEntity: EmpImplanter
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
     - UplinkImplants
 
@@ -1271,7 +1362,7 @@
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
   productEntity: MicroBombImplanter
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkImplants
   conditions:
@@ -1291,7 +1382,7 @@
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
   productEntity: MacroBombImplanter
   cost:
-    Telecrystal: 13
+    Telecrystal: 65
   categories:
     - UplinkImplants
   conditions:
@@ -1311,7 +1402,7 @@
   icon: { sprite: /Textures/Objects/Magic/magicactions.rsi, state: gib }
   productEntity: DeathAcidifierImplanter
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkImplants
   conditions:
@@ -1328,9 +1419,9 @@
   productEntity: UplinkImplanter
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkImplants
   conditions:
@@ -1345,7 +1436,7 @@
   description: uplink-deathrattle-implant-desc
   productEntity: BoxDeathRattleImplants
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkImplants
   conditions:
@@ -1367,9 +1458,9 @@
   productEntity: JetpackBlackFilled
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkWearables
 
@@ -1380,9 +1471,9 @@
   productEntity: ClothingMaskGasVoiceChameleon
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkWearables
 
@@ -1396,9 +1487,9 @@
   icon: { sprite: /Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi, state: icon }
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkWearables
 
@@ -1409,9 +1500,9 @@
   productEntity: ClothingShoesChameleonNoSlips
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkWearables
 
@@ -1422,9 +1513,9 @@
   productEntity: ThievingGloves
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkWearables
 
@@ -1435,9 +1526,9 @@
   productEntity: ClothingOuterVestWeb
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWearables
 
@@ -1448,9 +1539,9 @@
   productEntity: ClothingShoesBootsMagSyndie
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkWearables
 
@@ -1462,9 +1553,9 @@
   productEntity: ClothingBackpackDuffelSyndicateEVABundle
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkWearables
 
@@ -1476,9 +1567,9 @@
   productEntity: ClothingOuterHardsuitCarp
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 8
+    Telecrystal: 40
   categories:
   - UplinkWearables
 
@@ -1490,9 +1581,37 @@
   productEntity: ClothingBackpackDuffelSyndicateHardsuitBundle
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   cost:
-    Telecrystal: 10
+    Telecrystal: 50
+  categories:
+  - UplinkWearables
+
+- type: listing
+  id: UplinkHardsuitSyndieMedic
+  name: uplink-hardsuit-syndie-medic-name
+  description: uplink-hardsuit-syndie-medic-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateHardsuitMedicBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 20
+  cost:
+    Telecrystal: 50
+  categories:
+  - UplinkWearables
+
+- type: listing
+  id: UplinkHardsuitSyndieCommander
+  name: uplink-hardsuit-syndie-commander-name
+  description: uplink-hardsuit-syndie-commander-desc
+  icon: { sprite: /Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateHardsuitCommanderBundle
+  discountCategory: veryRareDiscounts
+  discountDownTo:
+    Telecrystal: 25
+  cost:
+    Telecrystal: 55
   categories:
   - UplinkWearables
 
@@ -1502,7 +1621,7 @@
   description: uplink-clothing-conducting-gloves-desc
   productEntity: ClothingHandsGlovesConducting
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkWearables
   conditions:
@@ -1523,9 +1642,9 @@
   productEntity: ClothingBackpackDuffelSyndicateEliteHardsuitBundle
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 7
+    Telecrystal: 35
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkWearables
 
@@ -1537,9 +1656,9 @@
   productEntity: CrateCybersunJuggernautBundle
   discountCategory: veryRareDiscounts
   discountDownTo:
-    Telecrystal: 8
+    Telecrystal: 40
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkWearables
 
@@ -1549,7 +1668,7 @@
   description: uplink-clothing-eyes-hud-syndicate-desc
   productEntity: ClothingEyesHudSyndicate
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
     - UplinkWearables
   conditions:
@@ -1569,9 +1688,9 @@
   productEntity: ClothingEyesNightVisionGogglesSyndie
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWearables
   conditions:
@@ -1587,9 +1706,9 @@
   productEntity: ClothingEyesNightVisionGogglesNukie
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWearables
   conditions:
@@ -1605,9 +1724,9 @@
   productEntity: ClothingEyesThermalVisionGogglesSyndie
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWearables
   conditions:
@@ -1623,9 +1742,9 @@
   productEntity: ClothingEyesThermalVisionGogglesNukie
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkWearables
   conditions:
@@ -1643,7 +1762,7 @@
   productEntity: RubberStampSyndicate
   discountCategory: rareDiscounts
   cost:
-    Telecrystal: 1
+    Telecrystal: 3
   categories:
   - UplinkPointless
 
@@ -1656,9 +1775,9 @@
   productEntity: GatfruitSeeds
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkJob
   conditions:
@@ -1673,9 +1792,9 @@
   productEntity: ClothingHandsGlovesBoxingRigged
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
     - UplinkJob
   conditions:
@@ -1690,9 +1809,9 @@
   productEntity: ClothingHandsGlovesBoxingRigged
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
     - UplinkJob
   conditions:
@@ -1707,9 +1826,9 @@
   productEntity: BibleNecronomicon
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkJob
   conditions:
@@ -1728,9 +1847,9 @@
   productEntity: HolyHandGrenade
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 14
+    Telecrystal: 70
   cost:
-    Telecrystal: 20
+    Telecrystal: 100
   categories:
   - UplinkJob
   conditions:
@@ -1745,9 +1864,9 @@
   productEntity: RevolverCapGunFake
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 5
+    Telecrystal: 25
   cost:
-    Telecrystal: 9
+    Telecrystal: 45
   categories:
   - UplinkJob
   conditions:
@@ -1764,9 +1883,9 @@
   productEntity: TrashBananaPeelExplosiveUnarmed
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 1
+    Telecrystal: 5
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkJob
   conditions:
@@ -1781,9 +1900,9 @@
   productEntity: ClusterBananaPeel
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 15
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkJob
   conditions:
@@ -1799,9 +1918,9 @@
   productEntity: BoxHoloclown
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 30
   cost:
-    Telecrystal: 12
+    Telecrystal: 60
   categories:
   - UplinkJob
   conditions:
@@ -1815,10 +1934,10 @@
   description: uplink-hot-potato-desc
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   productEntity: HotPotato
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkJob
   conditions:
@@ -1836,9 +1955,9 @@
   productEntity: WeaponPistolCHIMPUpgradeKit
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 4
+    Telecrystal: 20
   categories:
   - UplinkJob
   conditions:
@@ -1853,9 +1972,9 @@
   productEntity: WetFloorSignMineExplosive
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 5 # was 4, with my buff made it 5 to be closer to minibomb -panzer
+    Telecrystal: 25
   categories:
   - UplinkJob
   conditions:
@@ -1874,10 +1993,10 @@
   icon: { sprite:  Objects/Misc/monkeycube.rsi, state: box}
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 4
+    Telecrystal: 20
   productEntity: SyndicateSpongeBox
   cost:
-    Telecrystal: 7
+    Telecrystal: 35
   categories:
   - UplinkJob
   conditions:
@@ -1897,9 +2016,9 @@
   productEntity: CaneSheathFilled
   discountCategory: rareDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 5
+    Telecrystal: 25
   categories:
   - UplinkJob
   conditions:
@@ -1919,9 +2038,9 @@
   productEntity: CombatBakeryKit
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 2
+    Telecrystal: 10
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkJob
   conditions:
@@ -1936,7 +2055,7 @@
   description: uplink-emp-flashlight-desc
   productEntity: FlashlightEmp
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
     - UplinkAllies
 
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml
index 54dfc599bdf..10028438fd5 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/headOfSecurity.yml
@@ -37,6 +37,8 @@
       id: LoadoutCommandHoSEnergySword
     - type: loadout
       id: LoadoutCommandHoSEnergyGun
+    - type: loadout
+      id: LoadoutCommandHoSBRDIR25
 
 #- type: characterItemGroup
 #  id: LoadoutHeadOfSecurityEyes
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
index 976b831e436..0659bd9e1db 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Security/uncategorized.yml
@@ -174,6 +174,8 @@
       id: LoadoutClothingHeadHelmetBasic
     - type: loadout
       id: LoadoutSecurityHeadHelmetInsulated
+    - type: loadout
+      id: LoadoutSecurityHeadHatSeniorTrooper
 
 #- type: characterItemGroup
 #  id: LoadoutSecurityId
@@ -232,6 +234,8 @@
       id: LoadoutUniformJumpsuitSecFormal
     - type: loadout
       id: LoadoutUniformJumpsuitSecSummer
+    - type: loadout
+      id: LoadoutSecurityUniformJumpsuitSeniorTrooper
     - type: loadout
       id: LoadoutSecurityUniformEnvirosuitBlue
     - type: loadout
diff --git a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
index 27788fa2a51..d390b9364d4 100644
--- a/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
+++ b/Resources/Prototypes/CharacterItemGroups/Jobs/Service/bartender.yml
@@ -22,6 +22,10 @@
       id: LoadoutServiceBartenderBoxBeanbags
     - type: loadout
       id: LoadoutServiceBartenderBoxLightRifleRubber
+    - type: loadout
+      id: LoadoutServiceBartenderBoxRifleRubber
+    - type: loadout
+      id: LoadoutServiceBartenderBoxMagnumRubber
 
 - type: characterItemGroup
   id: LoadoutBartenderWeapon
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index cea34d04eaf..f576b51cefa 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -371,8 +371,8 @@
   id: Plasmaman
   coefficients:
     Blunt: 1.5
-    Slash: 0.85
-    Piercing: 0.75
+    Slash: 0.8
+    Piercing: 0.6
     Cold: 0
     Heat: 1.5
     Poison: 0.8
diff --git a/Resources/Prototypes/DeltaV/Access/justice.yml b/Resources/Prototypes/DeltaV/Access/justice.yml
index 33a2844ed20..87549f224a1 100644
--- a/Resources/Prototypes/DeltaV/Access/justice.yml
+++ b/Resources/Prototypes/DeltaV/Access/justice.yml
@@ -9,12 +9,17 @@
 - type: accessLevel
   id: Prosecutor
   name: id-card-access-level-prosecutor
+  
+- type: accessLevel
+  id: Clerk
+  name: id-card-access-level-clerk
 
 - type: accessGroup
   id: Justice
   tags:
   - Justice
   - Prosecutor
+  - Clerk
   - ChiefJustice
   - Lawyer
   
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
index ad42935662b..495e4cb456d 100644
--- a/Resources/Prototypes/DeltaV/Access/misc.yml
+++ b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -49,4 +49,5 @@
     - Zookeeper
     - Justice
     - Prosecutor
+    - Clerk
 
diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
index 6b389cbb25e..d55ab5f2422 100644
--- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -5,7 +5,7 @@
   productEntity: ReinforcementRadioSyndicateNukieMouse
   icon: { sprite: DeltaV/Objects/Devices/communication.rsi, state: cheese-radio }
   cost:
-    Telecrystal: 3
+    Telecrystal: 15
   categories:
   - UplinkAllies
 
@@ -15,7 +15,7 @@
   description: uplink-bionic-syrinx-implanter-desc
   productEntity: BionicSyrinxImplanter
   cost:
-    Telecrystal: 2
+    Telecrystal: 10
   categories:
   - UplinkImplants
   conditions:
@@ -33,7 +33,7 @@
   description: uplink-doorjack-desc
   productEntity: Doorjack
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkDisruption
 
@@ -46,8 +46,8 @@
     entity: BaseBallBatHomeRun
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 6
+    Telecrystal: 30
   cost:
-    Telecrystal: 16
+    Telecrystal: 80
   categories:
   - UplinkWeaponry
diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
index 170094d4f32..e2ffa31e530 100644
--- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml
@@ -54,7 +54,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
   - type: Sprite
@@ -73,7 +72,6 @@
     containers:
       key_slots:
       - EncryptionKeyJustice
-      - EncryptionKeyPrison
       - EncryptionKeySecurity
       - EncryptionKeyCommon
       - EncryptionKeyCommand
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
index bd3975767ba..6febd21c7dc 100644
--- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml
@@ -159,3 +159,11 @@
   components:
   - type: NavMapBeacon
     text: station-beacon-prosecutor
+    
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconClerk
+  suffix: Clerk
+  components:
+  - type: NavMapBeacon
+    text: station-beacon-clerk
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
index 3c1eed5892b..28f3c51732a 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml
@@ -81,6 +81,24 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockJustice
+  id: AirlockClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockClerkGlassLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 # Maintenance
 - type: entity
   parent: AirlockMaint
@@ -109,6 +127,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked
@@ -379,3 +406,44 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsSecurityLawyer ]
+
+# Command-locked External airlocks. These don't exist upstream for some reason.
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalCommandLocked
+  suffix: External, Command, Locked
+  components:
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassCommandLocked
+  suffix: External, Glass, Command, Locked
+  components:
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCommand ]
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalSecurityLocked
+  suffix: External, Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
+
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassSecurityLocked
+  suffix: External, Glass, Security, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsSecurity ]
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
index 93a8cec851a..b4d2436a0ac 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -8,6 +8,14 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScience
+  id: AirlockRobotics
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi
+
 # Glass
 
 - type: entity
@@ -20,3 +28,10 @@
   - type: PaintableAirlock
     department: Justice
 
+- type: entity
+  parent: AirlockScienceGlass
+  id: AirlockRoboticsGlass
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml
new file mode 100644
index 00000000000..c6682af53c9
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml
@@ -0,0 +1,18 @@
+#Roboticist - Delta-V Creation
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticist
+  suffix: Robotics
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi 
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyRoboticistGlass
+  suffix: Robotics, Glass
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi 
+    state: "assembly"
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
index 07938a3bf3c..a3738724302 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -49,6 +49,15 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureClerkLocked
+  suffix: Clerk, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsClerk ]
+      
 - type: entity
   parent: WindoorSecure
   id: WindoorSecureLawyerLocked
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/holopad.yml
new file mode 100644
index 00000000000..9f4704a8991
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/holopad.yml
@@ -0,0 +1,227 @@
+## Mapping prototypes
+#Command
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeCJ
+  suffix: Chief Justice
+  components:
+  - type: Label
+    currentLabel: holopad-command-cj
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandEvac
+  suffix: Command Evac
+  components:
+  - type: Label
+    currentLabel: holopad-command-evac
+
+#Justice
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeProsecutor
+  suffix: Prosecutor
+  components:
+  - type: Label
+    currentLabel: holopad-justice-prosecutor
+
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeClerk
+  suffix: Clerk
+  components:
+  - type: Label
+    currentLabel: holopad-justice-clerk
+
+#Logistics
+- type: entity
+  parent: Holopad
+  id: HolopadCargoMail
+  suffix: Mailroom
+  components:
+  - type: Label
+    currentLabel: holodpad-logistics-mailroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadCargoMailFront
+  suffix: Mail Front
+  components:
+  - type: Label
+    currentLabel: holodpad-logistics-mailfront
+
+#Epistemics
+- type: entity
+  parent: Holopad
+  id: HolopadEpistemicsMantis
+  suffix: Mantis
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-mantis
+
+- type: entity
+  parent: Holopad
+  id: HolopadEpistemicsOracle
+  suffix: Oracle
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-oracle
+
+#Security
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityCorpsman
+  suffix: Corpsman
+  components:
+  - type: Label
+    currentLabel: holopad-security-corpsman
+
+#Station Specific - Security
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaKitchen
+  suffix: Perma Kitchen
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-kitchen
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaBotany
+  suffix: Perma Botany
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-botany
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaYardOne
+  suffix: Perma Yard One
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-yard-one
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaYardTwo
+  suffix: Perma Yard Two
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-yard-two
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaWorkshop
+  suffix: Perma Workshop
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-workshop
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaGuardComplex
+  suffix: Perma Guard Complex
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-guard-complex
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPermaMineshaft
+  suffix: Perma Mineshaft
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-mineshaft
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityArena
+  suffix: Arena
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-arena
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityGladiatorLounge
+  suffix: Gladiator Lounge
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma-gladiator-lounge
+
+#General
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralPark
+  suffix: Park
+  components:
+  - type: Label
+    currentLabel: holopad-general-park
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralVoxNitrogenLounge
+  suffix: Nitrogen Lounge
+  components:
+  - type: Label
+    currentLabel: holopad-general-nitrogen-lounge
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralShipyardDock
+  suffix: Shipyard Dock
+  components:
+  - type: Label
+    currentLabel: holopad-general-shipyard-dock
+
+#Station Specific - General
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralSpesscarTrack
+  suffix: Spesscar Track
+  components:
+  - type: Label
+    currentLabel: holopad-general-spesscar-track
+
+#Medical
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalOutpost
+  suffix: Outpost
+  components:
+  - type: Label
+    currentLabel: holopad-medical-outpost
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalPsychologist
+  suffix: Psychologist
+  components:
+  - type: Label
+    currentLabel: holopad-medical-psychologist
+
+#Engineering
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringParticleAccelerator
+  suffix: PA Control
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-pa-control
+
+#Service
+- type: entity
+  parent: Holopad
+  id: HolopadServiceToolroom
+  suffix: Service Toolroom
+  components:
+  - type: Label
+    currentLabel: holopad-service-toolroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceBarberShop
+  suffix: Barber Shop
+  components:
+  - type: Label
+    currentLabel: holopad-service-barber-shop
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index b49002ab22b..3b2f72d5d9e 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -22,4 +22,4 @@
     stateDoorOpen: clerk_open
     stateDoorClosed: clerk_door
   - type: AccessReader
-    access: [["Justice"]]
+    access: [["Clerk"]]
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
index 35928109d76..55b749e1a84 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml
@@ -13,6 +13,9 @@
   - Command
   - ChiefJustice
   - Justice
+  - Lawyer
+  - Prosecutor
+  - Clerk
   - Security
   - Maintenance
   - External
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
index 7e4a2ebff0d..a41907c21ed 100644
--- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
+++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/clerk.yml
@@ -3,7 +3,6 @@
   name: job-name-clerk
   description: job-description-clerk
   playTimeTracker: JobClerk
-  antagAdvantage: 2
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Security
@@ -23,6 +22,7 @@
   canBeAntag: false
   access:
   - Justice
+  - Clerk
   - Security
   - Maintenance
 
diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
index c99d98ce517..81d0e4d83ad 100644
--- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml
+++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml
@@ -31,4 +31,4 @@
   id: JobIconAdminAssitant
   icon:
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
-    state: AdminAssistant
\ No newline at end of file
+    state: AdminAssistant
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
index 086030db302..38a270fb2db 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml
@@ -62,6 +62,8 @@
       collection: HarpySqueak
     HarpyCaw:
       collection: HarpyCaws
+    HarpyHoot:
+      collection: HarpyHoots
     Chirp:
       collection: HarpyChirps
     Snarl:
diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
index f6a2e271fde..67d632b385b 100644
--- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml
@@ -74,6 +74,21 @@
   chatTriggers:
     - caws
 
+- type: emote
+  id: HarpyHoot
+  name: chat-emote-name-harpyhoot
+  category: Vocal
+  icon: Interface/Emotes/caw.png
+  whitelist:
+    tags:
+    - HarpyEmotes
+  blacklist:
+    components:
+    - BorgChassis
+  chatMessages: [ hoots ]
+  chatTriggers:
+    - hoots
+
 #Vulpkanin
 - type: emote
   id: Bark
diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml
index 53490d90fac..4bf207472ac 100644
--- a/Resources/Prototypes/DeltaV/radio_channels.yml
+++ b/Resources/Prototypes/DeltaV/radio_channels.yml
@@ -3,7 +3,7 @@
   name: chat-radio-justice
   keycode: "j"
   frequency: 1420
-  color: "#701442"
+  color: "#c70667"
 
 - type: radioChannel
   id: Prison
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index dbb82d55785..396d331074f 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -43,6 +43,12 @@
         - TrayScanner
         - GasAnalyzer
         - HandLabeler
+        - RemoteSignaller
+        - RemoteSignallerAdvanced
+        - AnomalyScanner
+        - AnomalyLocatorUnpowered
+        - AnomalyLocatorWideUnpowered
+        - NodeScanner
   - type: ItemMapper
     mapLayers:
       drill:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 32b9daed5f4..b3aebe9d235 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -757,6 +757,8 @@
     clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
   - type: StaminaDamageResistance
     coefficient: 0.5 # 50%
+  - type: Item
+    size: Huge
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml
index 0b5107957b3..9483e4b0034 100644
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -174,10 +174,10 @@
   - type: PuddleFootPrints
 
 - type: entity
-  name: Footstep
+  name: footstep
   id: Footstep
   save: false
-  description: Trace of liquid
+  description: Trace of liquid.
   components:
     - type: Clickable
     - type: FootstepModifier
@@ -222,6 +222,12 @@
       examinable: false
     - type: ExaminableSolution
       solution: step
+    - type: MixableSolution
+      solution: step
     - type: DrawableSolution
       solution: step
     - type: BadDrink
+    - type: IgnoresFingerprints
+    - type: Tag
+      tags:
+      - DNASolutionScannable
diff --git a/Resources/Prototypes/Entities/Markers/tile.yml b/Resources/Prototypes/Entities/Markers/tile.yml
new file mode 100644
index 00000000000..2ced9e9958d
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/tile.yml
@@ -0,0 +1,37 @@
+- type: entity
+  id: BaseRoofMarker
+  abstract: true
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Transform
+    anchored: true
+  - type: Sprite
+    drawdepth: Overdoors
+    sprite: Markers/cross.rsi
+
+- type: entity
+  id: RoofMarker
+  name: Roof
+  suffix: Enabled
+  parent: BaseRoofMarker
+  components:
+  - type: SetRoof
+    value: true
+  - type: Sprite
+    layers:
+    - state: green
+      shader: unshaded
+
+- type: entity
+  id: NoRoofMarker
+  name: Roof
+  suffix: Disabled
+  parent: BaseRoofMarker
+  components:
+  - type: SetRoof
+    value: false
+  - type: Sprite
+    layers:
+    - state: red
+      shader: unshaded
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index 05922a94bfb..869950e5b76 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -17,6 +17,7 @@
     - Prison
     - Service
     - Supply
+    - Justice
   - type: ActiveRadio
     channels:
     - Binary
@@ -29,6 +30,7 @@
     - Prison
     - Service
     - Supply
+    - Justice
   - type: IgnoreUIRange
   - type: StationAiHeld
   - type: StationAiOverlay
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
index 022dc21d2a8..e276b43b741 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -88,6 +88,11 @@
       visible: false
   - type: HumanoidAppearance
     species: Arachne
+  - type: Sericulture
+    action: ActionSericulture
+    productionLength: 2
+    entityProduced: MaterialWebSilk1
+    hungerCost: 4 # Should total to 25 total silk on full hunger
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:
diff --git a/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml b/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
index 347579a18c8..02733684916 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/plasmaman.yml
@@ -65,6 +65,25 @@
     prototype: Plasmaman
     requiredLegs: 2
     gibSound: /Audio/Effects/bone_rattle.ogg
+  - type: SpawnGasOnGib
+    gasMixture:
+      moles:
+      - 0    # oxygen
+      - 0    # nitrogen
+      - 0    # CO2
+      - 100  # plasma
+  - type: Fixtures
+    fixtures: # TODO: This needs a second fixture just for mob collisions.
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 160
+        restitution: 0.0
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
   - type: Bloodstream
     bloodlossThreshold: 0
     bleedReductionAmount: 0
@@ -81,6 +100,36 @@
     bloodMaxVolume: 0
   - type: Damageable
     damageModifierSet: Plasmaman
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Blunt
+        damage: 400
+      behaviors:
+      - !type:GibBehavior { }
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 1500
+      behaviors:
+      - !type:SpawnEntitiesBehavior
+        spawnInContainer: true
+        spawn:
+          Ash:
+            min: 1
+            max: 1
+      - !type:BurnBodyBehavior { }
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MeatLaserImpact
+      - !type:SpawnGasBehavior
+        gasMixture:
+          moles:
+          - 0    # oxygen
+          - 0    # nitrogen
+          - 0    # CO2
+          - 80   # plasma, lower than gas on gibbing
   - type: DamageVisuals
     damageOverlayGroups:
       Brute:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
index c8db255f7b8..939a1d7a8ee 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -319,6 +319,14 @@
   - type: AccessReader
     access: [["ChiefJustice"]]
 
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsClerk
+  suffix: Clerk, Locked
+  components:
+  - type: AccessReader
+    access: [["Clerk"]]
+
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsJustice
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 2f86604711a..40cc1e4b00f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -327,6 +327,46 @@
   - type: Item
     sprite: Objects/Specific/Chemistry/dropper.rsi
 
+- type: entity
+  name: disposable syringe
+  parent: BaseItem
+  description: Used to inject mobs with controlled dosages of specific reagents. One-time use.
+  id: DisposableSyringe
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/disposablesyringe.rsi
+    layers:
+      - state: syringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: syringe_base0
+        map: ["enum.SolutionContainerLayers.Base"]
+  - type: Icon
+    sprite: Objects/Specific/Chemistry/disposablesyringe.rsi
+    state: "syringe_base0"
+  - type: Item
+    size: Tiny
+    sprite: Objects/Specific/Chemistry/disposablesyringe.rsi
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+  - type: FillableOneTimeInjector
+    transferAmount: 15
+    toggleState: Draw
+  - type: ExaminableSolution
+    solution: injector
+  - type: Spillable
+    solution: injector
+  - type: TrashOnSolutionEmpty
+    solution: injector
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: syringe
+    inHandsMaxFillLevels: 3
+    inHandsFillBaseName: -fill-
+
 - type: entity
   name: syringe
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
index d3dc41a74a7..479f43ad4b1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml
@@ -78,7 +78,7 @@
   components:
   - type: Store
     balance:
-      Telecrystal: 20
+      Telecrystal: 100
 
 - type: entity
   parent: BaseUplinkRadio
@@ -87,7 +87,7 @@
   components:
   - type: Store
     balance:
-      Telecrystal: 25
+      Telecrystal: 125
 
 #this uplink MUST be used for nukeops, as it has the tag for filtering the listing.
 - type: entity
@@ -97,7 +97,7 @@
   components:
   - type: Store
     balance:
-      Telecrystal: 40
+      Telecrystal: 250 # 5x TC, +cost of a tacsuit they no longer spawn with.
   - type: Tag
     tags:
     - NukeOpsUplink
@@ -109,7 +109,7 @@
   components:
   - type: Store
     balance:
-      Telecrystal: 60
+      Telecrystal: 350 # 5x TC, +cost of a tacsuit they no longer spawn with.
   - type: Tag
     tags:
     - NukeOpsUplink
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index bbc948bc021..84d52bf4d2c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -61,6 +61,7 @@
       - ChiefJustice  #Delta V: Add Chief Justice Access
       - Prosecutor  #Delta V: Add Prosecutor Access
       - Justice  #Delta V: Add Justice Access
+      - Clerk  #Delta V: Add Clerk Access
       privilegedIdSlot:
         name: id-card-console-privileged-id
         ejectSound: /Audio/Machines/id_swipe.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
index becbb638f4f..26015b1f3e1 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gps.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
@@ -14,8 +14,9 @@
   - type: HandheldGPS
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
-      Glass: 150
+      Aluminum: 300
+      Glass: 100
+      Circuitry: 25
   - type: Tag
     tags:
     - GPS
diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
index 8872b98c183..9afa20fc1bf 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -21,7 +21,8 @@
           Off: { state: tray-off }
   - type: PhysicalComposition
     materialComposition:
-      Steel: 400
-      Glass: 150
+      Aluminum: 300
+      Glass: 100
+      Circuitry: 25
   - type: StaticPrice
     price: 60
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index cc38a5bcde5..8cb90b00667 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -352,8 +352,9 @@
       - DoorElectronicsConfigurator
   - type: PhysicalComposition
     materialComposition:
-      Steel: 100
-      Plastic: 100
+      Aluminum: 50
+      Plastic: 50
+      Circuitry: 25
   - type: StaticPrice
     price: 56
 
@@ -452,7 +453,8 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 300
-      Plastic: 100
+      Plastic: 50
+      Circuitry: 50
 #  - type: DynamicPrice
 #    price: 100
   - type: StaticPrice
@@ -525,8 +527,9 @@
     - Belt
   - type: PhysicalComposition
     materialComposition:
-      Steel: 600
-      Plastic: 150
+      Steel: 400
+      Plastic: 100
+      Circuitry: 50
   - type: StaticPrice
     price: 100
   - type: UserInterface
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index 2cb30277d20..9ca751b55d0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -14,6 +14,7 @@
     security:    Structures/Doors/Airlocks/Standard/security.rsi
     virology:    Structures/Doors/Airlocks/Standard/virology.rsi
     justice:     DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi # Delta V - Add Justice Dept
+    roboticist:  DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi #Added Roboticist Role
 
 - type: AirlockGroup
   id: Glass
@@ -30,6 +31,7 @@
     security:    Structures/Doors/Airlocks/Glass/security.rsi
     virology:    Structures/Doors/Airlocks/Glass/virology.rsi
     justice:     DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Delta V - Add Justice Dept
+    roboticist:  DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi #Added Roboticist Role
 
 - type: AirlockGroup
   id: Windoor
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 191f7dba941..efa4e2e7df7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -201,6 +201,44 @@
     color: "#c94242"
   - type: Computer
     board: SyndicateShuttleConsoleCircuitboard
+  - type: ShuttleConsole
+    ftlToPlanets: true
+
+- type: entity
+  parent: BaseComputerShuttle
+  id: ComputerShuttleSyndieDropPod
+  name: syndicate drop pod console
+  description: "Used to launch a drop pod. It's a one way trip, make sure you've packed your lunch."
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: syndishuttle
+    - map: ["computerLayerKeys"]
+      state: syndie_key
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: Tag
+    tags:
+      - Syndicate
+  - type: RadarConsole
+    maxRange: 384
+  - type: WorldLoader
+    radius: 1536
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#c94242"
+  - type: Computer
+    board: SyndicateShuttleConsoleCircuitboard
+  - type: ShuttleConsole
+    ftlToPlanets: true
+    ignoreExclusionZones: true # It can intentionally be crashed into the station, crushing whatever's underneath the target location.
+    oneWayTrip: true
 
 - type: entity
   parent: BaseComputerShuttle
@@ -233,6 +271,8 @@
     board: CargoShuttleConsoleCircuitboard
   - type: StealTarget
     stealGroup: CargoShuttleConsoleCircuitboard
+  - type: ShuttleConsole
+    ftlToPlanets: true
 
 - type: entity
   parent: BaseComputerShuttle
@@ -263,6 +303,8 @@
       board: SalvageShuttleConsoleCircuitboard
     - type: StealTarget
       stealGroup: SalvageShuttleConsoleCircuitboard
+    - type: ShuttleConsole
+      ftlToPlanets: true
 
 - type: entity
   parent: BaseComputerAiAccess
@@ -1334,6 +1376,8 @@
   name: AI upload console
   description: Used to update the laws of the station AI.
   components:
+  - type: Computer
+    board: StationAiUploadCircuitboard
   - type: Sprite
     layers:
     - map: [ "computerLayerBody" ]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
index 234652ed40f..8ed547a10e5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -181,3 +181,673 @@
   - type: Tag
     tags:
     - HideContextMenu
+
+## Mapping prototypes
+# General
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralTools
+  suffix: Tools
+  components:
+  - type: Label
+    currentLabel: holopad-general-tools
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralCryosleep
+  suffix: Cryosleep
+  components:
+  - type: Label
+    currentLabel: holopad-general-cryosleep
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralTheater
+  suffix: Theater
+  components:
+  - type: Label
+    currentLabel: holopad-general-theater
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralDisposals
+  suffix: Disposals
+  components:
+  - type: Label
+    currentLabel: holopad-general-disposals
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralEVAStorage
+  suffix: EVA Storage
+  components:
+  - type: Label
+    currentLabel: holopad-general-eva
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralLounge
+  suffix: Lounge
+  components:
+  - type: Label
+    currentLabel: holopad-general-lounge
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralArcade
+  suffix: Arcade
+  components:
+  - type: Label
+    currentLabel: holopad-general-arcade
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralEvac
+  suffix: Evac
+  components:
+  - type: Label
+    currentLabel: holopad-general-evac
+
+- type: entity
+  parent: Holopad
+  id: HolopadGeneralArrivals
+  suffix: Arrivals
+  components:
+  - type: Label
+    currentLabel: holopad-general-arrivals
+
+# Command
+- type: entity
+  parent: Holopad
+  id: HolopadCommandBridge
+  suffix: Bridge
+  components:
+  - type: Label
+    currentLabel: holopad-command-bridge
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandVault
+  suffix: Vault
+  components:
+  - type: Label
+    currentLabel: holopad-command-vault
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandBridgeHallway
+  suffix: Bridge Hallway
+  components:
+  - type: Label
+    currentLabel: holopad-command-bridge-hallway
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandMeetingRoom
+  suffix: Command Meeting
+  components:
+  - type: Label
+    currentLabel: holopad-command-meeting-room
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandLounge
+  suffix: Command Lounge
+  components:
+  - type: Label
+    currentLabel: holopad-command-lounge
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandCaptain
+  suffix: Captain
+  components:
+  - type: Label
+    currentLabel: holopad-command-captain
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandHop
+  suffix: HoP
+  components:
+  - type: Label
+    currentLabel: holopad-command-hop
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandCmo
+  suffix: CMO
+  components:
+  - type: Label
+    currentLabel: holopad-command-cmo
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandQm
+  suffix: LO # DeltaV - QM > LO
+  components:
+  - type: Label
+    currentLabel: holopad-command-lo # DeltaV - QM > LO
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandCe
+  suffix: CE
+  components:
+  - type: Label
+    currentLabel: holopad-command-ce
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandRd
+  suffix: Mysta # DeltaV - RD > Mysta
+  components:
+  - type: Label
+    currentLabel: holopad-command-mysta # DeltaV - RD > Mysta
+
+- type: entity
+  parent: Holopad
+  id: HolopadCommandHos
+  suffix: HoS
+  components:
+  - type: Label
+    currentLabel: holopad-command-hos
+
+# Science
+- type: entity
+  parent: Holopad
+  id: HolopadScienceAnomaly
+  suffix: Anomaly
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-anomaly # DeltaV - Science > Epistemics
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceArtifact
+  suffix: Artifact
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-artifact # DeltaV - Science > Epistemics
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceRobotics
+  suffix: Robotics
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-robotics # DeltaV - Science > Epistemics
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceRnd
+  suffix: R&D
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-rnd # DeltaV - Science > Epistemics
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceFront
+  suffix: Epi Front # DeltaV - Science > Epistemics
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-front # DeltaV - Science > Epistemics
+
+- type: entity
+  parent: Holopad
+  id: HolopadScienceBreakroom
+  suffix: Epi Breakroom # DeltaV - Science > Epistemics
+  components:
+  - type: Label
+    currentLabel: holopad-epistemics-breakroom # DeltaV - Science > Epistemics
+
+# Medical
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalMedbay
+  suffix: Medbay
+  components:
+  - type: Label
+    currentLabel: holopad-medical-medbay
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalChemistry
+  suffix: Chemistry
+  components:
+  - type: Label
+    currentLabel: holopad-medical-chemistry
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalCryopods
+  suffix: Cryopods
+  components:
+  - type: Label
+    currentLabel: holopad-medical-cryopods
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalMorgue
+  suffix: Morgue
+  components:
+  - type: Label
+    currentLabel: holopad-medical-morgue
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalSurgery
+  suffix: Surgery
+  components:
+  - type: Label
+    currentLabel: holopad-medical-surgery
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalParamed
+  suffix: Paramedic
+  components:
+  - type: Label
+    currentLabel: holopad-medical-paramedic
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalVirology
+  suffix: Virology
+  components:
+  - type: Label
+    currentLabel: holopad-medical-virology
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalFront
+  suffix: Med Front
+  components:
+  - type: Label
+    currentLabel: holopad-medical-front
+
+- type: entity
+  parent: Holopad
+  id: HolopadMedicalBreakroom
+  suffix: Med Breakroom
+  components:
+  - type: Label
+    currentLabel: holopad-medical-breakroom
+
+# Cargo
+- type: entity
+  parent: Holopad
+  id: HolopadCargoFront
+  suffix: Logistics Front # DeltaV - Cargo > Logistics
+  components:
+  - type: Label
+    currentLabel: holopad-logistics-front # DeltaV - Cargo > Logistics
+
+- type: entity
+  parent: Holopad
+  id: HolopadCargoBay
+  suffix: Cargo Bay
+  components:
+  - type: Label
+    currentLabel: holopad-logistics-cargo-bay # DeltaV - Cargo > Logistics
+
+- type: entity
+  parent: Holopad
+  id: HolopadCargoSalvageBay
+  suffix: Salvage Bay
+  components:
+  - type: Label
+    currentLabel: holopad-logistics-salvage-bay # DeltaV - Cargo > Logistics
+
+- type: entity
+  parent: Holopad
+  id: HolopadCargoBreakroom
+  suffix: Logistics Breakroom
+  components:
+  - type: Label
+    currentLabel: holopad-logistics-breakroom # DeltaV - Cargo > Logistics
+
+# Engineering
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringAtmosFront
+  suffix: Atmos Front
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-atmos-front
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringAtmosMain
+  suffix: Atmos Main
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-atmos-main
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringAtmosTeg
+  suffix: TEG
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-atmos-teg
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringStorage
+  suffix: Engi Storage
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-storage
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringBreakroom
+  suffix: Engi Breakroom
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-breakroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringFront
+  suffix: Engi Front
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-front
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringTelecoms
+  suffix: Telecoms
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-telecoms
+
+- type: entity
+  parent: Holopad
+  id: HolopadEngineeringTechVault
+  suffix: Tech Vault
+  components:
+  - type: Label
+    currentLabel: holopad-engineering-tech-vault
+
+# Security
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityFront
+  suffix: Sec Front
+  components:
+  - type: Label
+    currentLabel: holopad-security-front
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityBrig
+  suffix: Brig
+  components:
+  - type: Label
+    currentLabel: holopad-security-brig
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityWarden
+  suffix: Warden
+  components:
+  - type: Label
+    currentLabel: holopad-security-warden
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityInterrogation
+  suffix: Interrogation
+  components:
+  - type: Label
+    currentLabel: holopad-security-interrogation
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityBreakroom
+  suffix: Breakroom
+  components:
+  - type: Label
+    currentLabel: holopad-security-breakroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityDetective
+  suffix: Detective
+  components:
+  - type: Label
+    currentLabel: holopad-security-detective
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityPerma
+  suffix: Perma
+  components:
+  - type: Label
+    currentLabel: holopad-security-perma
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityCourtroom
+  suffix: Courtroom
+  components:
+  - type: Label
+    currentLabel: holopad-security-courtroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityLawyer
+  suffix: Attorney # DeltaV - Lawyer > Attorney
+  components:
+  - type: Label
+    currentLabel: holopad-justice-attorney # DeltaV - Lawyer > Attorney
+
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityArmory
+  suffix: Armory
+  components:
+  - type: Label
+    currentLabel: holopad-security-armory
+
+# Service
+- type: entity
+  parent: Holopad
+  id: HolopadServiceJanitor
+  suffix: Janitor
+  components:
+  - type: Label
+    currentLabel: holopad-service-janitor
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceBar
+  suffix: Bar
+  components:
+  - type: Label
+    currentLabel: holopad-service-bar
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceKitchen
+  suffix: Kitchen
+  components:
+  - type: Label
+    currentLabel: holopad-service-kitchen
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceBotany
+  suffix: Botany
+  components:
+  - type: Label
+    currentLabel: holopad-service-botany
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceChapel
+  suffix: Chapel
+  components:
+  - type: Label
+    currentLabel: holopad-service-chapel
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceLibrary
+  suffix: Library
+  components:
+  - type: Label
+    currentLabel: holopad-service-library
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceNewsroom
+  suffix: Newsroom
+  components:
+  - type: Label
+    currentLabel: holopad-service-newsroom
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceZookeeper
+  suffix: Zookeeper
+  components:
+  - type: Label
+    currentLabel: holopad-service-zookeeper
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceBoxer
+  suffix: Boxer
+  components:
+  - type: Label
+    currentLabel: holopad-service-boxer
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceClown
+  suffix: Clown
+  components:
+  - type: Label
+    currentLabel: holopad-service-clown
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceMusician
+  suffix: Musician
+  components:
+  - type: Label
+    currentLabel: holopad-service-musician
+
+- type: entity
+  parent: Holopad
+  id: HolopadServiceMime
+  suffix: Mime
+  components:
+  - type: Label
+    currentLabel: holopad-service-mime
+
+# AI
+- type: entity
+  parent: Holopad
+  id: HolopadAiCore
+  suffix: AI Core
+  components:
+  - type: Label
+    currentLabel: holopad-ai-core
+
+- type: entity
+  parent: Holopad
+  id: HolopadAiMain
+  suffix: AI Main
+  components:
+  - type: Label
+    currentLabel: holopad-ai-main
+
+- type: entity
+  parent: Holopad
+  id: HolopadAiUpload
+  suffix: AI Upload
+  components:
+  - type: Label
+    currentLabel: holopad-ai-upload
+
+- type: entity
+  parent: Holopad
+  id: HolopadAiBackupPower
+  suffix: AI Backup Power
+  components:
+  - type: Label
+    currentLabel: holopad-ai-backup-power
+
+- type: entity
+  parent: Holopad
+  id: HolopadAiEntrance
+  suffix: AI Entrance
+  components:
+  - type: Label
+    currentLabel: holopad-ai-entrance
+
+- type: entity
+  parent: Holopad
+  id: HolopadAiChute
+  suffix: AI Chute
+  components:
+  - type: Label
+    currentLabel: holopad-ai-chute
+
+# Long Range
+- type: entity
+  parent: HolopadLongRange
+  id: HolopadCargoAts
+  suffix: ATS
+  components:
+  - type: Label
+    currentLabel: holopad-cargo-ats
+
+- type: entity
+  parent: HolopadLongRange
+  id: HolopadCommandBridgeLongRange
+  suffix: Station Bridge
+  components:
+  - type: Label
+    currentLabel: holopad-station-bridge
+
+- type: entity
+  parent: HolopadLongRange
+  id: HolopadCargoBayLongRange
+  suffix: Station Cargo Bay
+  components:
+  - type: Label
+    currentLabel: holopad-station-cargo-bay
+
+- type: entity
+  parent: HolopadLongRange
+  id: HolopadCargoShuttle
+  suffix: Cargo Shuttle
+  components:
+  - type: Label
+    currentLabel: holopad-cargo-shuttle
+
+- type: entity
+  parent: HolopadLongRange
+  id: HolopadCentCommEvacShuttle
+  suffix: Evac Shuttle
+  components:
+  - type: Label
+    currentLabel: holopad-centcomm-evac
+
+
+# Map Specific
+# For holopads that only fit specific maps. For example: Bagel has Clown, Mime and Musician merged into one.
+- type: entity
+  parent: Holopad
+  id: HolopadServiceClownMime
+  suffix: Clown/Mime
+  components:
+  - type: Label
+    currentLabel: holopad-service-clown-mime
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 96139a961c3..439e9c944cf 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -148,6 +148,7 @@
     - SheetRGlass
     - Beaker
     - Syringe
+    - DisposableSyringe
     - HandLabeler
     - LightTube
     - LedLightTube
@@ -241,8 +242,22 @@
     - RiotShield
     - SpeedLoaderMagnum
     - SpeedLoaderMagnumEmpty
-    - MagazinePistolCaselessRifle # Goobstation
-    - MagazineBoxCaselessRifle # Goobstation
+    # .35 Caseless Pistol
+    - MagazinePistolCaselessRiflePractice # EE
+    - MagazinePistolCaselessRifle # EE
+    - MagazinePistolCaselessRifleRubber # EE
+    # .35 Caseless (Civilian) Rifle
+    - MagazineCaselessRifleShortPractice # EE
+    - MagazineCaselessRifleShort # EE
+    - MagazineCaselessRifleShortRubber # EE
+    # .35 Caseless (Military) Rifle
+    - MagazineCaselessRiflePractice # EE
+    - MagazineCaselessRifle # EE
+    - MagazineCaselessRifleRubber # EE
+    # .35 Caseless (Box Mag) Rifle
+    - MagazineBoxCaselessRiflePractice # EE
+    - MagazineBoxCaselessRifle # EE
+    - MagazineBoxCaselessRifleRubber # EE
     - MagazineMagnumEmpty # Goobstation
     - MagazineMagnum # Goobstation
     - MagazineMagnumLeverRifleEmpty # Goobstation
@@ -317,6 +332,7 @@
     - CryostasisBeaker
     - SyringeCryostasis
     - Syringe
+    - DisposableSyringe
     - Implanter
     - PillCanister
     - ChemistryEmptyBottle01
@@ -904,6 +920,22 @@
       - MagazinePistolSubMachineGunEmpty
       - MagazinePistolSubMachineGunTopMounted
       - MagazinePistolSubMachineGunTopMountedEmpty
+      # .35 Caseless Pistol
+      - MagazinePistolCaselessRiflePractice # EE
+      - MagazinePistolCaselessRifle # EE
+      - MagazinePistolCaselessRifleRubber # EE
+      # .35 Caseless (Civilian) Rifle
+      - MagazineCaselessRifleShortPractice # EE
+      - MagazineCaselessRifleShort # EE
+      - MagazineCaselessRifleShortRubber # EE
+      # .35 Caseless (Military) Rifle
+      - MagazineCaselessRiflePractice # EE
+      - MagazineCaselessRifle # EE
+      - MagazineCaselessRifleRubber # EE
+      # .35 Caseless (Box Mag) Rifle
+      - MagazineBoxCaselessRiflePractice # EE
+      - MagazineBoxCaselessRifle # EE
+      - MagazineBoxCaselessRifleRubber # EE
       - MagazineMagnum
       - MagazineMagnumEmpty
       - MagazineRifle
@@ -947,9 +979,32 @@
       - HoloprojectorSecurity
       - BolaEnergy
       - ClothingHeadHelmetBasic
+      - MagazineShotgunBeanbag
+      - ShellTranquilizer
+      - BoxBeanbag
+      - CartridgePistolRubber
+      - CartridgeMagnumRubber
+      - CartridgeLightRifleRubber
+      - CartridgeRifleRubber
+      - MagazineRifleRubber
+      - MagazinePistolRubber
+      - MagazinePistolSubMachineGunRubber
+      - MagazineMagnumRubber
+      - MagazineLightRifleRubber
+      - SpeedLoaderMagnumRubber
+      - MagazineBoxPistolRubber
+      - MagazineBoxMagnumRubber
+      - MagazineBoxLightRifleRubber
+      - MagazineBoxRifleRubber
+      - CartridgeSpecialRubber
+      - MagazineBoxSpecialRubber
+      - MagazineBoxLightRifleRubber # Frontier
+      - MagazineBoxMagnumRubber # Frontier
+      - MagazineBoxPistolRubber # Frontier
+      - MagazineBoxRifleRubber # Frontier
+      - SpeedLoaderRifleHeavyRubber
     dynamicRecipes:
       - Truncheon
-      - BoxBeanbag
       - BoxShotgunIncendiary
       - BoxShotgunUranium
       - EncryptionKeySyndie
@@ -961,10 +1016,6 @@
       - CartridgeMagnumUranium
       - CartridgePistolUranium
       - CartridgeRifleUranium
-      - CartridgeLightRifleRubber
-      - CartridgeMagnumRubber
-      - CartridgePistolRubber
-      - CartridgeRifleRubber
       - ExplosivePayload
       - FlashPayload
       - GrenadeBlast
@@ -979,43 +1030,30 @@
       - MagazineBoxRifleIncendiary
       - MagazineBoxRifleUranium
       - ShellSoulbreaker
-      - MagazineBoxLightRifleRubber
-      - MagazineBoxMagnumRubber
-      - MagazineBoxPistolRubber
-      - MagazineBoxRifleRubber
       - MagazineGrenadeEmpty
-      - MagazineLightRifleRubber
       - MagazineLightRifleIncendiary
       - MagazineLightRifleUranium
-      - MagazinePistolRubber
       - MagazinePistolIncendiary
       - MagazinePistolUranium
-      - MagazinePistolSubMachineGunRubber
       - MagazinePistolSubMachineGunIncendiary
       - MagazinePistolSubMachineGunUranium
-      - MagazineMagnumRubber
       - MagazineMagnumIncendiary
       - MagazineMagnumUranium
-      - MagazineRifleRubber
       - MagazineRifleIncendiary
       - MagazineRifleUranium
-      - MagazineShotgunBeanbag
       - MagazineShotgunIncendiary
       - PortableRecharger
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
-      - ShellTranquilizer
       - ShuttleGunDusterCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunPerforatorCircuitboard
       - ShuttleGunSvalinnMachineGunCircuitboard
       - Signaller
       - SignalTrigger
-      - SpeedLoaderMagnumRubber
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
-      - SpeedLoaderRifleHeavyRubber
       - SpeedLoaderRifleHeavyIncendiary
       - SpeedLoaderRifleHeavyUranium
       - TimerTrigger
@@ -1034,12 +1072,10 @@
       - WeaponEnergyGunMini
       - WeaponEnergyGunPistol
       - WeaponGunLaserCarbineAutomatic
-      - CartridgeSpecialRubber
       - CartridgeSpecialIncendiary
       - CartridgeSpecialUranium
       - CartridgeSpecialHoly
       - CartridgeSpecialMindbreaker
-      - MagazineBoxSpecialRubber
       - MagazineBoxSpecialIncendiary
       - MagazineBoxSpecialUranium
       - MagazineBoxSpecialMindbreaker
@@ -1064,6 +1100,8 @@
       - EnergySword
       - EnergySwordDouble
       - EnergyCutlass
+      - WeaponSubMachineGunFPA90
+      - WeaponSubMachineGunBRDIR25
   - type: MaterialStorage
     whitelist:
       tags:
@@ -1125,6 +1163,22 @@
         - SpeedLoaderRifleHeavyEmpty
         - CartridgeSpecial
         - MagazineBoxSpecial
+        # .35 Caseless Pistol
+        - MagazinePistolCaselessRiflePractice # EE
+        - MagazinePistolCaselessRifle # EE
+        - MagazinePistolCaselessRifleRubber # EE
+        # .35 Caseless (Civilian) Rifle
+        - MagazineCaselessRifleShortPractice # EE
+        - MagazineCaselessRifleShort # EE
+        - MagazineCaselessRifleShortRubber # EE
+        # .35 Caseless (Military) Rifle
+        - MagazineCaselessRiflePractice # EE
+        - MagazineCaselessRifle # EE
+        - MagazineCaselessRifleRubber # EE
+        # .35 Caseless (Box Mag) Rifle
+        - MagazineBoxCaselessRiflePractice # EE
+        - MagazineBoxCaselessRifle # EE
+        - MagazineBoxCaselessRifleRubber # EE
     - type: MaterialStorage
       whitelist:
         tags:
@@ -1174,6 +1228,7 @@
     - Dropper
     - Jug
     - Syringe
+    - DisposableSyringe
     - Implanter
     - PillCanister
     - BodyBag
@@ -1494,6 +1549,11 @@
     - IngotCopper1
     - N14IngotAluminium1
     - IngotTungsten1
+    # Additional recipes
+    - SheetPlasteel1
+    - SheetUGlass1
+    - SheetRUGlass1
+    - MaterialDiamond
   - type: MaterialStorageMagnetPickup # Delta V - Summary: Adds magnet pull from Frontier
     magnetEnabled: True
     range: 0.30 # Delta V - End Magnet Pull
@@ -1684,56 +1744,4 @@
   - type: MaterialStorage
     whitelist:
       tags:
-      - PrizeTicket
-
-- type: entity
-  id: MedicalBiofabricator
-  parent: [BaseLathe, BaseMaterialSiloUtilizer]
-  name: medical biofabricator
-  description: Produces organs and other organic matter that can be surgically grafted onto patients with biomass.
-  components:
-  - type: Sprite
-    sprite: _Shitmed/Structures/Machines/limbgrower.rsi
-    snapCardinals: true
-    layers:
-    - state: limbgrower_idleoff
-      map: ["enum.LatheVisualLayers.IsRunning"]
-  #    - state: limbgrower_idleoff
-  #      shader: unshaded
-  #      map: ["enum.PowerDeviceVisualLayers.Powered"]
-  #    - state: inserting
-  #      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-  #    - state: panel
-  #      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: MedicalBiofabMachineBoard
-  - type: MaterialStorage
-    whitelist:
-      tags:
-      - Sheet
-      - RawMaterial
-      - Ingot
-      - Wooden
-      - ClothMade
-      - Gauze
-      - Metal
-  - type: Lathe
-    idleState: limbgrower_idleoff
-    runningState: limbgrower_idleon
-    staticRecipes:
-    - SynthLiver
-    - SynthHeart
-    - SynthLungs
-    - SynthEyes
-    - SynthLeftLeg
-    - SynthRightLeg
-    - SynthLeftFoot
-    - SynthRightFoot
-    - SynthLeftArm
-    - SynthRightArm
-    - SynthLeftHand
-    - SynthRightHand
-  - type: EmagLatheRecipes
-    emagStaticRecipes:
-    - PizzaLeftArm
-    - PizzaRightArm
+        - PrizeTicket
diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 76181249b59..70faa605c4d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1723,7 +1723,7 @@
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
-    access: [["Lawyer"]]
+    access: [["Justice"]]
 
 - type: entity
   parent: VendingMachine
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index b3ea345681a..962c859bdbd 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -511,6 +511,76 @@
   - type: Icon
     sprite: Structures/Walls/plastitanium_diagonal.rsi
     state: state0
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 2000
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalSlam
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:ChangeConstructionNodeBehavior
+        node: girder
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalSlam
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+
+- type: entity
+  id: WallPlastitaniumDiagonalIndestructible
+  name: plastitanium wall
+  suffix: diagonal, indestructible
+  description: Keeps the air in and the greytide out.
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Wall
+  components:
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: Tag
+    tags:
+    - Wall
+  - type: Sprite
+    drawdepth: Walls
+    sprite: Structures/Walls/plastitanium_diagonal.rsi
+    state: state0
+  - type: IconSmooth
+    mode: Diagonal
+    key: walls
+    base: state
+  - type: Icon
+    sprite: Structures/Walls/plastitanium_diagonal.rsi
+    state: state0
+  - type: Physics
+    bodyType: Static
+  - type: Airtight
+    noAirWhenFullyAirBlocked: false
+    airBlockedDirection:
+    - South
+    - East
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PolygonShape
+            vertices:
+            - "-0.5,-0.5"
+            - "0.5,0.5"
+            - "0.5,-0.5"
+        mask:
+        - FullTileMask
+        layer:
+        - WallLayer
 
 - type: entity
   parent: BaseWall
diff --git a/Resources/Prototypes/Entities/Tiles/lava.yml b/Resources/Prototypes/Entities/Tiles/lava.yml
index 3bc1cf1d239..18daf56a9d7 100644
--- a/Resources/Prototypes/Entities/Tiles/lava.yml
+++ b/Resources/Prototypes/Entities/Tiles/lava.yml
@@ -7,6 +7,8 @@
     snap:
     - Wall
   components:
+  - type: TileEmission
+    color: "#FF4500"
   - type: StepTrigger
     requiredTriggeredSpeed: 0
     intersectRatio: 0.1
diff --git a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
index 3de5f5c120f..1741e89af7d 100644
--- a/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
+++ b/Resources/Prototypes/Entities/Tiles/liquid_plasma.yml
@@ -7,6 +7,8 @@
     snap:
     - Wall
   components:
+  - type: TileEmission
+    color: "#974988"
   - type: StepTrigger
     requiredTriggeredSpeed: 0
     intersectRatio: 0.1
diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml
index 288c093f89e..6d4ed6db091 100644
--- a/Resources/Prototypes/Guidebook/rules.yml
+++ b/Resources/Prototypes/Guidebook/rules.yml
@@ -6,7 +6,7 @@
 - type: guideEntry
   id: SpaceLaw
   name: guide-entry-rules-space-law
-  priority: 60
+  priority: 1
   text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml"
   children:
   - SpaceLawControlledSubstances
@@ -36,4 +36,4 @@
   id: SpaceLawCrimeList
   name: guide-entry-rules-sl-crime-list
   priority: 50
-  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml"
\ No newline at end of file
+  text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml"
diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml
index f5e34708283..17edb030065 100644
--- a/Resources/Prototypes/Guidebook/security.yml
+++ b/Resources/Prototypes/Guidebook/security.yml
@@ -6,6 +6,7 @@
   - Forensics
   - Defusal
   - CriminalRecords
+  - SpaceLaw
 
 - type: guideEntry
   id: Forensics
diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml
index 1849bca2c2a..8a0dbfa5d78 100644
--- a/Resources/Prototypes/Guidebook/ss14.yml
+++ b/Resources/Prototypes/Guidebook/ss14.yml
@@ -3,7 +3,6 @@
   name: guide-entry-ss14
   text: "/ServerInfo/Guidebook/SpaceStation14.xml"
   children:
-  - SpaceLaw
   - Controls
   - Jobs
   - Survival
diff --git a/Resources/Prototypes/Loadouts/Generic/plasmaman.yml b/Resources/Prototypes/Loadouts/Generic/plasmaman.yml
index a3dbd169f8a..8d28e2c2bea 100644
--- a/Resources/Prototypes/Loadouts/Generic/plasmaman.yml
+++ b/Resources/Prototypes/Loadouts/Generic/plasmaman.yml
@@ -3,7 +3,7 @@
 - type: loadout
   id: LoadoutSpeciesEnvirosuitExtinguisherRefill
   category: Species
-  cost: 5
+  cost: 4
   requirements:
     - !type:CharacterSpeciesRequirement
       species:
diff --git a/Resources/Prototypes/Loadouts/Generic/species.yml b/Resources/Prototypes/Loadouts/Generic/species.yml
index e7455a00fbe..2a1d10e38fc 100644
--- a/Resources/Prototypes/Loadouts/Generic/species.yml
+++ b/Resources/Prototypes/Loadouts/Generic/species.yml
@@ -39,3 +39,14 @@
       group: LoadoutAirTank
   items:
     - DoubleEmergencyNitrogenTankFilled
+
+- type: loadout
+  id: LoadoutSpeciesPowerCellHigh
+  category: Species
+  cost: 6
+  requirements:
+    - !type:CharacterSpeciesRequirement
+      species:
+        - IPC
+  items:
+    - PowerCellHigh
diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
index 7e0dba01c26..e8a3fd233ce 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/blueshield_officer.yml
@@ -82,6 +82,39 @@
   items:
     - WeaponLeverChester
 
+- type: loadout
+  id: LoadoutBSOMedkitCombatFilled
+  category: JobsCommandBlueshieldOfficer
+  cost: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - BlueshieldOfficer
+  items:
+    - MedkitCombatFilled
+
+- type: loadout
+  id: LoadoutBSOPortafib
+  category: JobsCommandBlueshieldOfficer
+  cost: 2
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - BlueshieldOfficer
+  items:
+    - Portafib
+
+- type: loadout
+  id: LoadoutBSOCrewMonitor
+  category: JobsCommandBlueshieldOfficer
+  cost: 6
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - BlueshieldOfficer
+  items:
+    - HandheldCrewMonitor
+
 # Eyes
 
 # Gloves
diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
index 593c9f10aba..71e8bbdf006 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Security/headOfSecurity.yml
@@ -118,6 +118,22 @@
   items:
     - WeaponEnergyGunMultiphase
 
+- type: loadout
+  id: LoadoutCommandHoSBRDIR25
+  category: JobsSecurityHeadOfSecurity
+  cost: 0
+  canBeHeirloom: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutHeadOfSecurityWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - HeadOfSecurity
+    - !type:CharacterAgeRequirement
+      min: 21
+  items:
+    - WeaponSubMachineGunBRDIR25HoS
+
 # Eyes
 
 # Gloves
@@ -406,4 +422,4 @@
       jobs:
         - HeadOfSecurity
   items:
-    - CigarRobustCase
\ No newline at end of file
+    - CigarRobustCase
diff --git a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
index c647b02a3a1..362a80c7075 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Service/bartender.yml
@@ -38,6 +38,22 @@
   items:
     - MagazineBoxLightRifleRubber
 
+- type: loadout
+  id: LoadoutServiceBartenderBoxRifleRubber
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderAmmo
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
+  items:
+    - MagazineBoxRifleRubber
+
 - type: loadout
   id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
   category: JobsServiceBartender
@@ -81,6 +97,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - MagazineBoxMagnumRubber
 
@@ -95,6 +113,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponRevolverArgentiNonlethal
 
@@ -109,6 +129,8 @@
     - !type:CharacterJobRequirement
       jobs:
         - Bartender
+    - !type:CharacterAgeRequirement
+      min: 21
   items:
     - WeaponSniperRepeaterNonlethal
 
diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml
index 43135e20283..9d8b8ac1963 100644
--- a/Resources/Prototypes/Maps/Pools/default.yml
+++ b/Resources/Prototypes/Maps/Pools/default.yml
@@ -1,24 +1,36 @@
 - type: gameMapPool
   id: DefaultMapPool
   maps:
-  - Arena
-  - Asterisk
-  - Core
-  - Edge
-  - Glacier
-  - Hammurabi
-  - Lighthouse
-  - Pebble
-  - Saltern
-  - Shoukou
-  - Submarine
-  - Tortuga
-  - TheHive
-  - Gax
-  - Rad
-  - Meta
-  - Box
-  - Lambda
-  - Bagel
-  - Northway
-#  - Europa
+ # - Arena # De-rotated, no current maintainer.
+ # - Asterisk # De-rotated, no current maintainer.
+  - Core # No current Maintainer. In need of a rework...
+ # - Edge # De-rotated, no current maintainer.
+  - Glacier # Maintained by Violet, pending update.
+ # - Hammurabi # De-rotated, no current maintainer.
+  - Lighthouse # Maintained by the SiN Mapping Team, ODJ, and TCJ.
+ # - Pebble # De-rotated, no current maintainer.
+  - Saltern # Maintained by the SiN Mapping Team
+  - Shoukou # Maintained by Violet, pending update.
+ # - Submarine # De-rotated, no current maintainer.
+ # - Tortuga # De-rotated, no current maintainer.
+ # - TheHive # De-rotated, no current maintainer.
+  - Gax # Maintained by Estacao Pirata
+  - Rad # Maintained by Estacao Pirata
+  - Meta # Maintained by Estacao Pirata
+  - Box # Maintained by Estacao Pirata
+  - Lambda # Maintained by Estacao Pirata
+  - Bagel # Maintained by Estacao Pirata
+  - Northway # Maintained by Violet, pending update.
+#  - Europa # De-rotated. Has significant issues.
+
+# All maps marked as De-rotated are currently receiving no update support due to a shortage of map maintainers.
+# If you want to see these maps return to official rotation, and have any talent with mapping, please feel free to get in contact with Old Dance Jacket.
+# We have a mapping server where we can support arbitrarily any number of people wishing to cooperatively map together. Alternatively, you can
+# choose to support a map solo.
+
+# We do this because these maps have not received any updates in over a year, and our efforts to find people willing to maintain these maps have gone
+# largely unanswered. As a result, we can't guarantee their quality at all.
+
+# In order to make re-rotate a map, please submit a PR providing at least some amount of work to refurbish the map you wish to reintroduce. It doesn't even
+# need to be a full comprehensive rework. Maybe like... Rework a department. Add an AI Satellite. Add decorative details. Do *something* cool.
+# Show us that someone actually cares about the map enough to make it something people actually want to play on.
diff --git a/Resources/Prototypes/Maps/arena.yml b/Resources/Prototypes/Maps/arena.yml
index d1e02b8456e..107454ff269 100644
--- a/Resources/Prototypes/Maps/arena.yml
+++ b/Resources/Prototypes/Maps/arena.yml
@@ -1,76 +1,76 @@
-- type: gameMap
-  id: Arena
-  mapName: 'Arena'
-  mapPath: /Maps/arena.yml
-  minPlayers: 30
-  maxPlayers: 80
-  stations:
-    Arena:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Arena Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_UCLB.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #civilian
-            Passenger: [ -1, -1 ]
-            Librarian: [ 1, 1 ]
-          #command
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-          #engineering
-            AtmosphericTechnician: [ 1, 2 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 2, 3 ]
-            TechnicalAssistant: [ 2, 3 ]
-          #medical
-            Chemist: [ 2, 2 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 5 ]
-            MedicalIntern: [ 2, 3 ]
-            Paramedic: [ 1, 2 ]
-            Psychologist: [ 1, 1 ]
-          #security
-            Brigmedic: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            Gladiator: [ 0, 2 ]
-            HeadOfSecurity: [ 1, 1 ]
-            Prisoner: [ 1, 2 ]
-            PrisonGuard: [ 1, 1 ]
-            SecurityOfficer: [ 5, 7 ]
-            SecurityCadet: [ 1, 2 ]
-            Warden: [ 1, 1 ]
-          #service
-            Bartender: [ 1, 2 ]
-            Botanist: [ 2, 2 ]
-            Chef: [ 2, 2 ]
-            Clown: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Janitor: [ 2, 2 ]
-            Lawyer: [ 2, 2 ]
-            Mime: [ 1, 1 ]
-            Musician: [ 1, 1 ]
-            Reporter: [ 2, 2 ]
-            ServiceWorker: [ 1, 3 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 5 ]
-            ForensicMantis: [ 1, 1 ]
-            ResearchAssistant: [ 2, 4 ]
-            Chaplain: [ 1, 1 ]
-            Borg: [ 2, 2 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            CargoTechnician: [ 2, 3 ]
-            SalvageSpecialist: [ 2, 3 ]
-            MailCarrier: [ 1, 2 ]
+# - type: gameMap
+#   id: Arena
+#   mapName: 'Arena'
+#   mapPath: /Maps/arena.yml
+#   minPlayers: 30
+#   maxPlayers: 80
+#   stations:
+#     Arena:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Arena Station {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_UCLB.yml
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#             Librarian: [ 1, 1 ]
+#           #command
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#           #engineering
+#             AtmosphericTechnician: [ 1, 2 ]
+#             ChiefEngineer: [ 1, 1 ]
+#             StationEngineer: [ 2, 3 ]
+#             TechnicalAssistant: [ 2, 3 ]
+#           #medical
+#             Chemist: [ 2, 2 ]
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             MedicalDoctor: [ 3, 5 ]
+#             MedicalIntern: [ 2, 3 ]
+#             Paramedic: [ 1, 2 ]
+#             Psychologist: [ 1, 1 ]
+#           #security
+#             Brigmedic: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             Gladiator: [ 0, 2 ]
+#             HeadOfSecurity: [ 1, 1 ]
+#             Prisoner: [ 1, 2 ]
+#             PrisonGuard: [ 1, 1 ]
+#             SecurityOfficer: [ 5, 7 ]
+#             SecurityCadet: [ 1, 2 ]
+#             Warden: [ 1, 1 ]
+#           #service
+#             Bartender: [ 1, 2 ]
+#             Botanist: [ 2, 2 ]
+#             Chef: [ 2, 2 ]
+#             Clown: [ 1, 1 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Janitor: [ 2, 2 ]
+#             Lawyer: [ 2, 2 ]
+#             Mime: [ 1, 1 ]
+#             Musician: [ 1, 1 ]
+#             Reporter: [ 2, 2 ]
+#             ServiceWorker: [ 1, 3 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Scientist: [ 3, 5 ]
+#             ForensicMantis: [ 1, 1 ]
+#             ResearchAssistant: [ 2, 4 ]
+#             Chaplain: [ 1, 1 ]
+#             Borg: [ 2, 2 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             CargoTechnician: [ 2, 3 ]
+#             SalvageSpecialist: [ 2, 3 ]
+#             MailCarrier: [ 1, 2 ]
diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml
index b43202acf72..d5ab4080204 100644
--- a/Resources/Prototypes/Maps/asterisk.yml
+++ b/Resources/Prototypes/Maps/asterisk.yml
@@ -1,73 +1,73 @@
-- type: gameMap
-  id: Asterisk
-  mapName: 'Asterisk'
-  mapPath: /Maps/asterisk.yml
-  minPlayers: 0
-  maxPlayers: 60
-  stations:
-    Asterisk:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationRandomTransform
-          enableStationRotation: false
-          maxStationOffset: null
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Kaeri.yml
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Asterisk Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #service
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Bartender: [ 1, 2 ]
-            Botanist: [ 2, 3 ]
-            Chef: [ 1, 2 ]
-            Clown: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Reporter: [ 1, 1 ]
-            Musician: [ 1, 1 ]
-            Janitor: [ 1, 2 ]
-            Mime: [ 1, 1 ]
-          #engineering
-            ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 1, 1 ] #back by popular demand
-            StationEngineer: [ 3, 3 ]
-            TechnicalAssistant: [ 2, 4 ]
-          #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 1, 2 ]
-            Paramedic: [ 1, 2 ]
-            MedicalDoctor: [ 2, 3 ]
-            MedicalIntern: [ 2, 3 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Chaplain: [ 1, 1 ]
-            ForensicMantis: [ 1, 1 ]
-            Scientist: [ 2, 3 ]
-            ResearchAssistant: [ 2, 3 ]
-            Borg: [ 1, 2 ]
-          #security
-            HeadOfSecurity: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            Brigmedic: [ 1, 1 ]
-            SecurityOfficer: [ 2, 3 ]
-            SecurityCadet: [ 1, 3 ]
-            Prisoner: [ 1, 2 ] # :^)
-          #supply
-            Quartermaster: [ 1, 1 ]
-            MailCarrier: [ 1, 2 ]
-            SalvageSpecialist: [ 2, 3 ]
-            CargoTechnician: [ 2, 4 ]
-          #civilian
-            Passenger: [ -1, -1 ]
+# - type: gameMap
+#   id: Asterisk
+#   mapName: 'Asterisk'
+#   mapPath: /Maps/asterisk.yml
+#   minPlayers: 0
+#   maxPlayers: 60
+#   stations:
+#     Asterisk:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationRandomTransform
+#           enableStationRotation: false
+#           maxStationOffset: null
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Kaeri.yml
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Asterisk Station {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #service
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Bartender: [ 1, 2 ]
+#             Botanist: [ 2, 3 ]
+#             Chef: [ 1, 2 ]
+#             Clown: [ 1, 1 ]
+#             Lawyer: [ 1, 1 ]
+#             Reporter: [ 1, 1 ]
+#             Musician: [ 1, 1 ]
+#             Janitor: [ 1, 2 ]
+#             Mime: [ 1, 1 ]
+#           #engineering
+#             ChiefEngineer: [ 1, 1 ]
+#             AtmosphericTechnician: [ 1, 1 ] #back by popular demand
+#             StationEngineer: [ 3, 3 ]
+#             TechnicalAssistant: [ 2, 4 ]
+#           #medical
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             Chemist: [ 1, 2 ]
+#             Paramedic: [ 1, 2 ]
+#             MedicalDoctor: [ 2, 3 ]
+#             MedicalIntern: [ 2, 3 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Chaplain: [ 1, 1 ]
+#             ForensicMantis: [ 1, 1 ]
+#             Scientist: [ 2, 3 ]
+#             ResearchAssistant: [ 2, 3 ]
+#             Borg: [ 1, 2 ]
+#           #security
+#             HeadOfSecurity: [ 1, 1 ]
+#             Warden: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             Brigmedic: [ 1, 1 ]
+#             SecurityOfficer: [ 2, 3 ]
+#             SecurityCadet: [ 1, 3 ]
+#             Prisoner: [ 1, 2 ] # :^)
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             MailCarrier: [ 1, 2 ]
+#             SalvageSpecialist: [ 2, 3 ]
+#             CargoTechnician: [ 2, 4 ]
+#           #civilian
+#             Passenger: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml
index bb27ee6ebb5..3dcdd59bb5a 100644
--- a/Resources/Prototypes/Maps/edge.yml
+++ b/Resources/Prototypes/Maps/edge.yml
@@ -1,71 +1,71 @@
-- type: gameMap
-  id: Edge
-  mapName: 'Edge'
-  mapPath: /Maps/edge.yml
-  minPlayers: 10
-  maxPlayers: 80
-  stations:
-    Edge:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Delta.yml
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Edge Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #service
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Bartender: [ 1, 2 ]
-            Botanist: [ 2, 3 ]
-            Boxer: [ 2, 3 ]
-            Chef: [ 2, 3 ]
-            Clown: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Reporter: [ 0, 1 ]
-            Musician: [ 1, 1 ]
-            Janitor: [ 1, 3 ]
-            Mime: [ 1, 1 ]
-          #engineering
-            ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 1, 2 ]
-            StationEngineer: [ 3, 5 ]
-            TechnicalAssistant: [ 2, 5 ]
-          #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 1, 2 ]
-            Paramedic: [ 1, 2 ]
-            Psychologist: [ 1, 1 ]
-            MedicalDoctor: [ 3, 5 ]
-            MedicalIntern: [ 2, 4 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Chaplain: [ 1, 1 ]
-            ForensicMantis: [ 1, 1 ]
-            Scientist: [ 2, 4 ]
-            ResearchAssistant: [ 2, 4 ]
-            Borg: [ 1, 2 ]
-          #security
-            HeadOfSecurity: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            SecurityOfficer: [ 2, 4 ]
-            SecurityCadet: [ 1, 4 ]
-            Prisoner: [ 2, 3 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            MailCarrier: [ 1, 2 ]
-            SalvageSpecialist: [ 2, 3 ]
-            CargoTechnician: [ 2, 4 ]
-          #civilian
-            Passenger: [ -1, -1 ]
+# - type: gameMap
+#   id: Edge
+#   mapName: 'Edge'
+#   mapPath: /Maps/edge.yml
+#   minPlayers: 10
+#   maxPlayers: 80
+#   stations:
+#     Edge:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Delta.yml
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Edge Station {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #service
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Bartender: [ 1, 2 ]
+#             Botanist: [ 2, 3 ]
+#             Boxer: [ 2, 3 ]
+#             Chef: [ 2, 3 ]
+#             Clown: [ 1, 1 ]
+#             Lawyer: [ 1, 1 ]
+#             Reporter: [ 0, 1 ]
+#             Musician: [ 1, 1 ]
+#             Janitor: [ 1, 3 ]
+#             Mime: [ 1, 1 ]
+#           #engineering
+#             ChiefEngineer: [ 1, 1 ]
+#             AtmosphericTechnician: [ 1, 2 ]
+#             StationEngineer: [ 3, 5 ]
+#             TechnicalAssistant: [ 2, 5 ]
+#           #medical
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             Chemist: [ 1, 2 ]
+#             Paramedic: [ 1, 2 ]
+#             Psychologist: [ 1, 1 ]
+#             MedicalDoctor: [ 3, 5 ]
+#             MedicalIntern: [ 2, 4 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Chaplain: [ 1, 1 ]
+#             ForensicMantis: [ 1, 1 ]
+#             Scientist: [ 2, 4 ]
+#             ResearchAssistant: [ 2, 4 ]
+#             Borg: [ 1, 2 ]
+#           #security
+#             HeadOfSecurity: [ 1, 1 ]
+#             Warden: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             SecurityOfficer: [ 2, 4 ]
+#             SecurityCadet: [ 1, 4 ]
+#             Prisoner: [ 2, 3 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             MailCarrier: [ 1, 2 ]
+#             SalvageSpecialist: [ 2, 3 ]
+#             CargoTechnician: [ 2, 4 ]
+#           #civilian
+#             Passenger: [ -1, -1 ]
diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml
index a3397c29c09..e623a01003c 100644
--- a/Resources/Prototypes/Maps/europa.yml
+++ b/Resources/Prototypes/Maps/europa.yml
@@ -1,70 +1,70 @@
-- type: gameMap
-  id: Europa
-  mapName: 'Europa'
-  mapPath: /Maps/europa.yml
-  minPlayers: 0
-  maxPlayers: 30
-  stations:
-    Europa:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Europa Outpost {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'B'
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #service
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Bartender: [ 1, 1 ]
-            Botanist: [ 2, 2 ]
-            Boxer: [ 2, 2 ]
-            Chef: [ 1 , 1 ]
-            Clown: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Musician: [ 1, 1 ]
-            Janitor: [ 1, 2 ]
-            Mime: [ 1, 1 ]
-          #engineering
-            ChiefEngineer: [ 1, 1 ]
-            AtmosphericTechnician: [ 1, 2 ]
-            StationEngineer: [ 2, 2 ]
-            TechnicalAssistant: [ 2, 2 ]
-          #medical
-            ChiefMedicalOfficer: [ 1, 1 ]
-            Chemist: [ 1, 1 ]
-            MedicalDoctor: [ 2, 3 ]
-            MedicalIntern: [ 2, 2 ]
-            Paramedic: [ 1, 1 ]
-            Psychologist: [ 1, 1 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Chaplain: [ 1, 1 ]
-            ForensicMantis: [ 1, 1 ]
-            Scientist: [ 2, 3 ]
-            ResearchAssistant: [ 2, 2 ]
-            Borg: [ 1, 1 ]
-          #security
-            HeadOfSecurity: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            SecurityOfficer: [ 2, 2 ]
-            SecurityCadet: [ 1, 1 ]
-            Prisoner: [ 1, 2 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            MailCarrier: [ 1, 2 ]
-            SalvageSpecialist: [ 2, 2 ]
-            CargoTechnician: [ 2, 3 ]
-          #civilian
-            Passenger: [ -1, -1 ]
-          # Silicon
-            StationAi: [ 1, 1 ]
+# - type: gameMap
+#   id: Europa
+#   mapName: 'Europa'
+#   mapPath: /Maps/europa.yml
+#   minPlayers: 0
+#   maxPlayers: 30
+#   stations:
+#     Europa:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Europa Outpost {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'B'
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #service
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Bartender: [ 1, 1 ]
+#             Botanist: [ 2, 2 ]
+#             Boxer: [ 2, 2 ]
+#             Chef: [ 1 , 1 ]
+#             Clown: [ 1, 1 ]
+#             Lawyer: [ 1, 1 ]
+#             Musician: [ 1, 1 ]
+#             Janitor: [ 1, 2 ]
+#             Mime: [ 1, 1 ]
+#           #engineering
+#             ChiefEngineer: [ 1, 1 ]
+#             AtmosphericTechnician: [ 1, 2 ]
+#             StationEngineer: [ 2, 2 ]
+#             TechnicalAssistant: [ 2, 2 ]
+#           #medical
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             Chemist: [ 1, 1 ]
+#             MedicalDoctor: [ 2, 3 ]
+#             MedicalIntern: [ 2, 2 ]
+#             Paramedic: [ 1, 1 ]
+#             Psychologist: [ 1, 1 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Chaplain: [ 1, 1 ]
+#             ForensicMantis: [ 1, 1 ]
+#             Scientist: [ 2, 3 ]
+#             ResearchAssistant: [ 2, 2 ]
+#             Borg: [ 1, 1 ]
+#           #security
+#             HeadOfSecurity: [ 1, 1 ]
+#             Warden: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             SecurityOfficer: [ 2, 2 ]
+#             SecurityCadet: [ 1, 1 ]
+#             Prisoner: [ 1, 2 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             MailCarrier: [ 1, 2 ]
+#             SalvageSpecialist: [ 2, 2 ]
+#             CargoTechnician: [ 2, 3 ]
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#           # Silicon
+#             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/hammurabi.yml b/Resources/Prototypes/Maps/hammurabi.yml
index 0d117d37f27..6a97d63c23d 100644
--- a/Resources/Prototypes/Maps/hammurabi.yml
+++ b/Resources/Prototypes/Maps/hammurabi.yml
@@ -1,77 +1,77 @@
-- type: gameMap
-  id: Hammurabi
-  mapName: 'Hammurabi'
-  mapPath: /Maps/hammurabi.yml
-  minPlayers: 50
-  stations:
-    Hammurabi:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Hammurabi Prison Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Centipede.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #civilian
-            Passenger: [ -1, -1 ]
-            Librarian: [ 1, 1 ]
-          #command
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-          #engineering
-            AtmosphericTechnician: [ 2, 3 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 6, 8 ]
-            TechnicalAssistant: [ 3, 5 ]
-          #medical
-            Chemist: [ 2, 3 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 7, 9 ]
-            MedicalIntern: [ 2, 4 ]
-            Paramedic: [ 2, 3 ]
-            Psychologist: [ 1, 1 ]
-          #security
-            Brigmedic: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            HeadOfSecurity: [ 1, 1 ]
-            Prisoner: [ 4, 6 ] # move back to 10, 12 when ready
-            PrisonGuard: [ 4, 6 ] # someday a 2:1 ratio of guard:prisoner is preferred
-            SecurityOfficer: [ 6, 8 ]
-            SecurityCadet: [ 2, 3 ]
-            Warden: [ 1, 1 ]
-          #service
-            Bartender: [ 2, 3 ]
-            Botanist: [ 2, 3 ]
-            Boxer: [ 2, 2 ]
-            Chef: [ 3, 4 ]
-            Clown: [ 1, 1 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Janitor: [ 2, 4 ]
-            Lawyer: [ 2, 2 ]
-            Mime: [ 1, 2 ]
-            Musician: [ 2, 3 ]
-            Reporter: [ 2, 2 ]
-            ServiceWorker: [ 4, 6 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 6 ]
-            ResearchAssistant: [ 2, 3 ]
-            Chaplain: [ 1, 1 ]
-            Borg: [ 2, 3 ]
-            ForensicMantis: [ 1, 1 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            CargoTechnician: [ 2, 4 ]
-            SalvageSpecialist: [ 3, 5 ]
-            MailCarrier: [ 2, 3 ]
-          # Silicon
-            StationAi: [ 1, 1 ]
+# - type: gameMap
+#   id: Hammurabi
+#   mapName: 'Hammurabi'
+#   mapPath: /Maps/hammurabi.yml
+#   minPlayers: 50
+#   stations:
+#     Hammurabi:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Hammurabi Prison Station {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Centipede.yml
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#             Librarian: [ 1, 1 ]
+#           #command
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#           #engineering
+#             AtmosphericTechnician: [ 2, 3 ]
+#             ChiefEngineer: [ 1, 1 ]
+#             StationEngineer: [ 6, 8 ]
+#             TechnicalAssistant: [ 3, 5 ]
+#           #medical
+#             Chemist: [ 2, 3 ]
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             MedicalDoctor: [ 7, 9 ]
+#             MedicalIntern: [ 2, 4 ]
+#             Paramedic: [ 2, 3 ]
+#             Psychologist: [ 1, 1 ]
+#           #security
+#             Brigmedic: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             HeadOfSecurity: [ 1, 1 ]
+#             Prisoner: [ 4, 6 ] # move back to 10, 12 when ready
+#             PrisonGuard: [ 4, 6 ] # someday a 2:1 ratio of guard:prisoner is preferred
+#             SecurityOfficer: [ 6, 8 ]
+#             SecurityCadet: [ 2, 3 ]
+#             Warden: [ 1, 1 ]
+#           #service
+#             Bartender: [ 2, 3 ]
+#             Botanist: [ 2, 3 ]
+#             Boxer: [ 2, 2 ]
+#             Chef: [ 3, 4 ]
+#             Clown: [ 1, 1 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Janitor: [ 2, 4 ]
+#             Lawyer: [ 2, 2 ]
+#             Mime: [ 1, 2 ]
+#             Musician: [ 2, 3 ]
+#             Reporter: [ 2, 2 ]
+#             ServiceWorker: [ 4, 6 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Scientist: [ 4, 6 ]
+#             ResearchAssistant: [ 2, 3 ]
+#             Chaplain: [ 1, 1 ]
+#             Borg: [ 2, 3 ]
+#             ForensicMantis: [ 1, 1 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             CargoTechnician: [ 2, 4 ]
+#             SalvageSpecialist: [ 3, 5 ]
+#             MailCarrier: [ 2, 3 ]
+#           # Silicon
+#             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml
index 52353877a07..aa8fa109ae3 100644
--- a/Resources/Prototypes/Maps/hive.yml
+++ b/Resources/Prototypes/Maps/hive.yml
@@ -1,78 +1,78 @@
-- type: gameMap
-  id: TheHive
-  mapName: 'The Hive'
-  mapPath: /Maps/hive.yml
-  minPlayers: 30
-  #maxPlayers: 80 Temporary maybe
-  stations:
-    TheHive:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'The Hive'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #civilian
-            Passenger: [ -1, -1 ]
-            Librarian: [ 1, 1 ]
-          #command
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-          #engineering
-            AtmosphericTechnician: [ 1, 2 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 3, 4 ]
-            TechnicalAssistant: [ 2, 3 ]
-          #medical
-            Chemist: [ 2, 2 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 3, 5 ]
-            MedicalIntern: [ 1, 3 ]
-            Paramedic: [ 1, 2 ]
-            Psychologist: [ 1, 1 ]
-          #security
-            Brigmedic: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            HeadOfSecurity: [ 1, 1 ]
-            Prisoner: [ 2, 3 ]
-            PrisonGuard: [ 1, 1 ]
-            SecurityOfficer: [ 4, 6 ]
-            SecurityCadet: [ 1, 2 ]
-            Warden: [ 1, 1 ]
-          #service
-            Bartender: [ 2, 2 ]
-            Botanist: [ 2, 3 ]
-            Boxer: [ 2, 2 ]
-            Chef: [ 2, 3 ]
-            Clown: [ 1, 2 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Janitor: [ 2, 3 ]
-            Lawyer: [ 2, 2 ]
-            Mime: [ 1, 2 ]
-            Musician: [ 1, 3 ]
-            Reporter: [ 1, 2 ]
-            ServiceWorker: [ 2, 4 ]
-          #science
-            Borg: [ 2, 3 ]
-            Chaplain: [ 1, 1 ]
-            ForensicMantis: [ 1, 1 ]
-            ResearchAssistant: [ 2, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 5 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            CargoTechnician: [ 2, 3 ]
-            SalvageSpecialist: [ 2, 3 ]
-            MailCarrier: [ 2, 2 ]
-          # Silicon
-            StationAi: [ 1, 1 ]
+# - type: gameMap
+#   id: TheHive
+#   mapName: 'The Hive'
+#   mapPath: /Maps/hive.yml
+#   minPlayers: 30
+#   #maxPlayers: 80 Temporary maybe
+#   stations:
+#     TheHive:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: 'The Hive'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#             Librarian: [ 1, 1 ]
+#           #command
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#           #engineering
+#             AtmosphericTechnician: [ 1, 2 ]
+#             ChiefEngineer: [ 1, 1 ]
+#             StationEngineer: [ 3, 4 ]
+#             TechnicalAssistant: [ 2, 3 ]
+#           #medical
+#             Chemist: [ 2, 2 ]
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             MedicalDoctor: [ 3, 5 ]
+#             MedicalIntern: [ 1, 3 ]
+#             Paramedic: [ 1, 2 ]
+#             Psychologist: [ 1, 1 ]
+#           #security
+#             Brigmedic: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             HeadOfSecurity: [ 1, 1 ]
+#             Prisoner: [ 2, 3 ]
+#             PrisonGuard: [ 1, 1 ]
+#             SecurityOfficer: [ 4, 6 ]
+#             SecurityCadet: [ 1, 2 ]
+#             Warden: [ 1, 1 ]
+#           #service
+#             Bartender: [ 2, 2 ]
+#             Botanist: [ 2, 3 ]
+#             Boxer: [ 2, 2 ]
+#             Chef: [ 2, 3 ]
+#             Clown: [ 1, 2 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Janitor: [ 2, 3 ]
+#             Lawyer: [ 2, 2 ]
+#             Mime: [ 1, 2 ]
+#             Musician: [ 1, 3 ]
+#             Reporter: [ 1, 2 ]
+#             ServiceWorker: [ 2, 4 ]
+#           #science
+#             Borg: [ 2, 3 ]
+#             Chaplain: [ 1, 1 ]
+#             ForensicMantis: [ 1, 1 ]
+#             ResearchAssistant: [ 2, 3 ]
+#             ResearchDirector: [ 1, 1 ]
+#             Scientist: [ 3, 5 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             CargoTechnician: [ 2, 3 ]
+#             SalvageSpecialist: [ 2, 3 ]
+#             MailCarrier: [ 2, 2 ]
+#           # Silicon
+#             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/lambda.yml b/Resources/Prototypes/Maps/lambda.yml
index 66e3d1a5a82..578a460b916 100644
--- a/Resources/Prototypes/Maps/lambda.yml
+++ b/Resources/Prototypes/Maps/lambda.yml
@@ -30,7 +30,6 @@
             Botanist: [ 2 , 3 ]
             Chef: [ 1, 2 ]
             Janitor: [ 2, 3 ]
-            ServiceWorker: [ 2, 3 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 4 ]
@@ -56,7 +55,6 @@
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            Brigmedic: [ 1, 1 ]
             Prisoner: [ 2, 3 ]
             PrisonGuard: [ 2, 3 ]
             SecurityOfficer: [ 5, 6 ]
diff --git a/Resources/Prototypes/Maps/submarine.yml b/Resources/Prototypes/Maps/submarine.yml
index 656c7a3e7b7..0ede084b606 100644
--- a/Resources/Prototypes/Maps/submarine.yml
+++ b/Resources/Prototypes/Maps/submarine.yml
@@ -1,77 +1,77 @@
-- type: gameMap
-  id: Submarine
-  mapName: 'Submarine'
-  mapPath: /Maps/submarine.yml
-  minPlayers: 60
-  stations:
-    Submarine:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Submarine {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Propeller.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #civilian
-            Passenger: [ -1, -1 ]
-            Librarian: [ 1, 1 ]
-          #command
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-          #engineering
-            AtmosphericTechnician: [ 2, 4 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 4, 6 ]
-            TechnicalAssistant: [ 2, 3 ]
-          #medical
-            Chemist: [ 2, 2 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 5, 7 ]
-            MedicalIntern: [ 2, 3 ]
-            Paramedic: [ 2, 3 ]
-            Psychologist: [ 1, 2 ]
-          #security
-            Brigmedic: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            HeadOfSecurity: [ 1, 1 ]
-            Prisoner: [ 2, 4 ]
-            PrisonGuard: [ 1, 2 ]
-            SecurityOfficer: [ 4, 6 ]
-            SecurityCadet: [ 3, 4 ]
-            Warden: [ 1, 1 ]
-          #service
-            Bartender: [ 2, 3 ]
-            Botanist: [ 2, 4 ]
-            Boxer: [ 2, 2 ]
-            Chef: [ 3, 4 ]
-            Clown: [ 1, 2 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Janitor: [ 2, 3 ]
-            Lawyer: [ 2, 2 ]
-            MartialArtist: [ 2, 2 ]
-            Mime: [ 1, 2 ]
-            Musician: [ 2, 2 ]
-            Reporter: [ 1, 2 ]
-            ServiceWorker: [ 2, 3 ]
-            Zookeeper: [ 2, 2 ]
-          #science
-            MedicalBorg: [ 2, 3 ]
-            Chaplain: [ 1, 1 ]
-            ForensicMantis: [ 1, 1 ]
-            ResearchAssistant: [ 2, 3 ]
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 3, 4 ]
-          #supply
-            CargoTechnician: [ 4, 6 ]
-            MailCarrier: [ 1, 2 ]
-            SalvageSpecialist: [ 3, 5 ]
-            Quartermaster: [ 1, 1 ]
+# - type: gameMap
+#   id: Submarine
+#   mapName: 'Submarine'
+#   mapPath: /Maps/submarine.yml
+#   minPlayers: 60
+#   stations:
+#     Submarine:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Submarine {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Propeller.yml
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#             Librarian: [ 1, 1 ]
+#           #command
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#           #engineering
+#             AtmosphericTechnician: [ 2, 4 ]
+#             ChiefEngineer: [ 1, 1 ]
+#             StationEngineer: [ 4, 6 ]
+#             TechnicalAssistant: [ 2, 3 ]
+#           #medical
+#             Chemist: [ 2, 2 ]
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             MedicalDoctor: [ 5, 7 ]
+#             MedicalIntern: [ 2, 3 ]
+#             Paramedic: [ 2, 3 ]
+#             Psychologist: [ 1, 2 ]
+#           #security
+#             Brigmedic: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             HeadOfSecurity: [ 1, 1 ]
+#             Prisoner: [ 2, 4 ]
+#             PrisonGuard: [ 1, 2 ]
+#             SecurityOfficer: [ 4, 6 ]
+#             SecurityCadet: [ 3, 4 ]
+#             Warden: [ 1, 1 ]
+#           #service
+#             Bartender: [ 2, 3 ]
+#             Botanist: [ 2, 4 ]
+#             Boxer: [ 2, 2 ]
+#             Chef: [ 3, 4 ]
+#             Clown: [ 1, 2 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Janitor: [ 2, 3 ]
+#             Lawyer: [ 2, 2 ]
+#             MartialArtist: [ 2, 2 ]
+#             Mime: [ 1, 2 ]
+#             Musician: [ 2, 2 ]
+#             Reporter: [ 1, 2 ]
+#             ServiceWorker: [ 2, 3 ]
+#             Zookeeper: [ 2, 2 ]
+#           #science
+#             MedicalBorg: [ 2, 3 ]
+#             Chaplain: [ 1, 1 ]
+#             ForensicMantis: [ 1, 1 ]
+#             ResearchAssistant: [ 2, 3 ]
+#             ResearchDirector: [ 1, 1 ]
+#             Scientist: [ 3, 4 ]
+#           #supply
+#             CargoTechnician: [ 4, 6 ]
+#             MailCarrier: [ 1, 2 ]
+#             SalvageSpecialist: [ 3, 5 ]
+#             Quartermaster: [ 1, 1 ]
diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml
index 933f7747a78..5fa0713e529 100644
--- a/Resources/Prototypes/Maps/tortuga.yml
+++ b/Resources/Prototypes/Maps/tortuga.yml
@@ -1,77 +1,77 @@
-- type: gameMap
-  id: Tortuga
-  mapName: 'Tortuga'
-  mapPath: /Maps/tortuga.yml
-  minPlayers: 50
-  stations:
-    Tortuga:
-      stationProto: StandardNanotrasenStation
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: '{0} Tortuga Station {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: 'DV'
-        - type: StationEmergencyShuttle
-          emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
-        - type: StationJobs
-          overflowJobs:
-            - Passenger
-          availableJobs:
-          #civilian
-            Passenger: [ -1, -1 ]
-            Librarian: [ 1, 1 ]
-          #command
-            Captain: [ 1, 1 ]
-            BlueshieldOfficer: [ 1, 1]
-            NanotrasenRepresentative: [ 1, 1 ]
-            Magistrate: [ 1, 1 ]
-            AdministrativeAssistant: [ 1, 1 ]
-          #engineering
-            AtmosphericTechnician: [ 2, 3 ]
-            ChiefEngineer: [ 1, 1 ]
-            StationEngineer: [ 6, 8 ]
-            TechnicalAssistant: [ 3, 5 ]
-          #medical
-            Chemist: [ 2, 2 ]
-            ChiefMedicalOfficer: [ 1, 1 ]
-            MedicalDoctor: [ 7, 9 ]
-            MedicalIntern: [ 2, 4 ]
-            Paramedic: [ 1, 2 ]
-            Psychologist: [ 1, 1 ]
-          #security
-            Brigmedic: [ 1, 1 ]
-            Detective: [ 1, 1 ]
-            HeadOfSecurity: [ 1, 1 ]
-            Prisoner: [ 2, 3 ]
-            PrisonGuard: [ 1, 1 ]
-            SecurityOfficer: [ 6, 9 ]
-            SecurityCadet: [ 1, 1 ]
-            Warden: [ 1, 1 ]
-          #service
-            Bartender: [ 2, 2 ]
-            Botanist: [ 2, 3 ]
-            Boxer: [ 2, 2 ]
-            Chef: [ 3, 4 ]
-            Clown: [ 1, 2 ]
-            HeadOfPersonnel: [ 1, 1 ]
-            Janitor: [ 2, 3 ]
-            Lawyer: [ 2, 2 ]
-            Mime: [ 1, 2 ]
-            Musician: [ 2, 3 ]
-            Reporter: [ 2, 2 ]
-            ServiceWorker: [ 3, 6 ]
-          #science
-            ResearchDirector: [ 1, 1 ]
-            Scientist: [ 5, 6 ]
-            ForensicMantis: [ 1, 1 ]
-            ResearchAssistant: [ 2, 4 ]
-            Chaplain: [ 1, 1 ]
-            Borg: [ 2, 3 ]
-          #supply
-            Quartermaster: [ 1, 1 ]
-            CargoTechnician: [ 2, 4 ]
-            SalvageSpecialist: [ 3, 4 ]
-            MailCarrier: [ 2, 2 ]
-          # Silicon
-            StationAi: [ 1, 1 ]
+# - type: gameMap
+#   id: Tortuga
+#   mapName: 'Tortuga'
+#   mapPath: /Maps/tortuga.yml
+#   minPlayers: 50
+#   stations:
+#     Tortuga:
+#       stationProto: StandardNanotrasenStation
+#       components:
+#         - type: StationNameSetup
+#           mapNameTemplate: '{0} Tortuga Station {1}'
+#           nameGenerator:
+#             !type:NanotrasenNameGenerator
+#             prefixCreator: 'DV'
+#         - type: StationEmergencyShuttle
+#           emergencyShuttlePath: /Maps/Shuttles/DeltaV/NTES_Seal.yml
+#         - type: StationJobs
+#           overflowJobs:
+#             - Passenger
+#           availableJobs:
+#           #civilian
+#             Passenger: [ -1, -1 ]
+#             Librarian: [ 1, 1 ]
+#           #command
+#             Captain: [ 1, 1 ]
+#             BlueshieldOfficer: [ 1, 1]
+#             NanotrasenRepresentative: [ 1, 1 ]
+#             Magistrate: [ 1, 1 ]
+#             AdministrativeAssistant: [ 1, 1 ]
+#           #engineering
+#             AtmosphericTechnician: [ 2, 3 ]
+#             ChiefEngineer: [ 1, 1 ]
+#             StationEngineer: [ 6, 8 ]
+#             TechnicalAssistant: [ 3, 5 ]
+#           #medical
+#             Chemist: [ 2, 2 ]
+#             ChiefMedicalOfficer: [ 1, 1 ]
+#             MedicalDoctor: [ 7, 9 ]
+#             MedicalIntern: [ 2, 4 ]
+#             Paramedic: [ 1, 2 ]
+#             Psychologist: [ 1, 1 ]
+#           #security
+#             Brigmedic: [ 1, 1 ]
+#             Detective: [ 1, 1 ]
+#             HeadOfSecurity: [ 1, 1 ]
+#             Prisoner: [ 2, 3 ]
+#             PrisonGuard: [ 1, 1 ]
+#             SecurityOfficer: [ 6, 9 ]
+#             SecurityCadet: [ 1, 1 ]
+#             Warden: [ 1, 1 ]
+#           #service
+#             Bartender: [ 2, 2 ]
+#             Botanist: [ 2, 3 ]
+#             Boxer: [ 2, 2 ]
+#             Chef: [ 3, 4 ]
+#             Clown: [ 1, 2 ]
+#             HeadOfPersonnel: [ 1, 1 ]
+#             Janitor: [ 2, 3 ]
+#             Lawyer: [ 2, 2 ]
+#             Mime: [ 1, 2 ]
+#             Musician: [ 2, 3 ]
+#             Reporter: [ 2, 2 ]
+#             ServiceWorker: [ 3, 6 ]
+#           #science
+#             ResearchDirector: [ 1, 1 ]
+#             Scientist: [ 5, 6 ]
+#             ForensicMantis: [ 1, 1 ]
+#             ResearchAssistant: [ 2, 4 ]
+#             Chaplain: [ 1, 1 ]
+#             Borg: [ 2, 3 ]
+#           #supply
+#             Quartermaster: [ 1, 1 ]
+#             CargoTechnician: [ 2, 4 ]
+#             SalvageSpecialist: [ 3, 4 ]
+#             MailCarrier: [ 2, 2 ]
+#           # Silicon
+#             StationAi: [ 1, 1 ]
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml b/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
index 77446652bbd..e3b0aef1397 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/uplink_catalog.yml
@@ -4,7 +4,7 @@
   description: uplink-kanabou-desc
   productEntity: Kanabou
   cost:
-    Telecrystal: 10
+    Telecrystal: 50
   categories:
   - UplinkWeaponry
   conditions:
@@ -18,7 +18,7 @@
   description: uplink-rickenbacker4001-desc
   productEntity: Rickenbacker4001Instrument
   cost:
-    Telecrystal: 10
+    Telecrystal: 50
   categories:
   - UplinkJob
   conditions:
@@ -32,7 +32,7 @@
   description: uplink-samurai-crate-desc
   productEntity: CrateSyndicateSamurai
   cost:
-    Telecrystal: 6
+    Telecrystal: 30
   categories:
   - UplinkWearables
   conditions:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
index df1e61c23da..be33551dbf9 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml
@@ -17,6 +17,10 @@
         - HandLabeler
         - Sidearm
         - Folder
+      components:
+        - AnomalyScanner
+        - NodeScanner
+        - Flash
 
 - type: entity
   parent: ClothingBeltBase
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 37690174697..fba2031f521 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -29,7 +29,6 @@
   startingGear: ForensicMantisGear
   icon: "JobIconForensicMantis"
   supervisors: job-supervisors-rd
-  antagAdvantage: 5 # DeltaV - From 4 to 5
   canBeAntag: true # DeltaV - Mantis is no longer a Detective
   # whitelistRequired: true
   access:
diff --git a/Resources/Prototypes/Procedural/biome_templates.yml b/Resources/Prototypes/Procedural/biome_templates.yml
index 425bcd824ab..0e706794e13 100644
--- a/Resources/Prototypes/Procedural/biome_templates.yml
+++ b/Resources/Prototypes/Procedural/biome_templates.yml
@@ -573,6 +573,7 @@
     - !type:BiomeTileLayer
       threshold: -1.0
       tile: FloorAsteroidSand
+      flags: 1
 
 # Asteroid
 - type: biomeTemplate
diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml
index 99e9182103d..23d80f0e79b 100644
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -155,6 +155,21 @@
           - !type:ReagentThreshold
             min: 80
 
+- type: reagent
+  id: Sedin
+  name: reagent-name-sedin
+  group: Botanical
+  desc: reagent-desc-sedin
+  flavor: bitter
+  color: "#3CB371"
+  physicalDesc: reagent-physical-desc-sickly
+  plantMetabolism:
+    - !type:PlantAdjustHealth
+      amount: -2
+    - !type:PlantRestoreSeeds
+      probability: 0.20
+    - !type:PlantAdjustPotency
+      amount: -3 # Match this with current rate of Robust Harvest potency increase
 
 - type: reagent
   id: WeedKiller
diff --git a/Resources/Prototypes/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
index 7ee8f1ed499..c17e42e346c 100644
--- a/Resources/Prototypes/Recipes/Lathes/chemistry.yml
+++ b/Resources/Prototypes/Recipes/Lathes/chemistry.yml
@@ -44,6 +44,14 @@
     Plastic: 100
     Steel: 25
 
+- type: latheRecipe
+  id: DisposableSyringe
+  result: DisposableSyringe
+  completetime: 0.1
+  materials:
+    Plastic: 10
+    Steel: 2
+
 - type: latheRecipe
   id: BluespaceBeaker
   result: BluespaceBeaker
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index a7359f185e8..016eb904fd5 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -234,6 +234,14 @@
   materials:
     Steel: 500
 
+# .25 Caseless Pistol Magazines
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolCaselessRiflePractice
+  result: MagazinePistolCaselessRiflePractice
+  materials:
+    Steel: 85
+
 - type: latheRecipe
   parent: BaseAmmoRecipe
   id: MagazinePistolCaselessRifle
@@ -241,6 +249,65 @@
   materials:
     Steel: 145
 
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolCaselessRifleRubber
+  result: MagazinePistolCaselessRifleRubber
+  materials:
+    Plastic: 145
+
+# .25 Caseless (Civilian) Rifle Magazines
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRifleShortPractice
+  result: MagazineCaselessRifleShortPractice
+  materials:
+    Steel: 150
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRifleShort
+  result: MagazineCaselessRifleShort
+  materials:
+    Steel: 250
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRifleShortRubber
+  result: MagazineCaselessRifleShortRubber
+  materials:
+    Plastic: 250
+
+# .25 Caseless (Military) Rifle Magazines
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRiflePractice
+  result: MagazineCaselessRiflePractice
+  materials:
+    Steel: 250
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRifle
+  result: MagazineCaselessRifle
+  materials:
+    Steel: 350
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineCaselessRifleRubber
+  result: MagazineCaselessRifleRubber
+  materials:
+    Plastic: 350
+
+# .25 Caseless (Box Mag) Rifle Magazines
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineBoxCaselessRiflePractice
+  result: MagazineBoxCaselessRiflePractice
+  materials:
+    Steel: 500
+
 - type: latheRecipe
   parent: BaseAmmoRecipe
   id: MagazineBoxCaselessRifle
@@ -248,6 +315,14 @@
   materials:
     Steel: 720
 
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazineBoxCaselessRifleRubber
+  result: MagazineBoxCaselessRifleRubber
+  materials:
+    Steel: 720
+
+# .35 Pistol Magazines
 - type: latheRecipe
   id: MagazinePistolEmpty
   result: MagazinePistolEmpty
@@ -1061,3 +1136,26 @@
     Bluespace: 600
     Plasma: 600
     Diamond: 200
+
+- type: latheRecipe
+  id: WeaponSubMachineGunFPA90
+  result: WeaponSubMachineGunFPA90
+  category: Weapons
+  completetime: 6
+  materials:
+    Aluminum: 2000
+    Steel: 500
+    Plastic: 750
+
+- type: latheRecipe
+  id: WeaponSubMachineGunBRDIR25
+  result: WeaponSubMachineGunBRDIR25
+  category: Weapons
+  completetime: 6
+  materials:
+    Aluminum: 2500
+    Plastic: 2000
+    Plasteel: 1500
+    Steel: 500
+    Circuitry: 500
+    Tungsten: 200
diff --git a/Resources/Prototypes/Recipes/Reactions/botany.yml b/Resources/Prototypes/Recipes/Reactions/botany.yml
index 0e95bd7ad92..1d96de479a7 100644
--- a/Resources/Prototypes/Recipes/Reactions/botany.yml
+++ b/Resources/Prototypes/Recipes/Reactions/botany.yml
@@ -21,6 +21,18 @@
   products:
     RobustHarvest: 1
 
+- type: reaction
+  id: Sedin
+  reactants:
+    Cryoxadone:
+      amount: 1
+    RobustHarvest:
+      amount: 3
+    Diethylamine: 
+      amount: 3
+  products:
+    Sedin: 1
+
 - type: reaction
   id: Left4Zed
   reactants:
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index fbeab5d0e1e..dba39448b58 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -22,6 +22,8 @@
   - WeaponEnergyGunPistol
   - WeaponDisablerSMG
   - Truncheon
+  - WeaponDisabler
+  - WeaponMechCombatDisabler # Goobstation
   #- WeaponPistolMk58 #todo: Add a bunch of basic ballistic guns to the list and make lathe recipes for them.
   - MechEquipmentKineticAccelerator # Goobstation
   # These are roundstart but not replenishable for salvage
@@ -52,43 +54,6 @@
   - CartridgeSpecialIncendiary
   - MagazineBoxSpecialIncendiary
 
-- type: technology
-  id: NonlethalAmmunition
-  name: research-technology-nonlethal-ammunition
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: beanbag
-  discipline: Arsenal
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - MagazineShotgunBeanbag
-  - ShellTranquilizer
-  - BoxBeanbag
-  - CartridgePistolRubber
-  - CartridgeMagnumRubber
-  - CartridgeLightRifleRubber
-  - CartridgeRifleRubber
-  - MagazineRifleRubber
-  - MagazinePistolRubber
-  - MagazinePistolSubMachineGunRubber
-  - MagazineMagnumRubber
-  - MagazineLightRifleRubber
-  - SpeedLoaderMagnumRubber
-  - MagazineBoxPistolRubber
-  - MagazineBoxMagnumRubber
-  - MagazineBoxLightRifleRubber
-  - MagazineBoxRifleRubber
-  - CartridgeSpecialRubber
-  - MagazineBoxSpecialRubber
-  - WeaponDisabler
-  - MagazineBoxLightRifleRubber # Frontier
-  - MagazineBoxMagnumRubber # Frontier
-  - MagazineBoxPistolRubber # Frontier
-  - MagazineBoxRifleRubber # Frontier
-  - SpeedLoaderRifleHeavyRubber
-  - WeaponMechCombatDisabler # Goobstation
-
 - type: technology
   id: UraniumMunitions
   name: research-technology-uranium-munitions
@@ -173,6 +138,7 @@
   - WeaponGunLaserCarbineAutomatic
   - WeaponLaserCannon
   - WeaponMechCombatSolarisLaser # Goobstation
+  - WeaponSubMachineGunFPA90
   technologyPrerequisites:
   - BasicWeapons
 
@@ -215,4 +181,5 @@
   - EnergySword # TODO: Add a bunch of stupidly exotic energy weapons to act as a reaaaaaally nice incentive for research to consider this.
   - EnergySwordDouble
   - EnergyCutlass
+  - WeaponSubMachineGunBRDIR25
   softCapContribution: 1.5
diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml
index 85bcf248025..4211f715da5 100644
--- a/Resources/Prototypes/Roles/Antags/nukeops.yml
+++ b/Resources/Prototypes/Roles/Antags/nukeops.yml
@@ -31,11 +31,10 @@
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
     pocket1: DoubleEmergencyOxygenTankFilled
-    pocket2: BaseUplinkRadio40TC
+    pocket2: BaseUplinkRadio60TC
     belt: ClothingBeltMilitaryWebbing
   innerClothingSkirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
index 7b5c19bcf81..e06c3ebd270 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
@@ -3,7 +3,6 @@
   name: job-name-cargotech
   description: job-description-cargotech
   playTimeTracker: JobCargoTechnician
-  antagAdvantage: 2 # DeltaV - Reduced TC: External Access
   startingGear: CargoTechGear
   icon: "JobIconCargoTechnician"
   supervisors: job-supervisors-qm
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
index 3643a255b3f..ba23041b51f 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -3,7 +3,6 @@
   name: job-name-qm
   description: job-description-qm
   playTimeTracker: JobQuartermaster
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
     - !type:CharacterTraitRequirement
       inverted: true
diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
index 4d55f6183ba..5f9692740b7 100644
--- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
@@ -3,7 +3,6 @@
   name: job-name-salvagespec
   description: job-description-salvagespec
   playTimeTracker: JobSalvageSpecialist
-  antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Free hardsuit and weapons
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Logistics # DeltaV - Logistics Department replacing Cargo
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
index d0933615695..0ad962e967c 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
@@ -3,12 +3,12 @@
   name: job-name-lawyer
   description: job-description-lawyer
   playTimeTracker: JobLawyer
-  antagAdvantage: 2 # DeltaV - Reduced TC: Security Radio and Access
   startingGear: LawyerGear
   icon: "JobIconLawyer"
   supervisors: job-supervisors-cj  # Delta V - Change supervisor to chief justice
   access:
-  - Service
+  # - Service - DeltaV, removed from service department
+  - Justice # DeltaV - Justice dept
   - Lawyer
   - Maintenance
 
diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
index ca7c796283d..69fdaa4e12d 100644
--- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
@@ -7,7 +7,6 @@
   icon: "JobIconServiceWorker"
   supervisors: job-supervisors-service
   canBeAntag: true # DeltaV - Can be antagonist
-  antagAdvantage: 1 # DeltaV - Reduced TC: Accesses
   access:
   - Service
   - Maintenance
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index d21d6b3d42f..5752dff5f96 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -9,7 +9,6 @@
       traits:
         - Foreigner
         - ForeignerLight
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
index b271a3d9358..740b99d7601 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
@@ -1,40 +1,40 @@
-- type: job
-  id: AtmosphericTechnician
-  name: job-name-atmostech
-  description: job-description-atmostech
-  playTimeTracker: JobAtmosphericTechnician
-  antagAdvantage: 10 # DeltaV - Reduced TC: External Access + Fireaxe + Free Hardsuit
-  requirements:
-    - !type:CharacterDepartmentTimeRequirement
-      department: Engineering
-      min: 36000 # DeltaV - 10 hours
-  startingGear: AtmosphericTechnicianGear
-  icon: "JobIconAtmosphericTechnician"
-  supervisors: job-supervisors-ce
-  access:
-  - Maintenance
-  - Engineering
-  - External
-  - Atmospherics
-
-- type: startingGear
+- type: job
+  id: AtmosphericTechnician
+  name: job-name-atmostech
+  description: job-description-atmostech
+  playTimeTracker: JobAtmosphericTechnician
+  requirements:
+    - !type:CharacterDepartmentTimeRequirement
+      department: Engineering
+      min: 36000 # DeltaV - 10 hours
+  startingGear: AtmosphericTechnicianGear
+  icon: "JobIconAtmosphericTechnician"
+  supervisors: job-supervisors-ce
+  access:
+  - Maintenance
+  - Engineering
+  - External
+  - Atmospherics
+
+- type: startingGear
   id: AtmosphericTechnicianGear
   subGear:
-  - AtmosphericTechnicianPlasmamanGear

-  equipment:
-    jumpsuit: ClothingUniformJumpsuitAtmos
-    back: ClothingBackpackAtmospherics
-    shoes: ClothingShoesColorWhite
-    id: AtmosPDA
-    ears: ClothingHeadsetEngineering
-  innerClothingSkirt: ClothingUniformJumpskirtAtmos
-  satchel: ClothingBackpackSatchelEngineeringFilled
-  duffelbag: ClothingBackpackDuffelEngineeringFilled
-
-- type: startingGear
-  id: AtmosphericTechnicianPlasmamanGear
-  parent: BasePlasmamanGear
-  equipment:
-    jumpsuit: ClothingUniformEnvirosuitAtmos
-    head: ClothingHeadEnvirohelmAtmos
-    gloves: ClothingHandsGlovesEnviroglovesAtmos
+  - AtmosphericTechnicianPlasmamanGear
+
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitAtmos
+    back: ClothingBackpackAtmospherics
+    shoes: ClothingShoesColorWhite
+    id: AtmosPDA
+    ears: ClothingHeadsetEngineering
+  innerClothingSkirt: ClothingUniformJumpskirtAtmos
+  satchel: ClothingBackpackSatchelEngineeringFilled
+  duffelbag: ClothingBackpackDuffelEngineeringFilled
+
+- type: startingGear
+  id: AtmosphericTechnicianPlasmamanGear
+  parent: BasePlasmamanGear
+  equipment:
+    jumpsuit: ClothingUniformEnvirosuitAtmos
+    head: ClothingHeadEnvirohelmAtmos
+    gloves: ClothingHandsGlovesEnviroglovesAtmos
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
index 8169ff0e9c6..878c6be350c 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
@@ -3,7 +3,6 @@
   name: job-name-engineer
   description: job-description-engineer
   playTimeTracker: JobStationEngineer
-  antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering
   requirements:
     - !type:CharacterDepartmentTimeRequirement
       department: Engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
index 93bc35c5e01..1b933122235 100644
--- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
@@ -3,7 +3,6 @@
   name: job-name-technical-assistant
   description: job-description-technical-assistant
   playTimeTracker: JobTechnicalAssistant
-  antagAdvantage: 3 # DeltaV - Reduced TC: External Access + Engineering
   startingGear: TechnicalAssistantGear
   icon: "JobIconTechnicalAssistant"
   supervisors: job-supervisors-engineering
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 31e35077047..0967158957c 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -87,7 +87,6 @@
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndie
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
     pocket1: DoubleEmergencyOxygenTankFilled
@@ -110,14 +109,13 @@
     ears: ClothingHeadsetAltSyndicate
     neck: SyndicateWhistle
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieCommander
     shoes: ClothingShoesBootsCombatFilled
     id: SyndiPDA
     pocket1: DoubleEmergencyOxygenTankFilled
     pocket2: BaseUplinkRadio40TC
     belt: ClothingBeltMilitaryWebbing
-  #inhand: # DeltaV - Prevent commander spawning with the declaration of war
-  #  - NukeOpsDeclarationOfWar
+  inhand:
+    - NukeOpsDeclarationOfWar
   innerClothingSkirt: ClothingUniformJumpskirtOperative
   satchel: ClothingBackpackDuffelSyndicateOperative
   duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -134,7 +132,6 @@
     eyes: ClothingEyesHudSyndicateAgent
     ears: ClothingHeadsetAltSyndicate
     gloves: ClothingHandsGlovesCombat
-    outerClothing: ClothingOuterHardsuitSyndieMedic
     shoes: ClothingShoesBootsMagSyndie
     id: SyndiAgentPDA
     pocket1: DoubleEmergencyOxygenTankFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
index ad1c5f8dfd1..71ae6622258 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -5,7 +5,6 @@
   name: job-name-cmo
   description: job-description-cmo
   playTimeTracker: JobChiefMedicalOfficer
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
     - !type:CharacterTraitRequirement
       inverted: true
diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
index 454322a92cb..63f264ade75 100644
--- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
@@ -3,7 +3,6 @@
   name: job-name-paramedic
   description: job-description-paramedic
   playTimeTracker: JobParamedic
-  antagAdvantage: 2 # DeltaV - Reduced TC: External Access
   requirements:
     # - !type:RoleTimeRequirement # DeltaV - No Medical Doctor time requirement
     #   role: JobMedicalDoctor
diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
index 5d6b7e12610..58078d3bc27 100644
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -3,7 +3,6 @@
   name: job-name-rd
   description: job-description-rd
   playTimeTracker: JobResearchDirector
-  antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
   requirements:
     - !type:CharacterLogicOrRequirement
       requirements:
diff --git a/Resources/Prototypes/SoundCollections/harpy.yml b/Resources/Prototypes/SoundCollections/harpy.yml
index 68133faac09..27b6a1f1f66 100644
--- a/Resources/Prototypes/SoundCollections/harpy.yml
+++ b/Resources/Prototypes/SoundCollections/harpy.yml
@@ -249,3 +249,11 @@
     - /Audio/Voice/Talk/pai.ogg
     - /Audio/Voice/Talk/pai_ask.ogg
     - /Audio/Voice/Talk/pai_exclaim.ogg
+
+- type: soundCollection
+  id: HarpyHoots
+  files:
+    - /Audio/Effects/Emotes/harpyHoot1.ogg
+    - /Audio/Effects/Emotes/harpyHoot2.ogg
+    - /Audio/Effects/Emotes/harpyHoot3.ogg
+    - /Audio/Effects/Emotes/harpyHoot4.ogg
diff --git a/Resources/Prototypes/Traits/mental.yml b/Resources/Prototypes/Traits/mental.yml
index 627aad4b1f7..ed5008cec6b 100644
--- a/Resources/Prototypes/Traits/mental.yml
+++ b/Resources/Prototypes/Traits/mental.yml
@@ -282,6 +282,9 @@
   requirements:
     - !type:CharacterLogicOrRequirement
       requirements:
+        - !type:CharacterSpeciesRequirement
+          species:
+            - Shadowkin # Innate Psionics
         - !type:CharacterTraitRequirement
           traits:
             - LatentPsychic
@@ -299,6 +302,10 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ShadowkinBlackeye
     - !type:CharacterJobRequirement
       inverted: true
       jobs:
@@ -317,6 +324,9 @@
   requirements:
     - !type:CharacterLogicOrRequirement
       requirements:
+        - !type:CharacterSpeciesRequirement
+          species:
+            - Shadowkin # Innate Psionics
         - !type:CharacterTraitRequirement
           traits:
             - LatentPsychic
@@ -333,6 +343,10 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ShadowkinBlackeye
     - !type:CharacterJobRequirement
       inverted: true
       jobs:
@@ -352,6 +366,9 @@
   requirements:
     - !type:CharacterLogicOrRequirement
       requirements:
+        - !type:CharacterSpeciesRequirement
+          species:
+            - Shadowkin # Innate Psionics
         - !type:CharacterTraitRequirement
           traits:
             - LatentPsychic
@@ -370,6 +387,10 @@
         - !type:CharacterTraitRequirement
           traits:
             - AnomalousPositronics
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ShadowkinBlackeye
     - !type:CharacterJobRequirement
       inverted: true
       jobs:
@@ -388,6 +409,9 @@
   requirements:
     - !type:CharacterLogicOrRequirement
       requirements:
+        - !type:CharacterSpeciesRequirement
+          species:
+            - Shadowkin # Innate Psionics
         - !type:CharacterTraitRequirement
           traits:
             - LatentPsychic
@@ -409,6 +433,10 @@
             - AnomalousPositronics
     - !type:CharacterItemGroupRequirement
       group: TraitsMachine
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ShadowkinBlackeye
   functions:
     - !type:TraitAddPsionics
       psionicPowers:
diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index a5864a8c569..fbe8db36b08 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -862,3 +862,54 @@
         - description: examine-thermal-vision-message
           fontSize: 12
           requireDetailRange: true
+
+- type: trait
+  id: NaniteAutoRepairBots
+  category: Physical
+  points: -10
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterSpeciesRequirement
+      species:
+        - IPC
+    - !type:CharacterItemGroupRequirement
+      group: TraitsMind
+  functions: # TODO: Code Platelet factories as an actual obtainable implant, and replace this with TraitAddImplant
+    - !type:TraitReplaceComponent
+      components:
+        - type: PassiveDamage
+          allowedStates:
+          - Alive
+          - Critical
+          - Dead
+          damageCap: 200
+          damage:
+            groups:
+              Brute: -0.9
+              Burn: -0.9
+
+- type: trait
+  id: BionicLeg
+  category: Physical
+  points: -6
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Prisoner # Bionics should be "Confiscated" from long term prisoners.
+    - !type:CharacterItemGroupRequirement
+      group: TraitsMind
+  functions:
+    - !type:TraitAddComponent
+      components:
+      - type: MovementBodyPart
+        walkSpeed: 3.125
+        sprintSpeed: 5.625
+    - !type:TraitPushDescription
+      descriptionExtensions:
+        - description: examine-bionic-leg-message
+          fontSize: 12
+          requireDetailRange: true
\ No newline at end of file
diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Head/hats.yml
new file mode 100644
index 00000000000..43d43300336
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Entities/Clothing/Head/hats.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatSeniorTrooper
+  name: senior trooper hat
+  description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
+  components:
+  - type: Sprite
+    sprite: _DEN/Clothing/Head/Hats/seniortrooperhat.rsi
+  - type: Clothing
+    sprite: _DEN/Clothing/Head/Hats/seniortrooperhat.rsi
diff --git a/Resources/Prototypes/_DEN/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_DEN/Entities/Clothing/Uniforms/jumpsuits.yml
new file mode 100644
index 00000000000..05c613dd6e0
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitSeniorTrooper
+  name: senior trooper uniform
+  description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car.
+  components:
+  - type: Sprite
+    sprite: _DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi
+  - type: Clothing
+    sprite: _DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi
diff --git a/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml
new file mode 100644
index 00000000000..e7fc18c2d5b
--- /dev/null
+++ b/Resources/Prototypes/_DEN/Loadouts/Jobs/Security/uncategorized.yml
@@ -0,0 +1,27 @@
+- type: loadout
+  id: LoadoutSecurityHeadHatSeniorTrooper
+  category: JobsSecurityAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutSecurityHead
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingHeadHatSeniorTrooper
+
+- type: loadout
+  id: LoadoutSecurityUniformJumpsuitSeniorTrooper
+  category: JobsSecurityAUncategorized
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutSecurityUniforms
+    - !type:CharacterDepartmentRequirement
+      departments:
+        - Security
+  items:
+    - ClothingUniformJumpsuitSeniorTrooper
diff --git a/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
new file mode 100644
index 00000000000..564c4bf9906
--- /dev/null
+++ b/Resources/Prototypes/_EE/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -0,0 +1,146 @@
+- type: entity
+  name: FPA-90 sub machine gun
+  parent: BaseWeaponPistol
+  id: WeaponSubMachineGunFPA90
+  description: It's a cheap piece of shit made by a company well known for cheap guns, but at least you don't need hearing protection while using it. It fires .25 caseless.
+  components:
+  - type: Sprite
+    sprite: _EE/Objects/Weapons/Guns/SMGs/FPA90.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Gun
+    minAngle: 10
+    maxAngle: 15
+    fireRate: 20
+    burstFireRate: 20
+    shotsPerBurst: 3
+    burstCooldown: 1.1
+    selectedMode: Burst
+    soundGunshot:
+      path: /Audio/_EE/Weapons/Guns/Gunshots/fpa-90-suppressed-gunshot.ogg
+      params:
+        volume: -3
+        maxDistance: 8
+        rolloffFactor: 1.2
+    availableModes:
+      - Burst
+    fireOnDropChance: 1
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineCaselessRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineCaselessRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeCaselessRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeCaselessRifle
+  - type: Appearance
+  - type: StaticPrice
+    price: 200
+  - type: Item
+    size: Large
+    shape: null
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-suppressed"
+        fontSize: 10
+        color: "#ff4f00"
+        requireDetailRange: false
+
+- type: entity
+  name: BRDI R-25
+  parent: [BaseWeaponSubMachineGun, BaseGunWieldable]
+  id: WeaponSubMachineGunBRDIR25
+  description: An iconic weapon used by members of the Biesel Republic Foreign Legion. As a pride and joy of the colonies, it represents freedom from the tyranny of the Sol Alliance. It is chambered in .25 Caseless Rifle.
+  components:
+  - type: Sprite
+    sprite: _EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Wieldable
+  - type: GunWieldBonus
+    minAngle: -19
+    maxAngle: -16
+  - type: Gun
+    minAngle: 21
+    maxAngle: 32
+    fireRate: 5 # 300rpm in Semi & Full Auto
+    burstFireRate: 20 # 1200rpm in Burst mode.
+    shotsPerBurst: 5
+    burstCooldown: 0.8
+    cameraRecoilScalar: 0.5
+    selectedMode: Burst
+    soundGunshot:
+      path: /Audio/_EE/Weapons/Guns/Gunshots/fpa-90-suppressed-gunshot.ogg
+      params:
+        volume: -3
+        maxDistance: 8
+        rolloffFactor: 1.2
+    availableModes:
+    - SemiAuto
+    - Burst
+    - FullAuto
+    fireOnDropChance: 0.3
+  - type: ChamberMagazineAmmoProvider
+    autoEject: true
+  - type: MagazineVisuals
+    magState: mag
+    steps: 1
+    zeroVisible: true
+  - type: Appearance
+  - type: StaticPrice
+    price: 1500
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazineCaselessRifle
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazineCaselessRifle
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgeCaselessRifle
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgeCaselessRifle
+  - type: ExtendDescription
+    descriptionList:
+      - description: "gun-suppressed"
+        fontSize: 10
+        color: "#ff4f00"
+        requireDetailRange: false
+
+- type: entity
+  name: antique BRDI R-25
+  parent: WeaponSubMachineGunBRDIR25
+  id: WeaponSubMachineGunBRDIR25HoS
+  description: Once wielded by an unknown member of the Biesel Foreign Legion, this beloved rifle has seen battle with Sol on every world in the colonies.
+  components:
+    - type: StealTarget
+      stealGroup: HoSAntiqueWeapon
+    - type: Sprite
+      sprite: _EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi
diff --git a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
index 6e4c723dc5b..6f401d18111 100644
--- a/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml
@@ -7,7 +7,7 @@
   icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: darkgygax }
   productEntity: CrateCybersunDarkGygaxBundle
   cost:
-    Telecrystal: 80 # Einstein Engines -  1/5th the price due to no telecrystal rework
+    Telecrystal: 400
   categories:
   - UplinkAllies
 
@@ -18,12 +18,11 @@
   icon: { sprite: /Textures/Objects/Specific/Mech/mecha.rsi, state: mauler }
   productEntity: CrateCybersunMaulerBundle
   cost:
-    Telecrystal: 105 # Einstein Engines - lower the price due to no telecrystal rework
-                     # cost reduced such that nukies can still only buy one with all pooled nukies' TC
+    Telecrystal: 525
   categories:
   - UplinkAllies
   conditions:
   - !type:StoreWhitelistCondition
     whitelist:
       tags:
-      - NukeOpsUplink
\ No newline at end of file
+      - NukeOpsUplink
diff --git a/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml
new file mode 100644
index 00000000000..ac34ef619c4
--- /dev/null
+++ b/Resources/Prototypes/_Shitmed/Entities/Structures/Machines/lathe.yml
@@ -0,0 +1,46 @@
+- type: entity
+  parent: BaseLathe
+  id: MedicalBiofabricator
+  name: medical biofabricator
+  description: Produces organs and other organic matter that can be surgically grafted onto patients with biomass.
+  components:
+  - type: Sprite
+    sprite: _Shitmed/Structures/Machines/limbgrower.rsi
+    snapCardinals: true
+    layers:
+    - state: limbgrower_idleoff
+      map: ["enum.LatheVisualLayers.IsRunning"]
+#    - state: limbgrower_idleoff
+#      shader: unshaded
+#      map: ["enum.PowerDeviceVisualLayers.Powered"]
+#    - state: inserting
+#      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+#    - state: panel
+#      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: MedicalBiofabMachineBoard
+  - type: MaterialStorage
+    whitelist:
+      tags:
+      - Sheet
+      - RawMaterial
+  - type: Lathe
+    idleState: limbgrower_idleoff
+    runningState: limbgrower_idleon
+    staticRecipes:
+    - SynthLiver
+    - SynthHeart
+    - SynthLungs
+    - SynthEyes
+    - SynthLeftLeg
+    - SynthRightLeg
+    - SynthLeftFoot
+    - SynthRightFoot
+    - SynthLeftArm
+    - SynthRightArm
+    - SynthLeftHand
+    - SynthRightHand
+  - type: EmagLatheRecipes
+    emagStaticRecipes:
+    - PizzaLeftArm
+    - PizzaRightArm
diff --git a/Resources/ServerInfo/Guidebook/Mobs/Plasmaman.xml b/Resources/ServerInfo/Guidebook/Mobs/Plasmaman.xml
index d0c41a3100c..49ece244dff 100644
--- a/Resources/ServerInfo/Guidebook/Mobs/Plasmaman.xml
+++ b/Resources/ServerInfo/Guidebook/Mobs/Plasmaman.xml
@@ -26,12 +26,14 @@
 
   Plasmamen with the traits [bold]Claws[/bold], [bold]Talons[/bold] or [bold]Natural Weapons Removal[/bold] have less unarmed damage but don't take self-damage from unarmed attacks.
 
-  They take [color=#1e90ff]25% less Piercing, 20% less Poison, and 15% less Slash damage[/color],
+  They take [color=#1e90ff]40% less Piercing, 20% less Slash, and 20% less Poison damage[/color],
   and are [color=#8658fc]immune to Radiation and Cold damage[/color],
   but take [color=#ffa500]50% more Blunt and 50% more Heat damage[/color].
 
   Due to their [color=#8658fc]Cold immunity[/color], they can live in cold environments such as Glacier Station without the need of a winter coat.
 
+  They have a slightly lower density than the average species. This results in weaknesses such as but not limited to: being slightly more vulnerable to being shoved, picked up, and thrown by Space Wind, and having a harder time pulling heavy objects.
+
   ## Equipment
   <Box>
     <GuideEntityEmbed Entity="ClothingUniformEnvirosuit" Caption="envirosuit"/>
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png
new file mode 100644
index 00000000000..4b087e14f67
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/assembly.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png
new file mode 100644
index 00000000000..653846c3022
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png
new file mode 100644
index 00000000000..1108755279e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png
new file mode 100644
index 00000000000..cc185dfdb5a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png
new file mode 100644
index 00000000000..589dca596e2
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png
new file mode 100644
index 00000000000..7498990a390
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png
new file mode 100644
index 00000000000..8c381d4c61e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png
new file mode 100644
index 00000000000..f210ecf123e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/meta.json
new file mode 100644
index 00000000000..0e560a01f74
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original Science Airlock taken from https://github.com/ParadiseSS13/Paradise/, Roboticist Resprite done by Unkn0wn_Gh0st333 on github",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/open.png
new file mode 100644
index 00000000000..77ba7ca3c62
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening.png
new file mode 100644
index 00000000000..25f33c23534
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening_unlit.png
new file mode 100644
index 00000000000..2e109950a4e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_closing.png
new file mode 100644
index 00000000000..4a0d28b65b4
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_open.png
new file mode 100644
index 00000000000..2e348983fef
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_opening.png
new file mode 100644
index 00000000000..899651c3044
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/panel_opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks.png
new file mode 100644
index 00000000000..dd67e88a315
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_broken.png
new file mode 100644
index 00000000000..fb5d774588a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_damaged.png
new file mode 100644
index 00000000000..f16a028dee5
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_open.png
new file mode 100644
index 00000000000..630eabb976e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/sparks_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/welded.png
new file mode 100644
index 00000000000..cd44689455c
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/roboticist.rsi/welded.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/assembly.png
new file mode 100644
index 00000000000..58bde1ae528
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/assembly.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/bolted_unlit.png
new file mode 100644
index 00000000000..653846c3022
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed.png
new file mode 100644
index 00000000000..0cbcf9e6efb
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed_unlit.png
new file mode 100644
index 00000000000..cc185dfdb5a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing.png
new file mode 100644
index 00000000000..f435c3fd447
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing_unlit.png
new file mode 100644
index 00000000000..7498990a390
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/deny_unlit.png
new file mode 100644
index 00000000000..8c381d4c61e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/emergency_unlit.png
new file mode 100644
index 00000000000..f210ecf123e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/meta.json
new file mode 100644
index 00000000000..0e560a01f74
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/meta.json
@@ -0,0 +1,195 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original Science Airlock taken from https://github.com/ParadiseSS13/Paradise/, Roboticist Resprite done by Unkn0wn_Gh0st333 on github",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/open.png
new file mode 100644
index 00000000000..1ec26cadcca
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening.png
new file mode 100644
index 00000000000..cbe0e327c62
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening_unlit.png
new file mode 100644
index 00000000000..2e109950a4e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_closing.png
new file mode 100644
index 00000000000..4a0d28b65b4
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_closing.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_open.png
new file mode 100644
index 00000000000..2e348983fef
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_opening.png
new file mode 100644
index 00000000000..899651c3044
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/panel_opening.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks.png
new file mode 100644
index 00000000000..dd67e88a315
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_broken.png
new file mode 100644
index 00000000000..fb5d774588a
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_broken.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_damaged.png
new file mode 100644
index 00000000000..f16a028dee5
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_damaged.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_open.png
new file mode 100644
index 00000000000..630eabb976e
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/sparks_open.png differ
diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/welded.png
new file mode 100644
index 00000000000..cd44689455c
Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/roboticist.rsi/welded.png differ
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png
index 72f56385f58..0be8b9b1ddb 100644
Binary files a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/crit.png differ
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png
index 8e846432812..2761d22dbf7 100644
Binary files a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/dead.png differ
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json
index f238edbb198..ce2209e72dd 100644
--- a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/meta.json
@@ -1,24 +1,24 @@
 {
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by Fenndragon, discord ID: 190763499276861440",
-    "size": {
-        "x": 64,
-        "y": 64
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/a2034543920664ddf0c0f3c681bf1d8003dc2ade/icons/Xeno/2x2_Xenos.dmi",
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "states": [
+    {
+      "name": "running",
+      "directions": 4
     },
-    "states": [
-        {
-            "name": "running",
-            "directions": 4
-        },
-        {
-            "name": "sleeping"
-        },
-        {
-            "name": "dead"
-        },
-        {
-            "name": "crit"
-        }
-    ]
+    {
+      "name": "sleeping"
+    },
+    {
+      "name": "dead"
+    },
+    {
+      "name": "crit"
+    }
+  ]
 }
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png
index 556dc97d7e9..2bbe1c603eb 100644
Binary files a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/running.png differ
diff --git a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png
index 3bb814f467e..06ff2250d0e 100644
Binary files a/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png and b/Resources/Textures/Mobs/Aliens/Xenos/rouny.rsi/sleeping.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-1.png
new file mode 100644
index 00000000000..93ff582233b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-2.png
new file mode 100644
index 00000000000..a8271c771cd
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-3.png
new file mode 100644
index 00000000000..b8ce5e2519d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left-fill-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left.png
new file mode 100644
index 00000000000..9b7b05b437d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-1.png
new file mode 100644
index 00000000000..9f489d4e645
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-2.png
new file mode 100644
index 00000000000..ed4dc38dda6
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-3.png
new file mode 100644
index 00000000000..ffb2bd374c5
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right-fill-3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right.png
new file mode 100644
index 00000000000..4fe1bcafb53
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/meta.json
new file mode 100644
index 00000000000..bfdd295b00c
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/meta.json
@@ -0,0 +1,67 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Base taken from cev-eris https://github.com/discordia-space/CEV-Eris/commit/989b7b343045f30120c198ee100c9fee7ff8a989, and edited by Timfa",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "syringe_base0"
+        },
+        {
+            "name": "syringe_base1"
+        },
+        {
+            "name": "syringe_base2"
+        },
+        {
+            "name": "syringe_base3"
+        },
+        {
+            "name": "syringe_base4"
+        },
+        {
+            "name": "syringeproj"
+        },
+        {
+            "name": "syringe1"
+        },
+        {
+            "name": "syringe2"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-fill-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-fill-3",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe1.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe1.png
new file mode 100644
index 00000000000..9aa237b1364
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe2.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe2.png
new file mode 100644
index 00000000000..d8b7e8a701b
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base0.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base0.png
new file mode 100644
index 00000000000..494b370be0a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base0.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base1.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base1.png
new file mode 100644
index 00000000000..c2929c92e05
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base2.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base2.png
new file mode 100644
index 00000000000..20a2cb37007
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base3.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base3.png
new file mode 100644
index 00000000000..8ac30eaf55e
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base4.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base4.png
new file mode 100644
index 00000000000..fab5be6bc52
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringe_base4.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringeproj.png b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringeproj.png
new file mode 100644
index 00000000000..e67453c0cef
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/disposablesyringe.rsi/syringeproj.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/equipped-HELMET.png b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..2924b36b042
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/icon.png b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/icon.png
new file mode 100644
index 00000000000..85f8675aaf6
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/icon.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-left.png b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-left.png
new file mode 100644
index 00000000000..f87c13107a4
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-right.png b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-right.png
new file mode 100644
index 00000000000..e7de9c7fec5
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/meta.json b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/meta.json
new file mode 100644
index 00000000000..23800aadf7a
--- /dev/null
+++ b/Resources/Textures/_DEN/Clothing/Head/Hats/seniortrooperhat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from WizDen at https://github.com/space-wizards/space-station-14/commit/2f7ad782c5cb1544b584d92ecc4ba8614e538e18. Modified by FATFSAAM2 (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000..a4b8c8573f2
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/icon.png b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/icon.png
new file mode 100644
index 00000000000..d32f7c94411
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/icon.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-left.png b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-left.png
new file mode 100644
index 00000000000..7630fd39e93
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-right.png b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-right.png
new file mode 100644
index 00000000000..348c2f2b900
Binary files /dev/null and b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/meta.json b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/meta.json
new file mode 100644
index 00000000000..b8a05e11941
--- /dev/null
+++ b/Resources/Textures/_DEN/Clothing/Uniforms/Jumpsuit/seniortrooper.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from WizDen at https://github.com/space-wizards/space-station-14/commit/2f7ad782c5cb1544b584d92ecc4ba8614e538e18. Modified by FATFSAAM2 (Github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/base.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/base.png
new file mode 100644
index 00000000000..6a9578bdce2
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/base.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/bolt-open.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/bolt-open.png
new file mode 100644
index 00000000000..6a9578bdce2
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/icon.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/icon.png
new file mode 100644
index 00000000000..4fcf8c8a744
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-left.png
new file mode 100644
index 00000000000..773d845d0a6
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-right.png
new file mode 100644
index 00000000000..ac8ed48eee9
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/mag-0.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/mag-0.png
new file mode 100644
index 00000000000..7c06c519f36
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/mag-0.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/meta.json b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/meta.json
new file mode 100644
index 00000000000..9e49f5e3af7
--- /dev/null
+++ b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by meijunkie (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "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/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..8e073a97658
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..e430b5762ff
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/base.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/base.png
new file mode 100644
index 00000000000..57e348642a9
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/base.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/bolt-open.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/bolt-open.png
new file mode 100644
index 00000000000..57e348642a9
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/icon.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/icon.png
new file mode 100644
index 00000000000..2de34bd1ceb
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-left.png
new file mode 100644
index 00000000000..44503db231f
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-right.png
new file mode 100644
index 00000000000..f9e065b519a
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/mag-0.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/mag-0.png
new file mode 100644
index 00000000000..7c06c519f36
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/mag-0.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/meta.json b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/meta.json
new file mode 100644
index 00000000000..9e49f5e3af7
--- /dev/null
+++ b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by meijunkie (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "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/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-left.png
new file mode 100644
index 00000000000..33f8794cc96
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-right.png
new file mode 100644
index 00000000000..ded38652156
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/BRDI_R25_antique.rsi/wielded-inhand-right.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/base.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/base.png
new file mode 100644
index 00000000000..fff069e89df
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/base.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/bolt-open.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/bolt-open.png
new file mode 100644
index 00000000000..d83d72e3fd2
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/bolt-open.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/icon.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/icon.png
new file mode 100644
index 00000000000..66cf469a81c
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/icon.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-left.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-left.png
new file mode 100644
index 00000000000..406a05afe67
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-right.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-right.png
new file mode 100644
index 00000000000..704ad8a77c1
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/mag-0.png b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/mag-0.png
new file mode 100644
index 00000000000..dce5b1c63ed
Binary files /dev/null and b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/mag-0.png differ
diff --git a/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/meta.json b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/meta.json
new file mode 100644
index 00000000000..a9f955a31b6
--- /dev/null
+++ b/Resources/Textures/_EE/Objects/Weapons/Guns/SMGs/FPA90.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by plyushsune (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/RobustToolbox b/RobustToolbox
index ee906af16e1..9d1b15ab4b7 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit ee906af16e136c7e09930d88872ab9bba3137c8e
+Subproject commit 9d1b15ab4b79d441fb215d1c5069f3a15e3ca675