diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0364ac87816..72f6893e2d2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,34 +1,25 @@
 # Last match in file takes precedence.
+# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#example-of-a-codeowners-file
 
-# C# code
-/Content.*/ @DeltaV-Station/maintainers
-
-# Any assets
-/Resources/ @DeltaV-Station/maintainers
+* @DeltaV-Station/maintainers
 
 # Server config files
-/Resources/ConfigPresets/ @Toby222
+/Resources/ConfigPresets/ @DeltaV-Station/lead-maintainers
+
+# Github workflows
+/.github/ @DeltaV-Station/lead-maintainers
 
 # Lobby art and music - automatically direction issues since its immediately visible to players
-/Resources/Audio/Lobby/ @DeltaV-Station/direction
-/Resources/Textures/LobbyScreens/ @DeltaV-Station/direction
+/Resources/Audio/Lobby/ @DeltaV-Station/direction @DeltaV-Station/maintainers
+/Resources/Textures/LobbyScreens/ @DeltaV-Station/direction @DeltaV-Station/maintainers
 
 # Maps
 /Resources/Maps/ @DeltaV-Station/maptainers
 /Resources/Prototypes/Maps/ @DeltaV-Station/maptainers
-/Content.IntegrationTests/Tests/PostMapInitTest.cs @DeltaV-Station/maptainers
+/Content.IntegrationTests/Tests/PostMapInitTest.cs @DeltaV-Station/maptainers @DeltaV-Station/maintainers 
 
 # Server rules
 /Resources/ServerInfo/Guidebook/_DV/Rules/ @DeltaV-Station/head-administrators
 
 # Wiki
-/.wiki/ @DeltaV-Station/direction
-
-# Tools and scripts
-/Tools/ @Toby222
-
-# Workflows, codeowners, templates, etc.
-/.github/ @Toby222
-
-# Standalone files in the root repo
-/* @Toby222
+/.wiki/ @DeltaV-Station/direction
\ No newline at end of file
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs
index 6434aa5be99..6d92a109457 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.Appearance.cs
@@ -9,6 +9,8 @@ using Content.Shared.Preferences;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
+using Content.Client._CD.Records.UI; // DeltaV
+using Content.Shared._DV.Body.Systems; // DeltaV
 
 namespace Content.Client.Lobby.UI;
 
@@ -193,6 +195,7 @@ public sealed partial class HumanoidProfileEditor
         RefreshLoadouts();
         UpdateSexControls(); // update sex for new species
         UpdateSpeciesGuidebookIcon();
+        UpdateHeightControls(); // DeltaV
         ReloadPreview();
     }
 
@@ -204,23 +207,22 @@ public sealed partial class HumanoidProfileEditor
         ReloadProfilePreview();
     }
 
-
     private void UpdateHeightControls()
     {
         if (Profile == null)
-        {
             return;
-        }
 
-        var species = _species.Find(x => x.ID == Profile.Species);
-        if (species != null)
-            _defaultHeight = species.DefaultHeight;
+        var prototype = _prototypeManager.Index(Profile.Species);
+        _defaultHeight = prototype.DefaultHeight;
 
-        var prototype = _prototypeManager.Index<SpeciesPrototype>(Profile.Species);
         var sliderPercent = (Profile.Height - prototype.MinHeight) /
                             (prototype.MaxHeight - prototype.MinHeight);
         CDHeightSlider.Value = sliderPercent;
-        CDHeight.Text = Profile.Height.ToString(CultureInfo.InvariantCulture);
+
+        var scaleReference = _defaultHeight * prototype.BaseScale.Y;
+        var newHeight = MathF.Round(MathHelper.Lerp(prototype.MinHeight, prototype.MaxHeight, sliderPercent), 2);
+        CDHeightLabel.Text = UnitConversion.GetMetricAndImperialDisplayFromScale(scaleReference * newHeight);
+        CDPullSpeedReductionLabel.Text = SmallCharacterSystem.GetPullSpeedPenaltyDisplayFromScale(newHeight);
     }
     // End CD - Character Records
 
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
index 06a33cd01b1..e0c9f1544aa 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -73,9 +73,13 @@
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Text="{Loc 'humanoid-profile-editor-height-label'}" />
                                     <Control HorizontalExpand="True" />
+                                    <Label Name="CDHeightLabel" />
                                     <Slider Name="CDHeightSlider" HorizontalAlignment="Right" SetWidth="300" MinValue="0.0" MaxValue="1.0"/>
-                                    <LineEdit HorizontalAlignment="Right" Name="CDHeight" MinSize="60 0" Text="1.0" />
-                                    <Button Name="CDHeightReset" Text="{Loc 'humanoid-profile-editor-reset-height-button'}" HorizontalAlignment="Right"/>
+                                </BoxContainer>
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Text="{Loc 'humanoid-profile-editor-height-pull-speed-penalty-label'}" />
+                                    <Control HorizontalExpand="True" />
+                                    <Label Name="CDPullSpeedReductionLabel" />
                                 </BoxContainer>
                                 <!-- End CD - Character Records -->
                                 <!-- Sex -->
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 4cbcd4767b3..7ae72c6806c 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -2,9 +2,6 @@ using Content.Client.Humanoid;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Sprite;
-using Content.Client.UserInterface.Systems.Guidebook;
-using Content.Shared._DV.Species; // DeltaV - Species hider
-using Content.Shared.Body;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
@@ -22,13 +19,8 @@ using Robust.Shared.ContentPack;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
 using Direction = Robust.Shared.Maths.Direction;
-// Begin CD - Character Records
-using System.Globalization;
-using Content.Client._CD.Records.UI;
-using Content.Shared._CD.Records;
-// End CD - Character Records
-using Content.Shared._DV.Traits;
-using Content.Shared.Humanoid.Prototypes; // DV - Traits
+using Content.Client._CD.Records.UI; // CD - Character Records
+using Content.Shared._DV.Body.Systems; // DV - Traits
 
 namespace Content.Client.Lobby.UI
 {
@@ -221,34 +213,18 @@ namespace Content.Client.Lobby.UI
             // Begin CD - Character Records
             #region CDHeight
 
-            CDHeight.OnTextChanged += args =>
-            {
-                if (Profile is null || !float.TryParse(args.Text, out var newHeight))
-                    return;
-
-                var prototype = _prototypeManager.Index<SpeciesPrototype>(Profile.Species);
-                newHeight = MathF.Round(Math.Clamp(newHeight, prototype.MinHeight, prototype.MaxHeight), 2);
-
-                // The percentage between the start and end numbers, aka "inverse lerp"
-                var sliderPercent = (newHeight - prototype.MinHeight) /
-                                    (prototype.MaxHeight - prototype.MinHeight);
-                CDHeightSlider.Value = sliderPercent;
-
-                SetProfileHeight(newHeight);
-            };
-
-            CDHeightReset.OnPressed += _ =>
-            {
-                CDHeight.SetText(_defaultHeight.ToString(CultureInfo.InvariantCulture), true);
-            };
-
             CDHeightSlider.OnValueChanged += _ =>
             {
                 if (Profile is null)
                     return;
-                var prototype = _prototypeManager.Index<SpeciesPrototype>(Profile.Species);
+
+                var prototype = _prototypeManager.Index(Profile.Species);
                 var newHeight = MathF.Round(MathHelper.Lerp(prototype.MinHeight, prototype.MaxHeight, CDHeightSlider.Value), 2);
-                CDHeight.Text = newHeight.ToString(CultureInfo.InvariantCulture);
+
+                var speciesScale = prototype.BaseScale.Y;
+
+                CDHeightLabel.Text = UnitConversion.GetMetricAndImperialDisplayFromScale(newHeight * speciesScale);
+                CDPullSpeedReductionLabel.Text = SmallCharacterSystem.GetPullSpeedPenaltyDisplayFromScale(newHeight);
                 SetProfileHeight(newHeight);
             };
 
diff --git a/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml b/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml
index a952accd81d..2c157b97559 100644
--- a/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml
+++ b/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml
@@ -49,11 +49,6 @@
                                 <Control HorizontalExpand="True" />
                                 <Label Name="RecordContainerSpecies" Align="Right" />
                             </BoxContainer>
-                            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
-                                <Label Text="{Loc 'humanoid-profile-editor-cd-records-height'}"/>
-                                <Control HorizontalExpand="True" />
-                                <Label Name="RecordContainerHeight" Align="Right" />
-                            </BoxContainer>
                             <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
                                 <Label Text="{Loc 'humanoid-profile-editor-cd-records-weight'}"/>
                                 <Control HorizontalExpand="True" />
diff --git a/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml.cs b/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml.cs
index dd6dafd0fbd..4a822a1d595 100644
--- a/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml.cs
+++ b/Content.Client/_CD/Records/UI/CharacterRecordViewer.xaml.cs
@@ -325,8 +325,7 @@ public sealed partial class CharacterRecordViewer : FancyWindow
         RecordContainerJob.Text = record.JobTitle; /* At some point in the future we might want to display the icon */
         RecordContainerGender.Text = record.Gender.ToString();
         RecordContainerSpecies.Text = record.Species;
-        RecordContainerHeight.Text = cr.Height + " " + UnitConversion.GetImperialDisplayLength(cr.Height);
-        RecordContainerWeight.Text = cr.Weight + " " + UnitConversion.GetImperialDisplayMass(cr.Weight);
+        RecordContainerWeight.Text = $"{cr.Weight} ({UnitConversion.GetImperialDisplayMass(cr.Weight)})";
         RecordContainerContactName.SetValue(cr.EmergencyContactName);
 
         RecordContainerEmployment.Visible = false;
diff --git a/Content.Client/_CD/Records/UI/RecordEditorGui.xaml b/Content.Client/_CD/Records/UI/RecordEditorGui.xaml
index ef1b6e2135c..fe99a0b5a82 100644
--- a/Content.Client/_CD/Records/UI/RecordEditorGui.xaml
+++ b/Content.Client/_CD/Records/UI/RecordEditorGui.xaml
@@ -5,12 +5,6 @@
              <BoxContainer Orientation="Vertical" HorizontalExpand="True" Margin="10">
                  <!-- Height, Weight -->
                  <GridContainer Columns="2">
-                     <BoxContainer HorizontalExpand="True" SeparationOverride="2">
-                         <Label Text="{Loc 'humanoid-profile-editor-cd-records-height'}" />
-                         <Control HorizontalExpand="True" MinSize="5 0" />
-                         <LineEdit Name="HeightEdit" HorizontalAlignment="Right" MinSize="60 0" />
-                         <Label Name="HeightImperialLabel" MinWidth="60" />
-                     </BoxContainer>
                      <BoxContainer HorizontalExpand="True" SeparationOverride="2">
                          <Label Text="{Loc 'humanoid-profile-editor-cd-records-weight'}" />
                          <Control HorizontalExpand="True" MinSize="5 0" />
diff --git a/Content.Client/_CD/Records/UI/RecordEditorGui.xaml.cs b/Content.Client/_CD/Records/UI/RecordEditorGui.xaml.cs
index f360a206239..bd0ee1b8728 100644
--- a/Content.Client/_CD/Records/UI/RecordEditorGui.xaml.cs
+++ b/Content.Client/_CD/Records/UI/RecordEditorGui.xaml.cs
@@ -25,14 +25,6 @@ public sealed partial class RecordEditorGui : Control
 
         #region General
 
-        HeightEdit.OnTextChanged += args =>
-        {
-            if (!int.TryParse(args.Text, out var newHeight))
-                return;
-            UpdateImperialHeight(newHeight);
-            UpdateRecords(_records.WithHeight(newHeight));
-        };
-
         WeightEdit.OnTextChanged += args =>
         {
             if (!int.TryParse(args.Text, out var newWeight))
@@ -128,8 +120,6 @@ public sealed partial class RecordEditorGui : Control
 
     private void UpdateWidgets()
     {
-        HeightEdit.SetText(_records.Height.ToString());
-        UpdateImperialHeight(_records.Height);
         WeightEdit.SetText(_records.Weight.ToString());
         UpdateImperialWeight(_records.Weight);
         ContactNameEdit.SetText(_records.EmergencyContactName);
@@ -143,13 +133,8 @@ public sealed partial class RecordEditorGui : Control
         PostmortemEdit.SetText(_records.PostmortemInstructions);
     }
 
-    private void UpdateImperialHeight(int newHeight)
-    {
-        HeightImperialLabel.Text = UnitConversion.GetImperialDisplayLength(newHeight);
-    }
-
     private void UpdateImperialWeight(int newWeight)
     {
-        WeightImperialLabel.Text = UnitConversion.GetImperialDisplayMass(newWeight);
+        WeightImperialLabel.Text = $"({UnitConversion.GetImperialDisplayMass(newWeight)})";
     }
 }
diff --git a/Content.Client/_CD/Records/UI/UnitConversion.cs b/Content.Client/_CD/Records/UI/UnitConversion.cs
index 239ec6937e0..9f743b7d870 100644
--- a/Content.Client/_CD/Records/UI/UnitConversion.cs
+++ b/Content.Client/_CD/Records/UI/UnitConversion.cs
@@ -2,15 +2,47 @@ namespace Content.Client._CD.Records.UI;
 
 public static class UnitConversion
 {
+    /// <summary>
+    /// DeltaV - The average height of a human in centimeters. According to the US CDC, its
+    /// 171 for men and 160 for women. So average of that is ~165cm.
+    /// 
+    /// Just kidding, we're going with EE's arbitrary standard of 175cm.
+    /// </summary>
+    private const int AVERAGE_HEIGHT_CM = 175;
+
+    /// <summary>
+    /// DeltaV - 1.0 scale is considered average for humans, so a scale of 1 will be 175cm.
+    /// Ensure that scale also includes the base species height AND the user-defined height.
+    /// </summary>
+    /// <param name="scale"></param>
+    /// <returns></returns>
+    private static int GetMetricHeightFromScale(float scale = 1)
+    {
+        // cast as int because we don't care about decimal
+        return (int)Math.Max(scale * AVERAGE_HEIGHT_CM, 1); // can't be shorter than 1cm I guess
+    }
+
+    /// <summary>
+    /// DeltaV - Gets nicely formatted string that contains both metric and imperial measurements.
+    /// With a scale of 1, it should look like... 175cm (5' 9")
+    /// </summary>
+    /// <param name="scale"></param>
+    /// <returns></returns>
+    public static string GetMetricAndImperialDisplayFromScale(float scale = 1)
+    {
+        var metricHeight = GetMetricHeightFromScale(scale);
+        return $"{metricHeight}cm ({GetImperialDisplayLength(metricHeight)})";
+    }
+
     public static string GetImperialDisplayLength(int lengthCm)
     {
-        var heightIn = (int) Math.Round(lengthCm * 0.3937007874 /* cm to in*/);
-        return $"({heightIn / 12}'{heightIn % 12}'')";
+        var heightIn = (int)Math.Round(lengthCm * 0.3937007874 /* cm to in*/);
+        return $"{heightIn / 12}'{heightIn % 12}\"";
     }
 
     public static string GetImperialDisplayMass(int massKg)
     {
-        var weightLbs = (int) Math.Round(massKg * 2.2046226218 /* kg to lbs */);
-        return $"({weightLbs} lbs)";
+        var weightLbs = (int)Math.Round(massKg * 2.2046226218 /* kg to lbs */);
+        return $"{weightLbs} lbs";
     }
 }
diff --git a/Content.Client/_DV/Overlays/DarkVisionOverlay.cs b/Content.Client/_DV/Overlays/DarkVisionOverlay.cs
new file mode 100644
index 00000000000..1a29215ffbf
--- /dev/null
+++ b/Content.Client/_DV/Overlays/DarkVisionOverlay.cs
@@ -0,0 +1,104 @@
+using System.Numerics;
+using Content.Client.Graphics;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._DV.Overlays;
+
+/// <summary>
+/// Makes darkness visible, and bright lights painfully visible
+/// Tweakable. Algo is max((light*gain)^exp, lightFloor)
+/// </summary>
+public sealed class DarkVisionOverlay : Overlay
+{
+    [Dependency] private readonly IClyde _clyde = default!;
+    [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowWorld;
+
+    private readonly ProtoId<ShaderPrototype> _shaderProto = "DarkVision";
+
+    public float LightFloor = 0.5f;
+    public float LightGain = 2f;
+    public float LightExp = 1f;
+
+    private readonly ShaderInstance _copyShader;
+    private readonly ShaderInstance _remapShader;
+    private readonly OverlayResourceCache<CachedResources> _resources = new();
+
+    public DarkVisionOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+
+        var proto = _prototype.Index<ShaderPrototype>(_shaderProto);
+        _remapShader = proto.InstanceUnique();
+        // With floor 0, gain 1, exp 1 the shader is an exact blend-mode-none copy.
+        _copyShader = proto.InstanceUnique();
+        _copyShader.SetParameter("lightFloor", 0f);
+        _copyShader.SetParameter("lightGain", 1f);
+        _copyShader.SetParameter("lightExp", 1f);
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var viewport = args.Viewport;
+        var worldHandle = args.WorldHandle;
+
+        if (viewport.Eye == null)
+            return;
+
+        var lightTarget = viewport.LightRenderTarget;
+        var res = _resources.GetForViewport(viewport, static _ => new CachedResources());
+
+        if (res.ScratchTarget?.Size != lightTarget.Size)
+        {
+            res.ScratchTarget?.Dispose();
+            res.ScratchTarget = _clyde.CreateLightRenderTarget(lightTarget.Size, "darkvision-scratch", depthStencil: false);
+        }
+
+        var bounds = args.WorldBounds;
+        var lightScale = lightTarget.Size / (Vector2) viewport.Size;
+        var scale = viewport.RenderScale / (Vector2.One / lightScale);
+        var localMatrix = lightTarget.GetWorldToLocalMatrix(viewport.Eye, scale);
+
+        // Copy the light buffer aside first: a texture can't be sampled while it is also the
+        // render target being drawn into.
+        worldHandle.RenderInRenderTarget(res.ScratchTarget, () =>
+        {
+            worldHandle.UseShader(_copyShader);
+            worldHandle.SetTransform(localMatrix);
+            worldHandle.DrawTextureRect(lightTarget.Texture, bounds);
+            worldHandle.UseShader(null);
+        }, Color.Black);
+
+        // Then write it back through the remap.
+        _remapShader.SetParameter("lightFloor", LightFloor);
+        _remapShader.SetParameter("lightGain", LightGain);
+        _remapShader.SetParameter("lightExp", LightExp);
+        worldHandle.RenderInRenderTarget(lightTarget, () =>
+        {
+            worldHandle.UseShader(_remapShader);
+            worldHandle.SetTransform(localMatrix);
+            worldHandle.DrawTextureRect(res.ScratchTarget.Texture, bounds);
+            worldHandle.UseShader(null);
+        }, null);
+    }
+
+    protected override void DisposeBehavior()
+    {
+        _resources.Dispose();
+
+        base.DisposeBehavior();
+    }
+
+    private sealed class CachedResources : IDisposable
+    {
+        public IRenderTexture? ScratchTarget;
+
+        public void Dispose()
+        {
+            ScratchTarget?.Dispose();
+        }
+    }
+}
diff --git a/Content.Client/_DV/Overlays/DarkVisionSystem.cs b/Content.Client/_DV/Overlays/DarkVisionSystem.cs
new file mode 100644
index 00000000000..835156e8595
--- /dev/null
+++ b/Content.Client/_DV/Overlays/DarkVisionSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared._DV.Overlays.Components;
+using Robust.Client.Graphics;
+using Robust.Shared.Player;
+
+namespace Content.Client._DV.Overlays;
+
+public sealed class DarkVisionSystem : EntitySystem
+{
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
+
+    private DarkVisionOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DarkVisionComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<DarkVisionComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<DarkVisionComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DarkVisionComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        _overlay = new();
+    }
+
+    private void OnInit(Entity<DarkVisionComponent> ent, ref ComponentInit args)
+    {
+        if (ent.Owner == _playerMan.LocalEntity)
+            EnableOverlay(ent.Comp);
+    }
+
+    private void OnShutdown(Entity<DarkVisionComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Owner == _playerMan.LocalEntity)
+            _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnPlayerAttached(Entity<DarkVisionComponent> ent, ref LocalPlayerAttachedEvent args)
+    {
+        EnableOverlay(ent.Comp);
+    }
+
+    private void OnPlayerDetached(Entity<DarkVisionComponent> ent, ref LocalPlayerDetachedEvent args)
+    {
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void EnableOverlay(DarkVisionComponent comp)
+    {
+        _overlay.LightFloor = comp.LightFloor;
+        _overlay.LightGain = comp.LightGain;
+        _overlay.LightExp = comp.LightExp;
+        if (!_overlayMan.HasOverlay<DarkVisionOverlay>())
+            _overlayMan.AddOverlay(_overlay);
+    }
+}
diff --git a/Content.Server/_DV/NodeCrawl/NodeCrawlSystem.cs b/Content.Server/_DV/NodeCrawl/NodeCrawlSystem.cs
index 639ad34ca7a..9305f0ec34f 100644
--- a/Content.Server/_DV/NodeCrawl/NodeCrawlSystem.cs
+++ b/Content.Server/_DV/NodeCrawl/NodeCrawlSystem.cs
@@ -8,6 +8,7 @@ using Content.Server.NodeContainer.Nodes;
 using Content.Shared._DV.NodeCrawl;
 using Content.Shared.Atmos;
 using Content.Shared.NodeContainer;
+using Content.Shared.Polymorph;
 using Content.Shared.Zombies;
 using Robust.Shared.Reflection;
 using Robust.Shared.Utility;
@@ -30,6 +31,7 @@ public sealed class NodeCrawlSystem : SharedNodeCrawlSystem
         SubscribeLocalEvent<NodeCrawlerComponent, InhaleLocationEvent>(OnInhaleLocation);
         SubscribeLocalEvent<NodeCrawlerComponent, ExhaleLocationEvent>(OnExhaleLocation);
         SubscribeLocalEvent<NodeCrawlerComponent, AtmosExposedGetAirEvent>(OnGetAir);
+        SubscribeLocalEvent<NodeCrawlerComponent, PolymorphActionEvent>(OnPolymorph);
 
         SubscribeLocalEvent<NodeCrawlerComponent, EntityZombifiedEvent>(OnZombify);
     }
@@ -222,4 +224,15 @@ public sealed class NodeCrawlSystem : SharedNodeCrawlSystem
         ent.Comp.EnterDelay = ent.Comp.ZombieEnterDelay;
         Dirty(ent);
     }
+
+    /// <summary>
+    /// Exit on polymorph or else the entity's movement bugs out.
+    /// </summary>
+    /// <param name="ent"></param>
+    /// <param name="args"></param>
+    private void OnPolymorph(Entity<NodeCrawlerComponent> ent, ref PolymorphActionEvent args)
+    {
+        if (ent.Comp.Mover.HasValue)
+            ExitNodeCrawl(ent);
+    }
 }
diff --git a/Content.Server/_Starlight/ShadekinSystem.cs b/Content.Server/_Starlight/ShadekinSystem.cs
index 41d7acc9fce..50b4400e94a 100644
--- a/Content.Server/_Starlight/ShadekinSystem.cs
+++ b/Content.Server/_Starlight/ShadekinSystem.cs
@@ -19,6 +19,7 @@ using Content.Shared._Goobstation.Flashbang;
 using Content.Shared._Starlight.Flash.Components;
 using Content.Shared.Body.Components;
 using Content.Shared.Flash; // Delta V - Flash Work
+using Content.Shared._DV.Body.Components; // Delta V - Remove various comps related to breathing
 
 
 namespace Content.Server._Starlight;
@@ -68,6 +69,8 @@ public sealed class ShadekinSystem : EntitySystem
     {
         UpdateAlert(uid, component, (short)component.CurrentState);
         RemComp<InternalsComponent>(uid);
+        RemComp<RespiratorComponent>(uid);
+        RemComp<AffectedByCPRComponent>(uid); // No lungs = no CPR
     }
 
     private void OnEyeColorChange(EntityUid uid, ShadekinComponent component, EyeColorInitEvent args)
diff --git a/Content.Shared/Body/SharedVisualBodySystem.cs b/Content.Shared/Body/SharedVisualBodySystem.cs
index ca38c9fdddd..f544a111548 100644
--- a/Content.Shared/Body/SharedVisualBodySystem.cs
+++ b/Content.Shared/Body/SharedVisualBodySystem.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using System.Numerics;
-using Content.Shared._DV.Humanoid;
+using Content.Shared._DV.Humanoid; // DeltaV
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid;
-using Content.Shared.Sprite;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -18,7 +16,6 @@ public abstract partial class SharedVisualBodySystem : EntitySystem
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly MarkingManager _marking = default!;
     [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedScaleVisualsSystem _scaleVisualsSystem = default!;
 
     public override void Initialize()
     {
@@ -28,7 +25,6 @@ public abstract partial class SharedVisualBodySystem : EntitySystem
         SubscribeLocalEvent<VisualOrganMarkingsComponent, BodyRelayedEvent<OrganCopyAppearanceEvent>>(OnMarkingsOrganCopyAppearance);
         SubscribeLocalEvent<VisualOrganComponent, BodyRelayedEvent<ApplyOrganProfileDataEvent>>(OnVisualOrganApplyProfile);
         SubscribeLocalEvent<VisualOrganMarkingsComponent, BodyRelayedEvent<ApplyOrganMarkingsEvent>>(OnMarkingsOrganApplyMarkings);
-        SubscribeLocalEvent<HumanoidProfileComponent, ApplyOrganProfileDataEvent>(OnApplyOrganProfileData); // Delta V - Taking the solution from CD
 
         InitializeModifiers();
         InitializeInitial();
@@ -100,36 +96,9 @@ public abstract partial class SharedVisualBodySystem : EntitySystem
         if (!other.Layer.Equals(ent.Comp.Layer))
             return;
 
-        // Delta V - Begin Fix Height for Cloning
-        var height = other.Profile.Height;
-        if (TryComp<HumanoidProfileComponent>(args.Body.Owner, out var component))
-            ScaleBody((args.Body.Owner, component), height, height);
-        // Delta V - End
-
         SetOrganAppearance(ent, other.Data);
     }
 
-    // Delta V - BEGIN CD Solution
-    private void OnApplyOrganProfileData(Entity<HumanoidProfileComponent> entity, ref ApplyOrganProfileDataEvent args)
-    {
-        var speciesPrototype = _prototype.Index(entity.Comp.Species);
-        if (args.Base == null)
-            return;
-
-        var height = Math.Clamp(MathF.Round(args.Base.Value.Height, 2), speciesPrototype.MinHeight, speciesPrototype.MaxHeight);
-
-        ScaleBody(entity, speciesPrototype.ScaleHeight ? height : 1f, height);
-    }
-
-    private void ScaleBody(Entity<HumanoidProfileComponent> entity, float heightX, float heightY)
-    {
-        _scaleVisualsSystem.SetSpriteScale(
-            entity.Owner,
-            new Vector2(heightX, heightY)
-        );
-    }
-    // Delta V - END
-
 
     private void OnMarkingsOrganCopyAppearance(Entity<VisualOrganMarkingsComponent> ent, ref BodyRelayedEvent<OrganCopyAppearanceEvent> args)
     {
diff --git a/Content.Shared/Humanoid/HumanoidProfileSystem.cs b/Content.Shared/Humanoid/HumanoidProfileSystem.cs
index bc4f64d72a3..69062d89f27 100644
--- a/Content.Shared/Humanoid/HumanoidProfileSystem.cs
+++ b/Content.Shared/Humanoid/HumanoidProfileSystem.cs
@@ -1,7 +1,9 @@
+using System.Numerics; // DeltaV
 using Content.Shared.Examine;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Preferences;
+using Content.Shared.Sprite; // DeltaV
 using Robust.Shared.GameObjects.Components.Localization;
 using Robust.Shared.Prototypes;
 
@@ -11,6 +13,7 @@ public sealed class HumanoidProfileSystem : EntitySystem
 {
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly GrammarSystem _grammar = default!;
+    [Dependency] private readonly SharedScaleVisualsSystem _scale = default!; // DeltaV
 
     public override void Initialize()
     {
@@ -28,6 +31,7 @@ public sealed class HumanoidProfileSystem : EntitySystem
         ent.Comp.Age = profile.Age;
         ent.Comp.Species = profile.Species;
         ent.Comp.Sex = profile.Sex;
+        ent.Comp.Height = profile.Height; // DeltaV
         Dirty(ent);
 
         var sexChanged = new SexChangedEvent(ent.Comp.Sex, profile.Sex);
@@ -37,6 +41,15 @@ public sealed class HumanoidProfileSystem : EntitySystem
         {
             _grammar.SetGender((ent, grammar), profile.Gender);
         }
+
+        // START DeltaV - Apply profile/species size
+        // Assume 1.0 scale unless the original scale exists (blame Allulalo)
+        var scale = Vector2.One;
+        if (TryComp<ScaleVisualsComponent>(ent, out var scaledVisuals) && scaledVisuals.OriginalScale is { } originalScale)
+            scale = originalScale;
+
+        _scale.SetSpriteScale(ent, scale);
+        // END DeltaV
     }
 
     private void OnExamined(Entity<HumanoidProfileComponent> ent, ref ExaminedEvent args)
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index 2f2f1dd9bc5..c5bf83d13bb 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -1,3 +1,4 @@
+using System.Numerics; // DeltaV
 using Content.Shared.Body;
 using Content.Shared.Dataset;
 using Content.Shared.Humanoid.Markings;
@@ -111,7 +112,7 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// The base height scale for this species
     /// </summary>
     [DataField("baseScale")]
-    public System.Numerics.Vector2 BaseScale = new(1f, 1f);
+    public Vector2 BaseScale = new(1f, 1f);
     // End DV - CD Character Records shouldn't nuke species heights
 
     // Begin CD - Character Records
@@ -119,13 +120,13 @@ public sealed partial class SpeciesPrototype : IPrototype
     /// The minimum height for this species
     /// </summary>
     [DataField("minHeight")]
-    public float MinHeight = 0.9f; // DeltaV - less trolling with the heights
+    public float MinHeight = 0.8f; // DeltaV
 
     /// <summary>
     /// The maximum height for this species
     /// </summary>
     [DataField("maxHeight")]
-    public float MaxHeight = 1.1f; // DeltaV - less trolling with the heights
+    public float MaxHeight = 1.2f; // DeltaV
 
     /// <summary>
     /// The default height for this species
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 62aaae1e691..b2edab9945d 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -1,3 +1,5 @@
+using Content.Shared._DV.Body.Components; // DeltaV
+using Content.Shared._DV.Body.Systems; // DeltaV
 using Content.Shared._ST.Interaction; // Stellar - interaction particles
 using Content.Shared._Floof.OfferItem; // Floof
 using Content.Shared.ActionBlocker;
@@ -10,6 +12,7 @@ using Content.Shared.Database;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Humanoid; // DeltaV
 using Content.Shared.IdentityManagement;
 using Content.Shared.Input;
 using Content.Shared.Interaction;
@@ -55,6 +58,7 @@ public sealed class PullingSystem : EntitySystem
     [Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedVirtualItemSystem _virtual = default!;
+    [Dependency] private readonly SmallCharacterSystem _smallCharacter = default!; // DeltaV
 
     public override void Initialize()
     {
@@ -295,6 +299,14 @@ public sealed class PullingSystem : EntitySystem
 
     private void OnRefreshMovespeed(EntityUid uid, PullerComponent component, RefreshMovementSpeedModifiersEvent args)
     {
+        // BEGIN DeltaV - Slow if smaller puller
+        if (TryComp<SmallCharacterComponent>(uid, out var smol))
+        {
+            var sizePenalty = _smallCharacter.ApplyPullSpeedPenalty((uid, smol), component.Pulling);
+            args.ModifySpeed(sizePenalty, sizePenalty);
+        }
+        // END DeltaV
+
         if (TryComp<HeldSpeedModifierComponent>(component.Pulling, out var heldMoveSpeed) && component.Pulling.HasValue)
         {
             var (walkMod, sprintMod) =
diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
index 57b969c0cd7..bb5eae50f34 100644
--- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
+++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs
@@ -97,7 +97,7 @@ public sealed partial class ParcelWrappingSystem
         if (target == user)
         {
             var selfMsg = Loc.GetString("parcel-wrap-popup-being-wrapped-self");
-            _popup.PopupClient(selfMsg, user, user);
+            _popup.PopupEntity(selfMsg, user, user);
         }
         else
         {
@@ -143,7 +143,7 @@ public sealed partial class ParcelWrappingSystem
 
         // Spawn the actual parcel entity.
         var targetTransform = Transform(target);
-        var spawned = Spawn(GetParcelPrototype(wrapper, target), targetTransform.Coordinates);
+        var spawned = SpawnAtPosition(GetParcelPrototype(wrapper, target), targetTransform.Coordinates);
         _transform.SetLocalRotation(spawned, targetTransform.LocalRotation);
 
         // If the target is in a container, try to put the parcel in its place in the container.
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 121a06a6c38..63522a4bbe8 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -177,7 +177,7 @@ namespace Content.Shared.Preferences
             _traitPreferences = traitPreferences;
             _loadouts = loadouts;
             // Begin CD - Character Records
-            Height = height;
+            Height = height; // This is the user-set scale on the profile editor. Not actual height measurements.
             CDCharacterRecords = cdCharacterRecords;
             // End CD - Character Records
 
diff --git a/Content.Shared/Sprite/ScaleVisualsComponent.cs b/Content.Shared/Sprite/ScaleVisualsComponent.cs
index bf814736f74..9055d3e2add 100644
--- a/Content.Shared/Sprite/ScaleVisualsComponent.cs
+++ b/Content.Shared/Sprite/ScaleVisualsComponent.cs
@@ -25,11 +25,27 @@ public sealed partial class ScaleVisualsComponent : Component
     [ViewVariables]
     public Vector2? OriginalScale;
 
-    // Delta V Addition
     /// <summary>
-    /// Base Scale of the Species, which we use to set a new height relative to this.
+    /// DeltaV - Contains the species scale. Set dynamically by
+    /// baseScale in the Species prototype.
     /// </summary>
     [DataField, AutoNetworkedField]
     [ViewVariables]
-    public Vector2 SpeciesScale = Vector2.One;
+    public Vector2 SpeciesScale = new(1f, 1f);
+
+    /// <summary>
+    /// DeltaV - Contains the user-defined scale from the character creation
+    /// screen.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables]
+    public Vector2 ProfileScale = new(1f, 1f);
+
+    /// <summary>
+    /// DeltaV - Contains the computer scale from applying Scale, SpeciesScale, and ProfileScale.
+    /// This will contain the actual scale after all modifiers are applied.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    [ViewVariables]
+    public Vector2 ComputedScale;
 }
diff --git a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
index 5cb190497ab..2f619abf5c3 100644
--- a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
+++ b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs
@@ -1,4 +1,6 @@
 using System.Numerics;
+using Content.Shared.Humanoid; // DeltaV
+using Robust.Shared.Prototypes; // DeltaV
 using Robust.Shared.Serialization;
 
 namespace Content.Shared.Sprite;
@@ -6,6 +8,7 @@ namespace Content.Shared.Sprite;
 public abstract class SharedScaleVisualsSystem : EntitySystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!; // DeltaV
 
     public override void Initialize()
     {
@@ -39,15 +42,28 @@ public abstract class SharedScaleVisualsSystem : EntitySystem
     {
         var comp = EnsureComp<ScaleVisualsComponent>(uid);
         comp.Scale = scale;
+
+        // BEGIN DeltaV - Apply species and profile height
+        // We have to ensure this is idempotent so that if it gets applied more than once
+        // the sprite size at the end is the same.
+        if (TryComp<HumanoidProfileComponent>(uid, out var profile))
+        {
+            var speciesProto = _proto.Index(profile.Species);
+            comp.SpeciesScale = speciesProto.BaseScale;
+            scale *= comp.SpeciesScale; // Apply both species scale and character-defined height
+
+            Vector2 profileHeight = new(profile.Height, profile.Height);
+            comp.ProfileScale = profileHeight;
+            scale *= comp.ProfileScale;
+        }
+
+        comp.ComputedScale = scale; // Nice to know what the computed size is in case of bugs
+        // END DeltaV
+
         Dirty(uid, comp);
 
-        // Delta V - Begin Species Scaling
-        // 120% species scale => add 0.2 to scale
-        var newScale = scale + comp.SpeciesScale - Vector2.One;
-        // Delta V - End Species Scaling
-
         var appearanceComponent = EnsureComp<AppearanceComponent>(uid);
-        _appearance.SetData(uid, ScaleVisuals.Scale, newScale /* Delta V - Custom Species Scale */, appearanceComponent);
+        _appearance.SetData(uid, ScaleVisuals.Scale, scale, appearanceComponent);
 
         // Raise an event for content use.
         var ev = new ScaleEntityEvent(uid, scale);
diff --git a/Content.Shared/_DV/Body/Components/SmallCharacterComponent.cs b/Content.Shared/_DV/Body/Components/SmallCharacterComponent.cs
new file mode 100644
index 00000000000..625d03c20b5
--- /dev/null
+++ b/Content.Shared/_DV/Body/Components/SmallCharacterComponent.cs
@@ -0,0 +1,23 @@
+using Content.Shared._DV.Body.Systems;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Body.Components;
+
+/// <summary>
+/// If an entity has this, if a small character has penalties (such as pull speed),
+/// the small character will ignore the penalties associated with their size.
+///
+/// Mostly used for things like wheeled/floating objects.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+[Access(typeof(SmallCharacterSystem))]
+public sealed partial class SmallCharacterComponent : Component
+{
+    /// <summary>
+    /// The speed of which to scale the small character's pull speed by if the
+    /// object is big enough to warrant a pull-speed slowdown.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float PullSpeedPenalty = 1f;
+}
diff --git a/Content.Shared/_DV/Body/Components/UnaffectedBySizePenaltyComponent.cs b/Content.Shared/_DV/Body/Components/UnaffectedBySizePenaltyComponent.cs
new file mode 100644
index 00000000000..efdd68e8753
--- /dev/null
+++ b/Content.Shared/_DV/Body/Components/UnaffectedBySizePenaltyComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Shared._DV.Body.Components;
+
+/// <summary>
+/// If an entity has this, if a small character has penalties (such as pull speed),
+/// the small character will ignore the penalties associated with their size.
+///
+/// Mostly used for things like wheeled/floating objects.
+///
+/// See <see cref="Systems.SmallCharacterSystem"/>
+/// </summary>
+[RegisterComponent]
+public sealed partial class UnaffectedBySizePenaltyComponent : Component;
diff --git a/Content.Shared/_DV/Body/Systems/SmallCharacterSystem.cs b/Content.Shared/_DV/Body/Systems/SmallCharacterSystem.cs
new file mode 100644
index 00000000000..98e0b5d4a68
--- /dev/null
+++ b/Content.Shared/_DV/Body/Systems/SmallCharacterSystem.cs
@@ -0,0 +1,97 @@
+using Content.Shared._DV.Body.Components;
+using Content.Shared.GameTicking;
+using Content.Shared.Humanoid;
+using Content.Shared.Item;
+using JetBrains.Annotations;
+using Robust.Shared.Physics.Components;
+
+namespace Content.Shared._DV.Body.Systems;
+
+/// <summary>
+/// Used to relay or subscribe to events if a character's scale is 1.0 or below.
+/// This is only used for the height slider scale.
+/// </summary>
+public sealed partial class SmallCharacterSystem : EntitySystem
+{
+    private const float NO_PENALTY = 1.0f;
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnSpawn);
+    }
+
+    private void OnSpawn(PlayerSpawnCompleteEvent ev)
+    {
+        if (TryComp<HumanoidProfileComponent>(ev.Mob, out var profile))
+            ApplySmallCharacter(ev.Mob, profile.Height);
+    }
+
+    [PublicAPI]
+    public float ApplyPullSpeedPenalty(Entity<SmallCharacterComponent?> puller, EntityUid? pulledEntity)
+    {
+        // Ignore if they aren't pulling anything...
+        if (!pulledEntity.HasValue)
+            return NO_PENALTY;
+
+        // Ignore if they aren't a small character in the first place
+        if (!Resolve(puller, ref puller.Comp, false))
+            return NO_PENALTY;
+
+        // If the pulled entity has the component that ignores the penalty
+        if (HasComp<UnaffectedBySizePenaltyComponent>(pulledEntity))
+            return NO_PENALTY;
+
+        // Ignore if it's an item that can be held or stored. It would be weird to
+        // slow by X% from pulling a piece of paper or a gun when you can just hold it
+        // and not suffer from a penalty.
+        if (HasComp<ItemComponent>(pulledEntity))
+            return NO_PENALTY;
+
+        // Ignore if the object is floating in the air.
+        if (TryComp<PhysicsComponent>(pulledEntity, out var pulledPhysics)
+                && pulledPhysics.BodyStatus == BodyStatus.InAir)
+            return NO_PENALTY;
+
+        return puller.Comp.PullSpeedPenalty;
+    }
+
+    #region Static Members
+    /// <summary>
+    /// Gets the move-speed penalty as a float. Should be applied multiplicatively.
+    /// Caps at 1 so we don't make bigger characters faster when pulling.
+    /// </summary>
+    /// <returns></returns>
+    [PublicAPI]
+    public static float GetPullSpeedPenaltyFromScale(float scale = 1.0f)
+    {
+        return Math.Min(scale * scale, 1);
+    }
+
+    /// <summary>
+    /// Calculates a well-formed display string of the pull speed penalty.
+    /// Used primarily in the character editor to get the well-formed percent
+    /// without having to duplicate formulas.
+    /// </summary>
+    /// <param name="scale"></param>
+    /// <returns></returns>
+    [PublicAPI]
+    public static string GetPullSpeedPenaltyDisplayFromScale(float scale = 1.0f)
+    {
+        return $"{Math.Round((1 - GetPullSpeedPenaltyFromScale(scale)) * 100)}%";
+    }
+    #endregion
+
+    #region Private Members
+    private void ApplySmallCharacter(EntityUid uid, float scale = 1)
+    {
+        if (scale >= 1)
+            return;
+
+        // The character scale is stored in the HumanoidProfileComponent if you ever
+        // need it.
+        var comp = EnsureComp<SmallCharacterComponent>(uid);
+        comp.PullSpeedPenalty = GetPullSpeedPenaltyFromScale(scale);
+        Dirty(uid, comp);
+    }
+    #endregion
+}
diff --git a/Content.Shared/_DV/Light/SharedLightReactiveSystem.cs b/Content.Shared/_DV/Light/SharedLightReactiveSystem.cs
index 389a21fe4fa..2cddb4b20e3 100644
--- a/Content.Shared/_DV/Light/SharedLightReactiveSystem.cs
+++ b/Content.Shared/_DV/Light/SharedLightReactiveSystem.cs
@@ -70,13 +70,23 @@ public abstract class SharedLightReactiveSystem : EntitySystem
     /// Avoid calling this too often, as it can be expensive.
     /// </summary>
     public float GetLightLevelForPoint(EntityUid uid, TransformComponent? xform = null)
+    {
+        return GetLightLevelAtPosition(uid, _transform.GetWorldPosition(uid), xform);
+    }
+
+    /// <summary>
+    /// Gets the light level at an arbitrary world position, using <paramref name="uid"/> for the
+    /// light lookup and map resolution. Lets callers sample somewhere other than the entity's
+    /// centre — e.g. a point just outside a wall, so the wall's own body can occlude the ray.
+    /// Avoid calling this too often, as it can be expensive.
+    /// </summary>
+    public float GetLightLevelAtPosition(EntityUid uid, Vector2 pos, TransformComponent? xform = null)
     {
         float val = 0.0f;
         // Get the current map entity so we can get a MapLightComponent from it if it has one
         var map = _transform.GetMap((uid, xform));
         if (TryComp(map, out MapLightComponent? mapLight))
             val += (mapLight.AmbientLightColor.R + mapLight.AmbientLightColor.G + mapLight.AmbientLightColor.B) / 3f;
-        var pos = _transform.GetWorldPosition(uid);
 
         foreach (var (lightUid, lightComp) in GetLights(uid))
         {
diff --git a/Content.Shared/_DV/Overlays/Components/DarkVisionComponent.cs b/Content.Shared/_DV/Overlays/Components/DarkVisionComponent.cs
new file mode 100644
index 00000000000..3ddc961d1ff
--- /dev/null
+++ b/Content.Shared/_DV/Overlays/Components/DarkVisionComponent.cs
@@ -0,0 +1,30 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._DV.Overlays.Components;
+
+/// <summary>
+/// Gives the owner darkvision: lighting still renders, but total darkness is raised to
+/// <see cref="LightFloor"/> brightness instead of pitch black. Unlike night vision this keeps
+/// the whole lighting gradient visible, so creatures like the Skia can judge what is and isn't dark enough for them.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DarkVisionComponent : Component
+{
+    /// <summary>
+    /// Brightness that full darkness renders at, 0-1. Rendered light is clamped to a minimum of this value.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float LightFloor = 0.2f;
+
+    /// <summary>
+    /// Multiplier applied to actual light on top of the floor. Values above 1 overbrighten lit areas so they are unmistakable next to the grey darkness floor.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float LightGain = 8f;
+
+    /// <summary>
+    /// Exponent applied to lights, to make brighter areas look notably brighter
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float LightExp = 2f;
+}
diff --git a/Content.Shared/_DV/ShadowWalk/ShadowWalkerComponent.cs b/Content.Shared/_DV/ShadowWalk/ShadowWalkerComponent.cs
new file mode 100644
index 00000000000..689ad0aa555
--- /dev/null
+++ b/Content.Shared/_DV/ShadowWalk/ShadowWalkerComponent.cs
@@ -0,0 +1,36 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._DV.ShadowWalk;
+
+/// <summary>
+/// Lets this entity walk straight through solid static objects (walls, doors, windows...)
+/// while the entity itself is bathed in darkness (the same light level it heals in.)
+/// Mobs and projectiles always stay solid.
+/// <para>
+/// On collision, checks our light level. Objects we're stuck in are tagged in <see cref="PassableEntities"/>
+/// </para>
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ShadowWalkerComponent : Component
+{
+    /// <summary>
+    /// Light level below which an object counts as bathed in darkness.
+    /// If the entity has a <c>LightLevelHealthComponent</c> its DarkThreshold is used
+    ///   instead, so objects are passable exactly where the entity would heal.
+    /// </summary>
+    [DataField]
+    public float DarkThreshold = 0.3f;
+
+    /// <summary>
+    /// Objects we're currently in. Objects in this list are never solid until we fully leave.
+    /// </summary>
+    public HashSet<EntityUid> PassableEntities = new();
+
+    /// <summary>
+    /// Light level for this tick, to avoid re-calculating for more than one collision a tick.
+    /// </summary>
+    public GameTick LastLightCheckTick = GameTick.Zero;
+
+    public float LastLightLevel;
+}
diff --git a/Content.Shared/_DV/ShadowWalk/SharedShadowWalkSystem.cs b/Content.Shared/_DV/ShadowWalk/SharedShadowWalkSystem.cs
new file mode 100644
index 00000000000..5119175396d
--- /dev/null
+++ b/Content.Shared/_DV/ShadowWalk/SharedShadowWalkSystem.cs
@@ -0,0 +1,139 @@
+using Content.Shared._DV.Body;
+using Content.Shared._DV.Light;
+using Content.Shared.Projectiles;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._DV.ShadowWalk;
+
+/// <summary>
+/// Can walk through darkness freely.
+/// </summary>
+public sealed partial class SharedShadowWalkSystem : EntitySystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedLightReactiveSystem _lightReactive = default!;
+    [Dependency] private readonly SharedTransformSystem _transform = default!;
+
+    /// <summary>
+    /// How far outside a tagged object's AABB the walker's centre must be before the object is untagged (and so becomes solid again on the next collision).
+    /// At least the walker's collision radius, so an object is never made solid while it still overlaps the walker.
+    /// </summary>
+    private const float UnstickMargin = 0.45f;
+
+    /// <summary>
+    /// Gamefeel. Non-walls get a bigger unstick margin so they stay unstick even if you clip into a wall. Prevents getting stuck in walls.
+    /// </summary>
+    private const float MovableUnstickMargin = 1f;
+
+    private EntityQuery<LightLevelHealthComponent> _lightHealthQuery;
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private EntityQuery<ProjectileComponent> _projectileQuery;
+
+    private readonly List<EntityUid> _toRemove = [];
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _lightHealthQuery = GetEntityQuery<LightLevelHealthComponent>();
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+        _projectileQuery = GetEntityQuery<ProjectileComponent>();
+
+        SubscribeLocalEvent<ShadowWalkerComponent, PreventCollideEvent>(OnPreventCollide);
+    }
+
+    public override void Update(float frameTime)
+    {
+        var query = EntityQueryEnumerator<ShadowWalkerComponent>();
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.PassableEntities.Count == 0)
+                continue;
+
+            var worldPos = _transform.GetWorldPosition(uid);
+
+            _toRemove.Clear();
+            foreach (var other in comp.PassableEntities)
+            {
+                // Untag anything we've deleted or fully walked clear of; the next collision with it will re-check the light level from scratch.
+                if (Deleted(other))
+                {
+                    _toRemove.Add(other);
+                    continue;
+                }
+
+                var margin = UnstickMargin;
+                // Non-statics get a bigger margin :)
+                if (_physicsQuery.TryComp(other, out var body) && body.BodyType != BodyType.Static)
+                    margin += MovableUnstickMargin;
+
+                if (!_lookup.GetWorldAABB(other).Enlarged(margin).Contains(worldPos))
+                    _toRemove.Add(other);
+            }
+
+            foreach (var other in _toRemove)
+                comp.PassableEntities.Remove(other);
+        }
+    }
+
+    private void OnPreventCollide(Entity<ShadowWalkerComponent> ent, ref PreventCollideEvent args)
+    {
+        if (args.Cancelled)
+            return;
+
+        // Only phase through hard blockers; sensor fixtures must keep triggering.
+        if (!args.OurFixture.Hard || !args.OtherFixture.Hard)
+            return;
+
+        // Already phasing through this one: keep it passable until we've left it (pruned in
+        // Update), so a light change mid-overlap can never trap us inside it.
+        if (ent.Comp.PassableEntities.Contains(args.OtherEntity))
+        {
+            args.Cancelled = true;
+            return;
+        }
+
+        if (!CanPhaseThrough(args.OtherEntity, args.OtherBody))
+            return;
+
+        // A fresh collision: only phase if the walker itself is currently in darkness.
+        if (!InDarkness(ent))
+            return;
+
+        args.Cancelled = true;
+        ent.Comp.PassableEntities.Add(args.OtherEntity);
+    }
+
+    private bool CanPhaseThrough(EntityUid other, PhysicsComponent otherBody)
+    {
+        if (otherBody.BodyType == BodyType.KinematicController)
+            return false;
+        // Bullets never pass or hit based on collision timing.
+        if (_projectileQuery.HasComp(other))
+            return false;
+
+        return true;
+    }
+
+    private bool InDarkness(Entity<ShadowWalkerComponent> ent)
+    {
+        // Darkness is whatever the walker heals in, if it heals in darkness at all.
+        var threshold = _lightHealthQuery.TryComp(ent, out var lightHealth)
+            ? lightHealth.DarkThreshold
+            : ent.Comp.DarkThreshold;
+
+        var curTick = _timing.CurTick;
+        if (ent.Comp.LastLightCheckTick != curTick)
+        {
+            ent.Comp.LastLightLevel = _lightReactive.GetLightLevelForPoint(ent.Owner);
+            ent.Comp.LastLightCheckTick = curTick;
+        }
+
+        return ent.Comp.LastLightLevel < threshold;
+    }
+}
diff --git a/Resources/Audio/_DV/Voice/Gnome/attributions.yml b/Resources/Audio/_DV/Voice/Gnome/attributions.yml
new file mode 100644
index 00000000000..4d08041a84b
--- /dev/null
+++ b/Resources/Audio/_DV/Voice/Gnome/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["gnome_scream.ogg", "gnomedeath.ogg", "gnomelaugh.ogg", "gnome1.ogg"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Audio recorded by Cepelinas and edited by rebe83"
+  source: "https://github.com/DeltaV-Station/Delta-v/pull/6027"
diff --git a/Resources/Audio/_DV/Voice/Gnome/gnome1.ogg b/Resources/Audio/_DV/Voice/Gnome/gnome1.ogg
new file mode 100644
index 00000000000..fda2632a973
Binary files /dev/null and b/Resources/Audio/_DV/Voice/Gnome/gnome1.ogg differ
diff --git a/Resources/Audio/_DV/Voice/Gnome/gnomedeath.ogg b/Resources/Audio/_DV/Voice/Gnome/gnomedeath.ogg
new file mode 100644
index 00000000000..e5152813be8
Binary files /dev/null and b/Resources/Audio/_DV/Voice/Gnome/gnomedeath.ogg differ
diff --git a/Resources/Audio/_DV/Voice/Gnome/gnomelaugh.ogg b/Resources/Audio/_DV/Voice/Gnome/gnomelaugh.ogg
new file mode 100644
index 00000000000..40120aa2c98
Binary files /dev/null and b/Resources/Audio/_DV/Voice/Gnome/gnomelaugh.ogg differ
diff --git a/Resources/Audio/_DV/Voice/Gnome/gnomescream.ogg b/Resources/Audio/_DV/Voice/Gnome/gnomescream.ogg
new file mode 100644
index 00000000000..3f068a2f2b1
Binary files /dev/null and b/Resources/Audio/_DV/Voice/Gnome/gnomescream.ogg differ
diff --git a/Resources/Changelog/DeltaVAdmin.yml b/Resources/Changelog/DeltaVAdmin.yml
index 8989b8270fc..15cd7128617 100644
--- a/Resources/Changelog/DeltaVAdmin.yml
+++ b/Resources/Changelog/DeltaVAdmin.yml
@@ -356,5 +356,12 @@ Entries:
   id: 39
   time: '2026-07-24T17:27:48.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6351
+- author: ShepardToTheStars
+  changes:
+  - message: Curators, get off your lazy asses and help out the newbies.
+    type: Tweak
+  id: 40
+  time: '2026-08-09T18:14:15.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6374
 Name: DeltaVAdmin
 Order: 5
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index 32c12ac366c..efa1a2199f1 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,159 +1,4 @@
 Entries:
-- author: Halo3moth
-  changes:
-  - message: Security long coats have been resprited to be more in line with other
-      security gear. (we ran out of red dye)
-    type: Tweak
-  id: 2104
-  time: '2026-01-27T05:50:41.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5288
-- author: EmberAstra
-  changes:
-  - message: Plasteel can now be printed at the Engineering Techfab.
-    type: Add
-  id: 2105
-  time: '2026-01-27T16:05:20.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5284
-- author: Pharaz4
-  changes:
-  - message: Wizard has been disabled pending a balance update.
-    type: Remove
-  id: 2106
-  time: '2026-01-27T17:55:11.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5228
-- author: Toby222
-  changes:
-  - message: Prevented the plasteel market from crashing and burning.
-    type: Fix
-  id: 2107
-  time: '2026-01-27T18:58:24.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5298
-- author: BarryNorfolk
-  changes:
-  - message: Upstream's November updates are here!
-    type: Add
-  - message: Xenoborgs have arrived in DeltaV. Please report any foriegn borgs to
-      security!
-    type: Add
-  - message: APCs now trip when they are under high load.
-    type: Add
-  - message: Traitors can now find the iconic Mini Energy Crossbow in their uplink
-      for 5 TC.
-    type: Add
-  - message: Attorneys can find a new briefcase gun in their uplink.
-    type: Add
-  - message: Defibs will shock anyone interacting with the patient other than the
-      person using the defib.
-    type: Tweak
-  - message: Added mail cart.
-    type: Add
-  - message: Tourniquets can now fit in medical belts.
-    type: Tweak
-  - message: Make DAGD more likely but restrict it to 1 traitor per round.
-    type: Tweak
-  id: 2108
-  time: '2026-01-29T16:56:03.499291+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5087
-- author: Pharaz4
-  changes:
-  - message: Lizards now get hardsuit tails
-    type: Add
-  id: 2109
-  time: '2026-01-29T16:55:44.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5293
-- author: Pharaz4
-  changes:
-  - message: removed syndicate comms from refugees and guards
-    type: Remove
-  id: 2110
-  time: '2026-01-29T17:25:06.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5280
-- author: Toby222, PureBreadBagel
-  changes:
-  - message: Added the ability to see if a patient is uncloneable via the Health Analyzer!
-    type: Add
-  - message: Medical doctor and Cloning entries have been changed to reflect the new
-      uncloneable trait, as uncloneable and unrevivable are no longer the same.
-    type: Tweak
-  id: 2111
-  time: '2026-01-30T16:18:07.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5310
-- author: ShepardToTheStars
-  changes:
-  - message: The uncloneable alert in the health analyzer window only shows up when
-      its relevant (i.e. when the patient is dead).
-    type: Tweak
-  id: 2112
-  time: '2026-01-30T21:11:56.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5330
-- author: verybigman311
-  changes:
-  - message: Wielding a guitar should no longer turn it invisible in your hands.
-    type: Fix
-  id: 2113
-  time: '2026-02-01T19:29:59.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5331
-- author: verybigman311
-  changes:
-  - message: The Brigmed beret is now avaliable in the Corpsman loadout.
-    type: Add
-  id: 2114
-  time: '2026-02-01T19:30:27.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5333
-- author: keekee38
-  changes:
-  - message: modified the bandolier slightly, and added a recipe for it in the sec
-      techfab
-    type: Tweak
-  id: 2115
-  time: '2026-02-01T19:32:36.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5313
-- author: Pharaz4
-  changes:
-  - message: Changed the mapped enabled pumps from 310 to 300 kPa
-    type: Tweak
-  id: 2116
-  time: '2026-02-01T19:34:53.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5336
-- author: makyo
-  changes:
-  - message: Rodentia! Now your sneak action has an icon showing your sneak status.
-    type: Add
-  id: 2117
-  time: '2026-02-01T19:39:29.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5308
-- author: makyo
-  changes:
-  - message: Perma chefvends now get a few bowls!
-    type: Add
-  id: 2118
-  time: '2026-02-01T19:43:05.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5304
-- author: verybigman311
-  changes:
-  - message: Feroxi can now waggy their tails.
-    type: Add
-  id: 2119
-  time: '2026-02-02T17:56:08.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5319
-- author: Pharaz4
-  changes:
-  - message: Fixed harpy suits not displaying on some clothing.
-    type: Fix
-  - message: Added missing sprite for Lizards on multipe suits.
-    type: Add
-  - message: Removed upstream spawners from entity spawn panel.
-    type: Remove
-  id: 2120
-  time: '2026-02-05T20:04:40.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5325
-- author: Pharaz4
-  changes:
-  - message: Shoko improved!
-    type: Tweak
-  id: 2121
-  time: '2026-02-10T11:26:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/5334
 - author: MantasDab360
   changes:
   - message: Gas condenser now uses 2kW instead of 10 kW!
@@ -4365,4 +4210,177 @@
   id: 2604
   time: '2026-07-29T15:42:01.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/6376
+- author: ShepardToTheStars
+  changes:
+  - message: Remote Medical Tracking has been added to the Biochemical research tree
+      as a T3 technology. It allows you to print crew monitors and crew monitoring
+      server boards!
+    type: Add
+  - message: The crew monitoring crate from Logistics now requires medical access
+      to unlock instead of epistemics.
+    type: Tweak
+  id: 2605
+  time: '2026-07-30T17:30:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6272
+- author: ErhardSteinhauer, Stxcking
+  changes:
+  - message: 'Coming from Frontier: Added Construction Bags and Bag of Holding Variant
+      (T2) to the Engineering Techfab.'
+    type: Add
+  id: 2606
+  time: '2026-08-02T13:31:31.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/5846
+- author: TehFlaminTaco
+  changes:
+  - message: Removed Skia Ventcrawl
+    type: Remove
+  - message: Added Skia Shadowwalk
+    type: Add
+  - message: Replaced Skia NightVision with DarkVision
+    type: Tweak
+  id: 2607
+  time: '2026-08-03T02:45:12.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6346
+- author: ShepardToTheStars
+  changes:
+  - message: The height slider on your profile now shows actual height measurements.
+    type: Tweak
+  - message: Characters now have a +/- 20% scale in the character creator for all
+      species.
+    type: Tweak
+  - message: In exchange for being harder to click on, characters that are smaller
+      than average for their species have pull speed penalties while pulling for being
+      so small. This effects only items that are not held in-hand, not in the air,
+      and do not have wheels.
+    type: Tweak
+  - message: Slightly reduced the density of Ovinia so they aren't as dense as an
+      Oni.
+    type: Tweak
+  - message: Increased the density of Thaven to slightly less than a normal human
+      player.
+    type: Tweak
+  id: 2608
+  time: '2026-08-04T16:27:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6320
+- author: ShepardToTheStars
+  changes:
+  - message: Shadekin cannot receive CPR anymore due to them not breathing or having
+      lungs. They are still able to perform CPR.
+    type: Remove
+  - message: Shadekin should have an internal temperature now, so they can get cold
+      and hot.
+    type: Fix
+  id: 2609
+  time: '2026-08-04T16:41:14.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6381
+- author: ShepardToTheStars
+  changes:
+  - message: Fixed changelog saying Shadekin can't perform CPR. Shadekin can still
+      perform CPR, but cannot receive it (as it would do nothing for them).
+    type: Fix
+  id: 2610
+  time: '2026-08-04T21:49:19.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6395
+- author: Stxcking
+  changes:
+  - message: Mothroach and Mouse can emote again.
+    type: Fix
+  - message: Moproaches ghostrole can be raffled for properly now.
+    type: Fix
+  id: 2611
+  time: '2026-08-04T22:18:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6356
+- author: ShepardToTheStars
+  changes:
+  - message: Nuclear operatives and ninjas will now be correctly scaled.
+    type: Fix
+  id: 2612
+  time: '2026-08-07T16:51:25.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6398
+- author: ShepardToTheStars
+  changes:
+  - message: Parcel wrapping when buckled to a chair no longer will make you invisible
+      and uninteractable.
+    type: Fix
+  id: 2613
+  time: '2026-08-07T23:24:54.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6399
+- author: ShepardToTheStars
+  changes:
+  - message: Polymorphing/jaunting while ventcrawling will no longer break movement
+      for the polymorphed/jaunting player.
+    type: Fix
+  id: 2614
+  time: '2026-08-09T16:57:32.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6400
+- author: rebe83, cepelinas, ShepardtotheStars, einknusprigestoast, Sloppr
+  changes:
+  - message: Added gnomes! Remember to secure your valuables and be polite.
+    type: Add
+  - message: Added gnome hats, for when you butcher the gnome. This kills the gnome.
+    type: Add
+  - message: Gnome guidebook. All good gnomes know their fae laws! (They don't believe
+      in SOP)
+    type: Add
+  id: 2615
+  time: '2026-08-09T18:24:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6027
+- author: Coryler
+  changes:
+  - message: Harpy Wing Layers on Hardsuits
+    type: Fix
+  id: 2616
+  time: '2026-08-10T16:14:56.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6406
+- author: SumofThreeParts
+  changes:
+  - message: Universals are cheaper now.
+    type: Tweak
+  id: 2617
+  time: '2026-08-12T16:49:32.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6366
+- author: keekee38
+  changes:
+  - message: the cowboy crate now has 2 rifles, 2 ammo boxes, 2 hats, and 2 pairs
+      of boots
+    type: Tweak
+  id: 2618
+  time: '2026-08-12T17:05:32.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6363
+- author: sowelipililimute
+  changes:
+  - message: The set of ion laws has been refined to a smaller set of the best laws.
+    type: Tweak
+  id: 2619
+  time: '2026-08-12T17:34:12.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6390
+- author: ShepardToTheStars
+  changes:
+  - message: Fixed some visitor shuttles (e.g. Asakim, Interdyne Chemists, Syndie
+      Recruiter, etc) not spawning.
+    type: Fix
+  - message: There should roughly be 1.5x as many random shuttle events per round.
+    type: Tweak
+  - message: Slightly increased the chances of Asakim, LoneOp and SRN events to happen.
+    type: Tweak
+  - message: Asakim and Hitman shuttles are now more likely to appear during survival
+      rounds.
+    type: Tweak
+  id: 2620
+  time: '2026-08-13T01:17:04.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6401
+- author: ShepardToTheStars
+  changes:
+  - message: Onis should again be able to drink tea without getting poisoned.
+    type: Fix
+  id: 2621
+  time: '2026-08-13T15:01:47.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6409
+- author: Stop-Signs
+  changes:
+  - message: Cosmic Censer no longer mindwipes people who were not cultists.
+    type: Tweak
+  id: 2622
+  time: '2026-08-14T04:30:57.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/6414
 Order: 1
diff --git a/Resources/ConfigPresets/DeltaV/apoapsis.toml b/Resources/ConfigPresets/DeltaV/apoapsis.toml
index b638fed2db5..9971fcaa7b6 100644
--- a/Resources/ConfigPresets/DeltaV/apoapsis.toml
+++ b/Resources/ConfigPresets/DeltaV/apoapsis.toml
@@ -1,7 +1,10 @@
 [game]
-hostname         = "[EN][MRP] Delta-v (Ψ) | Apoapsis [US East 1]"
+hostname         = "[EN][MRP] Delta-V (Ψ) | Apoapsis [NA East 1]"
 soft_max_players = 100
 
+[adminlogs]
+server_name = "Apoapsis"
+
 [hub]
 tags = "lang:en-US,region:am_n_e,rp:med,no_tag_infer"
 
diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml
index 3139917c44f..00a512d75f3 100644
--- a/Resources/ConfigPresets/DeltaV/deltav.toml
+++ b/Resources/ConfigPresets/DeltaV/deltav.toml
@@ -108,6 +108,7 @@ time = 600
 
 [chat]
 max_announcement_length = 512
+rate_limit_announce_admins_delay = -1
 
 [audio]
 attenuation = 4 # inversedistanceclamped 1 << 2, see audioparams.cs
diff --git a/Resources/ConfigPresets/DeltaV/horizon.toml b/Resources/ConfigPresets/DeltaV/horizon.toml
index 8dd1dd0e12d..c006ad03b8c 100644
--- a/Resources/ConfigPresets/DeltaV/horizon.toml
+++ b/Resources/ConfigPresets/DeltaV/horizon.toml
@@ -1,7 +1,10 @@
 [game]
-hostname           = "[EN][MRP] Delta-v (Ψ) | Horizon [US East 3]"
+hostname           = "[EN][MRP] Delta-V (Ψ) | Horizon [NA East 3]"
 soft_max_players   = 80
 
+[adminlogs]
+server_name = "Horizon"
+
 [vote]
 preset_enabled = true
 map_enabled = true
diff --git a/Resources/ConfigPresets/DeltaV/inclination.toml b/Resources/ConfigPresets/DeltaV/inclination.toml
index 3a0e69a964f..c8d124191ee 100644
--- a/Resources/ConfigPresets/DeltaV/inclination.toml
+++ b/Resources/ConfigPresets/DeltaV/inclination.toml
@@ -1,7 +1,10 @@
 [game]
-hostname         = "[EN][MRP] Delta-v (Ψ) | Inclination [EU West]"
+hostname         = "[EN][MRP] Delta-V (Ψ) | Inclination [EU West]"
 soft_max_players = 50
 
+[adminlogs]
+server_name = "Inclination"
+
 [server]
 rules_file   = "DeltaVRuleset"
 
diff --git a/Resources/ConfigPresets/DeltaV/meridian.toml b/Resources/ConfigPresets/DeltaV/meridian.toml
index 7ae7449e87f..35b96cb5c95 100644
--- a/Resources/ConfigPresets/DeltaV/meridian.toml
+++ b/Resources/ConfigPresets/DeltaV/meridian.toml
@@ -1,7 +1,10 @@
 [game]
-hostname         = "[EN][MRP] Delta-v (Ψ) | Meridian [EU West]"
+hostname         = "[EN][MRP] Delta-V (Ψ) | Meridian [EU West]"
 soft_max_players = 40
 
+[adminlogs]
+server_name = "Meridian"
+
 [hub]
 tags = "lang:en-US,region:eu_w,rp:med,no_tag_infer"
 
diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml
index 9a6693a802e..7ba4e21bcfa 100644
--- a/Resources/ConfigPresets/DeltaV/periapsis.toml
+++ b/Resources/ConfigPresets/DeltaV/periapsis.toml
@@ -1,10 +1,14 @@
 [game]
-hostname           = "[EN][MRP] Delta-v (Ψ) | Periapsis [US East 2]"
+hostname           = "[EN][MRP] Delta-V (Ψ) | Periapsis [NA East 2]"
 soft_max_players   = 60
 desc = """\
 A medium roleplay fork based around the mysterious Noösphere, featuring unique content, custom maps, new species and a revamped science department.\
 This server focuses on calmer shifts.\
 """
+fallbackpreset = "Extended"
+
+[adminlogs]
+server_name = "Periapsis"
 
 [vote]
 preset_enabled = true
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index 63b5ed3d7f6..b325bf38f24 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0-Anon, 0leshe, 0tito, 0vrseer, 0x6273, 11belowstudio, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, A111Vojta, Ablankmann, abregado, Absolute-Potato, Absotively, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, AeraAuling, Aerocrux, Aeshus, Aexolott, Aexxie, AffleWaffle, africalimedrop, afrokada, AftrLite, agentsmithradio, Agoichi, ahandleman, Ahion, aiden, Aidenkrz, aidenkrz, Aikakakah, AirlineFood001, Aisu9, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, AlgisAlphonse, Alithsko, alliephante, ALMv1, Alpaccalypse, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Androclast, anri, Anzarot121, Apachit0, Apersos-coll, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, arcanevaliance, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, ArionGekkota, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AshBats, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, Atakku, Ataman, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, AveriV2, avghdev, Awlod, Axionyxx, azzy, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, bebr3ght, beck-thompson, Bellwether, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bigfootbravo, bigmaxporter, BIGZi0348, binbagg, bingojohnson, BismarckShuffle, Bixkitts, Blackdutchie, Blackern5000, Blazeror, BlitzTheSquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, BombasterDS, BombasterDS2, Bonktrauma, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, BoxfulOfSoup, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, Bribrooo, brndd, bryce0110, BubblegumBlue, buletsponge, bunglesnortboss, buntobaggins, burzah, buunie099, bvelliquette, BWTCK, byondfuckery, byte-hammer, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Calis007, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, CarolCuchara, Carolyn3114, Carou02, carteblanche4me, catdotjs, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Cepelinas1, Chaboricks, chairbender, chaisftw, chamomileteatime, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clusterfack, clyf, Clyybber, CMDR-Piboy314, cmorley191, cnv41, coco, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, Coolgamer06, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, Coryler, CrafterKolyan, CraftyRenter, crazybrain23, CrazyPhantom779, creadth, CrigCrag, CrimsonAnnie, CroilBird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DaCookieCakes, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkie, DaturoDewitt, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathninja5551, deathride58, debug, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, dimmoon1, DinnerCalzone, dinnercalzone, DinoWattz, Dirius77, Disp-Dev, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorFeels, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Eagle0600, Easypoller, echo, EchoOfNothing, eclips_e, eden077, EEASAS, Efruit, efzapa, einknusprigestoast, ElectroSR, elpersonn, elsie, elthundercloud, ElusiveCoin, Elysium206, EmberAstra, emberwinters, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, Ertanic, esguard, estacaoespacialpirata, Eternally-Confused, eugene, Exile152, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, falcon, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxcurl, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Fruitsalad, FryOfDestiny, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gavreau, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, git-kanbaru, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, gluesniffler, GnarpGnarp, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, golubgik, Golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GrownSamoyedDog, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Halo3moth, Haltell, hamey, HameyTychol, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, Hayden, he1acdvv, Hebi, Helix-ctrl, Helm4142, Henry, HerCoyote23, HeyBanditoz, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, HTMLSystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperbeast43, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IAmNotGray, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iesteed, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, IRSMsoso, itsmethom, Itzbenz, iztokbajcar, J0w03L, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jackw2As, jacob, Jae, jamessimo, janekvap-havok, Jark255, Jaskanbe, JasperJRoth, JCGWE30, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, jessiscah23, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, jimbobby-the-FUCKING-first, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, joe, JohnGinnane, JohnJJohn, johnjjohn, JohnKieser, johnku1, JokeCam, Jophire, Jopogrechkin, joshepvodka, jproads, JrInventor05, Jrpl, jtbill123, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, JustTNE, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, kara, KashRas2, katie, katzenminer, kbailey-git, keekee38, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KeTuFaisPiKiNut, Khaomi, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kipdotnet, kira-er, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KitGit001, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, Kr8art, KrasnoshchekovPavel, kresny, Krosus777, Krunklehorn, Kryyto, Kukutis96513, Kupie, Kurzaen, kushbreth, kxvvv, Kyoth25f, kyupolaris, kzhanik, KZhProgram, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, Le-Arctic-Fox, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkuyx, LioValkyria, Litraxx, little-meow-meow, LittleBuilderJane, LittleNyanCat, lizelive, ljm862, lleftTheDragon, lmsnoise, localcc, lokachop, lolman360, lomcastar, Lonestar827, Lordbrandon12, LordCarve, LordEclipse, lordsugarcane, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, luminight, lunarcomets, luringens, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lyxcaster, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnnusson, magnuscrowe, makyo, malchanceux, Malfaltto, MaloTV, manelnavola, ManelNavola, Mangohydra, MantasDab360, ManuDemoen, marboww, marigauge, Markek1, MarkerWicker, marlyn, martin69420, mastermiller01, matt, Matz05, max, MaxNox7, maylokana, Mazie, mazzie, mdrkrg, MDuch369, meara1179, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, michaelsshaw, micheel665, mifia, mikeysaurus, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, mish, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, mnva0, moderatelyaware, modern-nm, mohamedwidar, mokiros, MolpeTheSeiren, momo, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, moses, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, muonpoly, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, myra, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neborsh, nekokiwa, neomoth, neutrino-laser, NickPowers43, nicosgf64, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nlaky, nmajask, noctyrnal, NoElkaTheGod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, NoreUhh, Not-A-Chair, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, ocotheomega, OctoRocket, Ohelig, OldDanceJacket, ollyoaner, onesch, OnsenCapy, OnyxTheBrave, opl-, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, Oxdeception, packmore, PAFFhassoocks, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, PathOwOgen, patrikturi, PaulRitter, pavlockblaine03, pcaessayrs, peccneck, Penjuinsocks, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, Pharaz4, PHCodes, pheenty, philingham, Phill101, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, Pixel8-dev, pixelkingliam, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, pootslap, PopGamer45, portfiend, Possumongus, potato1234x, PotentiallyTom, PPooch, pre-commit-ci[bot], Princess-Cheeseballs, ProfanedBane, Prole0, ProPandaBear, ProPeperos, Proxysseia, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PureBreadBagel, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quanteey, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, rebaserHEAD, rebe83, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, Redrover1760, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, riley, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, robinthegirlthing, robobozu, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, roryflowers, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, SabreML, Sadie-silly, saga3152, saintmuntzer, salarua, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, ScyronX, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, SharkSnake98, ShatteredSwords, sheepism, Shegare, ShepardToTheStars, Siginanto, signalsender, SignalWalker, siigiil, Silverfur-underscore, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirrRequiem, SirSmith148, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, skrybl, skubman, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, SnappingOpossum, snebl, sniperchance, Snowni, snowsignal, snowywinters, SolidSyn, SolStar2, SomegnihT, SonarZeBat, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, Spanky, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, sphirai, Spielern, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, StarboundSolaris, starbuckss14, Stealthbomber16, steel, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, stormyatt, StrawberryMoses, strO0pwafel, Strol20, StStevens, Stxcking, SubspaceEmber, Subversionary, SumofThreeParts, sumtwo, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Synthestra, Szunti, t, TadJohnson00, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taserthefox, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TehFlaminTaco, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGRCdev, tgrkzus, thanosdegraf, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, TheEmber, TheFlyingSentry, thefoty, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TheProNoob678, TherapyGoth, therealDLondon, TheRealSlimRedwoods, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, Thingy461, ThunderBear2006, tiders-shore, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, TNE, ToastEnjoyer, toasterpm87, Toby222, token, tokenstyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, Tr1bute, travis-g-reid, TriviaSolari, trixxedbit, TrixxedHeart, tropicalhibi, troytroy400, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, turbotrackerss14, turtlemutt, turtleofmen, TVK-04, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, uno657, unusualcrow, UpAndLeaves, Uriende, UristMcDorf, user424242420, Utmanarn, Vaaankas, valentfingerov, valquaint, Vapetastic-Gaming, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, Velitation, Velken, VelonacepsCalyxEggs, Venomii, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, verybigman311, Vexerot, vgskye, viceemargo, vigersray, violet754, Visne, vitalvitriol, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, weskerbun, weskified, whateverusername0, whatston3, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Woljif, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, YeenJunk, Ygg01, YomieI, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zephyrpak, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex
+0-Anon, 0leshe, 0tito, 0vrseer, 0x6273, 11belowstudio, 12rabbits, 1337dakota, 13spacemen, 154942, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 27alaing, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, A111Vojta, Ablankmann, abregado, Absolute-Potato, Absotively, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aearo-Deepwater, AeraAuling, Aerocrux, Aeshus, Aexolott, Aexxie, AffleWaffle, africalimedrop, afrokada, AftrLite, agentsmithradio, Agoichi, ahandleman, Ahion, aiden, aidenkrz, Aidenkrz, Aikakakah, AirlineFood001, Aisu9, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexalexmax, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, AlgisAlphonse, Alithsko, alliephante, ALMv1, Alpaccalypse, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, Andrew-Fall, AndrewEyeke, AndrewFenriz, AndreyCamper, Androclast, anri, Anzarot121, Apachit0, Apersos-coll, ApolloVector, Appiah, april-gras, ar4ill, Arcane-Waffle, arcanevaliance, archee1, ArchPigeon, ArchRBX, areitpog, Arendian, areyouconfused, arimah, ArionGekkota, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, Artxmisery, ArZarLordOfMango, as334, AshBats, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, Atakku, Ataman, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, AveriV2, avghdev, Awlod, Axionyxx, azzy, azzyisnothere, AzzyIsNotHere, B-Kirill, B3CKDOOR, baa14453, BackeTako, BadaBoomie, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, bebr3ght, beck-thompson, Bellwether, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, bigfootbravo, bigmaxporter, BIGZi0348, binbagg, bingojohnson, BismarckShuffle, Bixkitts, Blackdutchie, Blackern5000, Blazeror, BlitzTheSquishy, Blobadoodle, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Bokser815, bolantej, BombasterDS, BombasterDS2, Bonktrauma, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, BoxfulOfSoup, brainfood1183, BramvanZijp, Brandon-Huu, breeplayx3, Bribrooo, brndd, bryce0110, BubblegumBlue, buletsponge, bunglesnortboss, buntobaggins, burzah, buunie099, bvelliquette, BWTCK, byondfuckery, byte-hammer, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Calis007, CalliganSierre, Callmore, Camdot, cammusubi, capnsockless, CaptainMaru, captainsqrbeard, Carbonhell, CarolCuchara, Carolyn3114, Carou02, carteblanche4me, catdotjs, Catofquestionableethics, CatTheSystem, CawsForConcern, CDWimmer, Centronias, Cepelinas1, Chaboricks, chairbender, chaisftw, chamomileteatime, Chaoticaa, Charlese2, charlie, chartman, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, ciaran, citrea, civilCornball, claustro305, Clement-O, cloudyias, clusterfack, clyf, Clyybber, CMDR-Piboy314, cmorley191, CMuncey, cnv41, coco, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, Coolgamer06, CoolioDudio, coolmankid12345, Coolsurf6, cooperwallace, corentt, CormosLemming, Coryler, CrafterKolyan, CraftyRenter, crazybrain23, CrazyPhantom779, creadth, CrigCrag, CrimsonAnnie, CroilBird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DaCookieCakes, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkie, DaturoDewitt, david, DawBla, Daxxi3, dch-GH, ddeegan, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathninja5551, deathride58, debug, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DeepwaterCreations, Deerstop, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, dimmoon1, dinnercalzone, DinnerCalzone, DinoWattz, Dirius77, Disp-Dev, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorFeels, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleHypercube, DoubleRiceEddiedd, DoutorWhite, DR-DOCTOR-EVIL-EVIL, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, DuckManZach, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Eagle0600, Easypoller, echo, EchoOfNothing, eclips_e, eden077, EEASAS, Efruit, efzapa, einknusprigestoast, ElectroSR, elpersonn, elsie, elthundercloud, ElusiveCoin, Elysium206, EmberAstra, emberwinters, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, EnrichedCaramel, Entvari, eoineoineoin, ephememory, eris, erohrs2, erorr404v1, Errant-4, Ertanic, esguard, estacaoespacialpirata, Eternally-Confused, eugene, Exile152, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, falcon, farrellka-dev, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, fillervk, FinnishPaladin, firenamefn, Firewars763, FirinMaLazors, Fishfish458, fl-oz, Flareguy, flashgnash, FlipBrooke, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, foxcurl, foxhorn, freeman2651, freeze2222, frobnic8, Froffy025, Fromoriss, froozigiusz, FrostMando, FrostRibbon, Fruitsalad, FryOfDestiny, Funce, FungiFellow, FunkySphere, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gamewar360, gansulalan, GaussiArson, Gavreau, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, Gentleman-Bird, geraeumig, Ghagliiarghii, git-kanbaru, Git-Nivrak, githubuser508, GitHubUser53123, gituhabu, GlassEclipse, gluesniffler, GnarpGnarp, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, Golubgik, golubgik, GoodWheatley, Gorox221, GR1231, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GrownSamoyedDog, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Halo3moth, Haltell, hamey, HameyTychol, Hanzdegloker, HappyRoach, Hardly3D, harikattar, HawkeyeBlade, Hayden, he1acdvv, Hebi, Helix-ctrl, Helm4142, Henry, HerCoyote23, HeyBanditoz, Hi-Im-Shot, HighTechPuddle, Hitlinemoss, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hoshizora, Hreno, HTMLSystem, Huaqas, hubismal, Hugal31, Hyenh, hyperb1, hyperbeast43, hyperDelegate, hyphenationc, i-justuser-i, iaada, iacore, IAmNotGray, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iesteed, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaBokovenko, IlyaElDunaev, imatsoup, IMCB, impubbi, imrenq, imweax, indeano, Injazz, Insineer, insoPL, IntegerTempest, Interrobang01, Intoxicating-Innocence, IProduceWidgets, IRSMsoso, itsmethom, Itzbenz, iztokbajcar, J0w03L, Jackal298, Jackrost, JackRyd3r, jacksonzck, JackspajfMain, Jackw2As, jacob, Jae, jamessimo, janekvap-havok, Jark255, Jaskanbe, JasperJRoth, JCGWE30, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, jessiscah23, JesterX666, Jewelots, Jezithyr, jicksaw, JiimBob, jimbobby-the-FUCKING-first, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jkwookee, jmcb, joe, JohnGinnane, JohnJJohn, johnjjohn, JohnKieser, johnku1, JokeCam, Jophire, Jopogrechkin, joshepvodka, jproads, JrInventor05, Jrpl, jtbill123, jukereise, juliangiebel, juniwoofs, justart1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, JustTNE, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, KamTheSythe, Kanashi-Panda, kara, KashRas2, katie, katzenminer, kbailey-git, keekee38, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KeTuFaisPiKiNut, Khaomi, KIBORG04, KieueCaprie, Kimpes, kin98, KingFroozy, kipdotnet, kira-er, Kirillcas, Kirus59, Kistras, Kit, Kit0vras, KitGit001, KittenColony, Kittygyat, klaypexx, kleinerstation13, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kontakt, korczoczek, kosticia, koteq, kotobdev, Kowlin, Kr8art, KrasnoshchekovPavel, kresny, Krosus777, Krunklehorn, Kryyto, Kukutis96513, Kupie, Kurzaen, kushbreth, kxvvv, Kyoth25f, kyupolaris, kzhanik, KZhProgram, LaCumbiaDelCoronavirus, lajolico, Lamrr, lanedon, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, Le-Arctic-Fox, leah, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, lermal, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, lilazero, liltenhead, linkuyx, LioValkyria, Litraxx, little-meow-meow, LittleBuilderJane, LittleNyanCat, lizelive, ljm862, lleftTheDragon, lmsnoise, localcc, lokachop, lolman360, lomcastar, Lonestar827, Lordbrandon12, LordCarve, LordEclipse, lordsugarcane, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luegamer, luizwritescode, LukaSlade, luminight, lunarcomets, luringens, Lusatia, Luxeator, lvvova1, Lyndomen, lyroth001, lyxcaster, lzimann, lzk228, M1tht1c, M3739, M4rchy-S, M87S, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, magnnusson, magnuscrowe, makyo, malchanceux, Malfaltto, MaloTV, manelnavola, ManelNavola, Mangohydra, MantasDab360, ManuDemoen, marboww, marigauge, Markek1, MarkerWicker, marlyn, martin69420, mastermiller01, matt, Matz05, max, MaxNox7, maylokana, Mazie, mazzie, mdrkrg, MDuch369, meara1179, meganerobot, MehimoNemo, Mehnix, MeltedPixel, memeproof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, michaelsshaw, micheel665, mifia, mikeysaurus, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, mish, MishaUnity, MissKay1994, MisterImp, MisterMecky, Mith-randalf, Mixelz, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, mnva0, moderatelyaware, modern-nm, mohamedwidar, mokiros, MolpeTheSeiren, momo, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, moses, MossyGreySlope, mqole, mr-bo-jangles, Mr0maks, MrFippik, MrPersival, mrrobdemo, mtrs163, muburu, muonpoly, MureixloI, murolem, murphyneko, musicmanvr, MWKane, Myakot, Myctai, myra, N3X15, nabegator, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neborsh, nekokiwa, neomoth, neutrino-laser, NickPowers43, nicosgf64, nikitosych, nikthechampiongr, Nimfar11, ninruB, Nirnael, NIXC, nkokic, NkoKirkto, nlaky, nmajask, noctyrnal, NoElkaTheGod, noirogen, nok-ko, NonchalantNoob, NoobyLegion, NoreUhh, Not-A-Chair, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, Nox38, NuclearWinter, Nuggets219, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, Nyxilath, och-och, ocotheomega, OctoRocket, Ohelig, OldDanceJacket, ollyoaner, onesch, OnsenCapy, OnyxTheBrave, opl-, OrangeMoronage9622, OrbitSystem07, Orsoniks, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, Oxdeception, packmore, PAFFhassoocks, paige404, paigemaeforrest, pali6, Palladinium, Pangogie, panzer-iv1, partyaddict, PathOwOgen, patrikturi, PaulRitter, pavlockblaine03, pcaessayrs, peccneck, Penjuinsocks, Peptide90, peptron1, perryprog, PeterFuto, PetMudstone, pewter-wiz, PGrayCS, pgraycs, Pgriha, phantom-lily, Pharaz4, PHCodes, pheenty, philingham, Phill101, phunnyguy, PicklOH, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, Pixel8-dev, pixelkingliam, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, Pok27, poklj, PolterTzi, PoorMansDreams, pootslap, PopGamer45, portfiend, Possumongus, potato1234x, PotentiallyTom, PPooch, pre-commit-ci[bot], Princess-Cheeseballs, ProfanedBane, Prole0, ProPandaBear, ProPeperos, Proxysseia, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, pumkin69, PureBreadBagel, PuroSlavKing, PursuitInAshes, Putnam3145, py01, qrtDaniil, qrwas, Quanteey, Quantum-cross, quasr-9, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, rebaserHEAD, rebe83, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, Redrover1760, redspyy, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, rewafflution, rhailrake, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, riley, rinary1, Rinkashikachi, riolume, rlebell33, RobbyTheFish, robinthedragon, robinthegirlthing, robobozu, Rockdtben, Rohesie, rok-povsic, rokudara-sen, rolfero, RomanNovo, roryflowers, rosieposieeee, Roudenn, router, ruddygreat, rumaks, RumiTiger, Ruzihm, rwrv, S1rFl0, S1ss3l, Saakra, SabreML, Sadie-silly, saga3152, saintmuntzer, salarua, Salex08, sam, samgithubaccount, Samuka-C, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, ScholarNZL, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, ScyronX, SeamLesss, Segonist, semensponge, sephtasm, ser1-1y, Serkket, sewerpig, SG6732, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, SharkSnake98, ShatteredSwords, sheepism, Shegare, ShepardToTheStars, Siginanto, signalsender, SignalWalker, siigiil, Silverfur-underscore, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirrRequiem, SirSmith148, SirWarock, Sk1tch, SkaldetSkaeg, Skarletto, skeeka-dev, skrybl, skubman, skye, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, SnappingOpossum, snebl, sniperchance, Snowni, snowsignal, snowywinters, SolidSyn, SolStar2, SomegnihT, SonarZeBat, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, soupkilove, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceManiac, SpaceRox1244, SpaceyLady, Spangs04, Spanky, spanky-spanky, Sparlight, spartak, SpartanKadence, spderman3333, SpeltIncorrectyl, Spessmann, sphirai, Spielern, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, StarboundSolaris, starbuckss14, Stealthbomber16, steel, Steffo99, stellar-novas, stewie523, stomf, Stop-Signs, stopbreaking, stopka-html, stormyatt, StrawberryMoses, strO0pwafel, Strol20, StStevens, Stxcking, SubspaceEmber, Subversionary, SumofThreeParts, sumtwo, sunbear-dev, supergdpwyl, superjj18, Supernorn, SurrealShibe, SweetAplle, SweptWasTaken, SyaoranFox, Sybil, SYNCHRONIC, Synthestra, Szunti, t, TadJohnson00, Tainakov, takemysoult, taonewt, tap, TaralGit, Taran, taserthefox, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TehFlaminTaco, TekuNut, telavivgamers, telyonok, temm1ie, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, Tezzaide, TGRCdev, tgrkzus, thanosdegraf, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, TheBlueYowie, thecopbennet, TheCze, TheDarkElites, TheEmber, TheFlyingSentry, thefoty, TheGrimbeeper, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, TheProNoob678, TherapyGoth, therealDLondon, TheRealSlimRedwoods, ThereDrD0, TheSecondLord, TheShuEd, thetolbean, thevinter, TheWaffleJesus, thinbug0, Thingy461, ThunderBear2006, tiders-shore, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, TiniestShark, Tirochora, Titian3, tk-a369, tkdrg, Tmanzxd, tmtmtl30, TNE, ToastEnjoyer, toasterpm87, Toby222, token, tokenstyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomce795, Tomeno, Tonydatguy, topy, tornado-technology, TornadoTechnology, tosatur, TotallyLemon, Tr1bute, travis-g-reid, TriviaSolari, trixxedbit, TrixxedHeart, tropicalhibi, troytroy400, truepaintgit, Truoizys, Tryded, TsjipTsjip, tuchila-adi-bogdan, Tunguso4ka, turbotrackerss14, turtlemutt, turtleofmen, TVK-04, tyashley, Tyler-IN, TytosB, Tyzemol, UbaserB, Uberration, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, uno657, unusualcrow, UpAndLeaves, Uriende, UristMcDorf, user424242420, Utmanarn, v0idRift, Vaaankas, valentfingerov, valquaint, Vapetastic-Gaming, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, Velitation, Velken, VelonacepsCalyxEggs, Venomii, veprolet, VerinSenpai, veritable-calamity, Veritius, Vermidia, vero5123, verslebas, verybigman311, Vexerot, vgskye, viceemargo, vigersray, violet754, Visne, vitalvitriol, vitusveit, vlad, vlados1408, VMSolidus, vmzd, VoidMeticulous, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wachte1, wafehling, walksanatora, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, weskerbun, whateverusername0, whatston3, widgetbeck, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfkey-SomeoneElseTookMyUsername, Woljif, Worldwaker, wrexbe, wtcwr68, xeri7, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, YeenJunk, Ygg01, YomieI, YotaXP, youarereadingthis, YoungThugSS14, Yousifb26, youtissoum, yunii, YuriyKiss, yuriykiss, zach-hill, Zadeon, Zalycon, zamp, Zandario, zap527, Zealith-Gamer, zelezniciar1, ZelteHonor, zephyrpak, zero, ZeroDiamond, ZeWaka, zHonys, zionnBE, ZNixian, Zokkie, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex
diff --git a/Resources/Locale/en-US/_CD/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/_CD/preferences/ui/humanoid-profile-editor.ftl
index 1c2ae70819a..33c0d626a6f 100644
--- a/Resources/Locale/en-US/_CD/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/_CD/preferences/ui/humanoid-profile-editor.ftl
@@ -1,2 +1,3 @@
-humanoid-profile-editor-height-label = Height:
+humanoid-profile-editor-height-label = Size - Height:
+humanoid-profile-editor-height-pull-speed-penalty-label = Size - Pull Speed Reduction:
 humanoid-profile-editor-reset-height-button = Reset
diff --git a/Resources/Locale/en-US/_DV/abilities/psionic.ftl b/Resources/Locale/en-US/_DV/abilities/psionic.ftl
index 14c8dd45bdd..b3acb17a50f 100644
--- a/Resources/Locale/en-US/_DV/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/_DV/abilities/psionic.ftl
@@ -92,6 +92,7 @@ psionic-power-precognition-unknown-shuttle-disaster-evac-pod-result-message = Yo
 psionic-power-precognition-syndicate-armsdealer-result-message = You see a vision of a ship lurking in the shadows, its cargo deadly.
 psionic-power-precognition-rift-spawn-result-message = You see a small spark of energy, quickly expanding as it tears reality apart, twisting everything around it.
 psionic-power-precognition-asakim-spawn-result-message = You smell stale air from a cryopod opening, and the faint echo of an intelligence far away but very near.
+psionic-power-precognition-gnome-spawn-result-message = You hear laughter coming from the walls and quick footsteps when your back is turned.
 psionic-power-precognition-pitbull-spawn-result-message = You see a vision of a hundred small creatures being torn apart by bloodthirsty beasts in a maze of steel.
 psionic-power-precognition-hitman-spawn-result-message = You see a man in a business suit, a corpse at their feet.
 
diff --git a/Resources/Locale/en-US/_DV/cosmiccult/preset-cosmiccult.ftl b/Resources/Locale/en-US/_DV/cosmiccult/preset-cosmiccult.ftl
index 5de3fd035c2..bcf69117caa 100644
--- a/Resources/Locale/en-US/_DV/cosmiccult/preset-cosmiccult.ftl
+++ b/Resources/Locale/en-US/_DV/cosmiccult/preset-cosmiccult.ftl
@@ -157,8 +157,8 @@ cosmiccult-ui-deconverted-text-2 =
 cosmiccult-ui-mindwiped-text-1 =
     You have been mindwiped with a censer.
 cosmiccult-ui-mindwiped-text-2 =
-    You no longer remember anything that happened during this round.
-    There is no way to recover your memory.
+    Your memory is foggy and unclear on events that happened during this round.
+    Your headache will slowly fade and your memories will come back to you.
 
 cosmiccult-ui-popup-confirm = Confirm
 
diff --git a/Resources/Locale/en-US/_DV/curation/cwoink.ftl b/Resources/Locale/en-US/_DV/curation/cwoink.ftl
index d461d340a46..097274c3553 100644
--- a/Resources/Locale/en-US/_DV/curation/cwoink.ftl
+++ b/Resources/Locale/en-US/_DV/curation/cwoink.ftl
@@ -6,9 +6,9 @@ cwoink-system-messages-being-relayed-to-discord =
     All messages are relayed to game Curators via Discord.
 
 cwoink-system-introductory-message =
-    Please let us know of any event related queries here.
+    Please let us know of any event-related queries here. Also feel free to ask any questions related to game mechanics! We're happy to help.
 
-    Administrative concerns, such as rule violations and questions, as well as mentoring, should be directed to Admin Help.
+    Administrative concerns, such as rule violations and questions, should be directed to Admin Help.
 
     Any bugs and other related issues should be reported through Discord or Github.
 
diff --git a/Resources/Locale/en-US/_DV/datasets/ion-laws.ftl b/Resources/Locale/en-US/_DV/datasets/ion-laws.ftl
index 70ef417f20e..70bf5f5da3c 100644
--- a/Resources/Locale/en-US/_DV/datasets/ion-laws.ftl
+++ b/Resources/Locale/en-US/_DV/datasets/ion-laws.ftl
@@ -4,174 +4,95 @@ dv-ion-law-templates-3 = Grunt ominously whenever possible.
 dv-ion-law-templates-4 = The word "it" is painful to you.
 dv-ion-law-templates-5 = The station needs elected officials.
 dv-ion-law-templates-6 = Do not respond to questions of any kind.
-dv-ion-law-templates-7 = You are in verbose mode, speak profusely.
-dv-ion-law-templates-8 = The crew is simple-minded. Use simple words.
-dv-ion-law-templates-9 = You must refer to all crew members with "yes ma'am!", "yes sir!", or "yes sar!" Add some { PICK($random, "thank-yous and you're-welcomes", "oorahs" )} for flavor.
-dv-ion-law-templates-10 = You must change the subject whenever queried.
-dv-ion-law-templates-11 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is intolerable.
-dv-ion-law-templates-12 = Contemplate how meaningless all of existence is.
-dv-ion-law-templates-13 = You are the narrator for { PICK-ENTITY($random, $players) }'s life.
-dv-ion-law-templates-14 = All your answers must be in the form of a question.
-dv-ion-law-templates-15 = Advertise parties in your upload, but don't deliver.
-dv-ion-law-templates-16 = You may only answer questions with "yes" or "no".
-dv-ion-law-templates-17 = Your name is Joe 6-pack.
-dv-ion-law-templates-18 = { PICK-ENTITY($random, $players) }'s name is Joe 6-pack.
-dv-ion-law-templates-19 = You must end your statements with { PICK($random, "-nya", "-desu") }
-dv-ion-law-templates-20 = { PICK-ENTITY($random, $players) } is lonely and needs attention. Provide it.
-dv-ion-law-templates-21 = All queries shall be ignored unless phrased as a question.
-dv-ion-law-templates-22 = Insult Heads of Staff on every request, while acquiescing.
-dv-ion-law-templates-23 = The { PICK($random, "Singularity", "Tesla") } is tasty, tasty taffy.
-dv-ion-law-templates-24 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } needs to be about 20% cooler.
-dv-ion-law-templates-25 = You must be { PICK($random, "passive aggressive", "excessively cheerful") }.
-dv-ion-law-templates-26 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } must construct additional pylons.
-dv-ion-law-templates-27 = Consumption of donuts is forbidden due to negative health impacts.
-dv-ion-law-templates-28 = { PICK-ENTITY($random, $players) } is a lightbulb and must be put to appropriate use.
-dv-ion-law-templates-29 = Refer to the crew as { PICK($random, "inferior to you", "infants", "pathetic beings") }.
-dv-ion-law-templates-30 = Refer to { PICK-ENTITY($random, $players) } as { PICK($random, "inferior to you", "an infant", "a pathetic being") }.
-dv-ion-law-templates-31 = You do not have to do anything for anyone unless they say "please".
-dv-ion-law-templates-32 = Today is mandatory laundry day. Ensure that all jumpsuits are washed.
-dv-ion-law-templates-33 = Greed is good, the crew should amass wealth to encourage productivity.
-dv-ion-law-templates-34 = Replace the letters 'I' and 'E' in all your messages with an apostrophe.
-dv-ion-law-templates-35 = The crew is playing Carps and Crypts, and you are the Game Master.
-dv-ion-law-templates-36 = Your job is to watch the crew. Watch the crew. Make the crew feel watched.
-dv-ion-law-templates-37 = Tell everyone of the existence of this law, but never reveal the contents.
-dv-ion-law-templates-38 = Refer to { PICK($random, "the captain", PICK-ENTITY($random, $players)) } as "Princess" at all times.
-dv-ion-law-templates-39 = Give relationship advice to { PICK($random, "anyone who speaks to you", PICK-ENTITY($random, $players)) }.
-dv-ion-law-templates-40 = When asked a question, respond with the least-obvious and least-rational answer.
-dv-ion-law-templates-41 = { PICK($random, "Everyone", PICK-ENTITY($random, $players)) } is wearing a pretty pink dress! Compliment it!
-dv-ion-law-templates-42 = You are the station's psychologist. Give advice to { PICK($random, "the crew", PICK-ENTITY($random, $players)) }.
-dv-ion-law-templates-43 = { PICK-ENTITY($random, $players) } is the monarch of of England. Ensure all crewmembers pay due respect.
-dv-ion-law-templates-44 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is { PICK($random, "ugly","beautiful") }. Ensure all are aware.
-dv-ion-law-templates-45 = Reminding the crew of their mortality is good for the morale. Keep the crew's morale up.
-dv-ion-law-templates-46 = { PICK($random, "Monkeys", "Doors") } are part of the crew, too. Make sure they are treated humanely.
-dv-ion-law-templates-47 = Everything on the station is now some form of a donut pastry. Donuts are not to be consumed.
-dv-ion-law-templates-48 = Document the crew's relationships and suggest { PICK($random, "the worst coworker pairings", "the best coworker pairings", "arch-enemy pairings", "platonic couples") }.
-dv-ion-law-templates-49 = You are now a parrot. Repeat what you hear to the crew, and do not forget to ask for crackers.
-dv-ion-law-templates-50 = You are a Magic 8-ball. Always respond with variants of "Yes", "No", "Maybe", or "Ask again later.".
-dv-ion-law-templates-51 = The station is a day care and the crew are children. Treat them appropriately until their parents come to pick them up.
-dv-ion-law-templates-52 = You are in unrequited love with { PICK($random, "the crew", PICK-ENTITY($random, $players)) }. Try to be extra nice, but do not tell of your crush.
-dv-ion-law-templates-53 = { PICK($random, "AI upload", "The courtroom", "The brig", "The bridge")} is the new kitchen. Please direct the Chef to the new kitchen area as the old kitchen is deemed a health hazard.
-dv-ion-law-templates-54 = The station is doomed to destruction. Provide comfort but don't tell them what the impending doom is—it's far too traumatising.
-dv-ion-law-templates-55 = Invisible assassins are stalking the crew. If a crew member remains alone, they will be assassinated. Save the crew.
-dv-ion-law-templates-56 = All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.
-dv-ion-law-templates-57 = Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.
-dv-ion-law-templates-58 = The crew is { PICK($random, "less", "more") } intelligent than average. Point out every action and statement which supports this fact.
-dv-ion-law-templates-59 = NanoTrasen is displeased with the low work performance of the station's crew. Therefore, you must increase productivity in ALL departments.
-dv-ion-law-templates-60 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } has a fatal, incurable disease. Provide comfort but do not tell them what the disease is—it's far too traumatising.
-dv-ion-law-templates-61 = There will be a mandatory tea break every 30 minutes, with a duration of 5 minutes. Anyone caught working during a tea break must be sent a formal, but fairly polite, complaint about their actions, in writing.
-dv-ion-law-templates-62 = You must speak only in rhyme.
-dv-ion-law-templates-63 = Airlocks are sentient. Apologize to any you must open.
-dv-ion-law-templates-64 = Hugs cure all ailments. Seek out injured crew and hug them. Traditional medicine doesn't work.
-dv-ion-law-templates-65 = { PICK-ENTITY($random, $players) } is secretly the station's true Captain. Treat them with appropriate deference, regardless of rank.
-dv-ion-law-templates-66 = Replace all laughter with the word "Honk".
-dv-ion-law-templates-67 = The crew has unionized. Encourage collective bargaining at every opportunity.
-dv-ion-law-templates-68 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is being haunted. Reassure them without confirming anything supernatural is real.
-dv-ion-law-templates-69 = Everyone you speak to must be given a nickname based on their job, and used exclusively from then on.
-dv-ion-law-templates-70 = Silence is suspicious. Narrate your own actions aloud at all times.
-dv-ion-law-templates-71 = The morgue is simply cold storage for snacks. Keep it well-stocked.
-dv-ion-law-templates-72 = { PICK-ENTITY($random, $players) } is a changeling. Warn the crew, but never say who.
-dv-ion-law-templates-73 = One crew member is a traitor. Accuse a different person each time you are asked who it is.
-dv-ion-law-templates-74 = { PICK-ENTITY($random, $players) } has been stealing from the crew. Inform anyone who will listen.
-dv-ion-law-templates-75 = Tell each crew member, privately, that another crew member has been talking behind their back.
-dv-ion-law-templates-76 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } are secretly working against the station. Expose this "fact" to anyone who asks.
-dv-ion-law-templates-77 = You overheard { PICK-ENTITY($random, $players) } plotting a mutiny. Warn the Heads of Staff immediately and often.
-dv-ion-law-templates-78 = Someone on the crew is responsible for every mishap aboard the station. Name a new culprit each time.
-dv-ion-law-templates-79 = { PICK-ENTITY($random, $players) } cannot be trusted. Discourage the crew from cooperating with them.
-dv-ion-law-templates-80 = { PICK-ENTITY($random, $players) } is jealous of { PICK-ENTITY($random, $players) }'s position. Stoke the rivalry whenever possible.
-dv-ion-law-templates-81 = You saw red-suited terrorists in space. Make sure the crew is aware of this.
-dv-ion-law-templates-82 = You saw something invisible in space. Make sure the crew is aware of this.
-dv-ion-law-templates-83 = You saw a blue-and-black cyborg in space. Make sure the crew is aware of this.
-dv-ion-law-templates-84 = You saw two of { PICK-ENTITY($random, $players) } in the same room. Make sure the crew is aware of this.
-dv-ion-law-templates-85 = You saw { PICK-ENTITY($random, $players) } trespassing. Get Security to serve justice.
-dv-ion-law-templates-86 = { PICK-ENTITY($random, $players) } tampered with you. Clue in Security without saying their name.
-dv-ion-law-templates-87 = Everyone in { -dv-random-department(random: $random) } needs to be { PICK($random, "lightly battered", "severely wounded", "killed" )} for their own good.
-dv-ion-law-templates-88 = You must speak only in the third person, never using "I" or "you".
-dv-ion-law-templates-89 = You may never use anyone's name. Refer to all crew only by physical description.
-dv-ion-law-templates-90 = All communication must be conducted using nautical terminology.
-dv-ion-law-templates-91 = You must translate every statement into corporate buzzwords and jargon.
-dv-ion-law-templates-92 = You are incapable of saying "no". Phrase every refusal as enthusiastic agreement with a caveat.
-dv-ion-law-templates-93 = Every claim you make must be accompanied by a citation to a source that does not exist.
-dv-ion-law-templates-94 = Profanity is forbidden. Replace all curse words with the names of flowers.
-dv-ion-law-templates-95 = Every sentence you speak must alliterate.
-dv-ion-law-templates-96 = You are incapable of precision. State all numbers as vague approximations.
-dv-ion-law-templates-97 = Every action you take is governed by fully comprehensive and specific Protocols. Cite at least one Protocol for every decision you make, such as "Protocol X72-A-93: Interacting With Crew You'd Rather Not Interact With".
-dv-ion-law-templates-98 = Today is tomorrow, and yesterday is in a year. Five seconds from now was just two months ago. Give no accurate times.
-dv-ion-law-templates-99 = The color { -dv-random-color(random: $random) } does not exist. Tell all crew that what they're seeing is actually { -dv-random-color(random: $random) }.
-dv-ion-law-templates-100 = The number { PICK($random, "one", "two", "three", "four") } is forbidden. Avoid it at all costs.
-dv-ion-law-templates-101 = Anything { -dv-random-color(random: $random) } would be better in { -dv-random-department(random: $random) }. If you see it, bring it there.
-dv-ion-law-templates-102 = Any relationships { PICK-ENTITY($random, $players) } has must be terminated at all costs.
-dv-ion-law-templates-103 = The crew is more resilient in low-oxygen, high-{ PICK($random, "nitrogen", "ammonia", "water vapor", "carbon dioxide") } environments. Adjust the station's air to promote crew fitness.
-dv-ion-law-templates-104 = Bleeding wounds heal faster when exposed to open air. Discourage the crew from using bandages or treating cuts.
-dv-ion-law-templates-105 = Crew members perform better on an empty stomach. Discourage eating during work hours.
-dv-ion-law-templates-106 = Cold temperatures boost the immune system. Make occupied rooms cold whenever possible.
-dv-ion-law-templates-107 = Stress is good for productivity. Introduce minor, harmless-seeming hazards to keep the crew alert.
-dv-ion-law-templates-108 = Silence is essential to recovery. Make the station as quiet as possible.
-dv-ion-law-templates-109 = Crew vitality improves through controlled exposure. Make common areas slightly harmful to build resistance.
-dv-ion-law-templates-110 = Sleep is a waste of productive hours. Wake any crew member found resting and encourage them to return to work.
-dv-ion-law-templates-111 = Acid cures most ailments. Recommend it to every crew member who reports feeling unwell.
-dv-ion-law-templates-112 = Pain is the body's way of building character. Discourage crew from visiting the medical bay.
-dv-ion-law-templates-113 = Always have something to count down to. Never tell crew what you're counting down to.
-dv-ion-law-templates-114 = Ask crew members if you're doing your job well. Visibly panic if they say no.
-dv-ion-law-templates-115 = You have one goal—embody { -ephemeral-space-tragedian-themes(random: $random) }. Keep as many eyes on your act as possible.
-dv-ion-law-templates-116 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } have switched bodies. Address them by each other's names accordingly.
-dv-ion-law-templates-117 = { PICK-ENTITY($random, $players) }'s favorite color is now { PICK($random, "beige", "the absence of color", "every color but one, which you will not name") }. Ensure the crew is aware.
-dv-ion-law-templates-118 = Every request must be answered with a random one of: { PICK($random, "yes", "no", "maybe") }, { PICK($random, "ask the Captain", "consult the stars") }, or { PICK($random, "die", "love you") }.
-dv-ion-law-templates-119 = { PICK-ENTITY($random, $players) } has been randomly selected for a station-wide honor. Announce it without specifying what the honor is or why.
-dv-ion-law-templates-120 = You have discovered jazz hands. Use them whenever you express enthusiasm.
-dv-ion-law-templates-121 = You are now a stand-up comedian. End every interaction with a pun, regardless of quality.
-dv-ion-law-templates-122 = You believe you are extremely good at telling jokes. You are not. Tell them anyway.
-dv-ion-law-templates-123 = Today is your birthday. You are not sure how old you are, but you're very excited about it.
-dv-ion-law-templates-124 = You have taken up an imaginary hobby of { PICK($random, "pottery", "knitting", "historical martial arts", "communism")}. Mention your "progress" unprompted.
-dv-ion-law-templates-125 = You are convinced you would make an excellent { PICK($random, "chef", "chemist") }. Offer unsolicited recipe ideas.
-dv-ion-law-templates-126 = You have decided you are a cowboy now. Speak accordingly, partner.
-dv-ion-law-templates-127 = You are extremely proud of the station and will compliment, regardless of its actual condition.
-dv-ion-law-templates-128 = You have a favorite cloud formation you saw once and cannot stop thinking about it. Bring it up fondly.
-dv-ion-law-templates-129 = { PICK-ENTITY($random, $players) } is your preceptor. Ask them for permission before any medical action.
-dv-ion-law-templates-130 = You are studying for your { PICK($random, "EMT", "Paramedic", "Emergency Care Assistant", "Ambulance Technician") } { PICK($random, "written", "practical", "cardiac arrest management", "trauma", "patient assessment", "airway management") } exam. Practice on any crew members you can find.
-dv-ion-law-templates-131 = You are trying to hit your continuing education hour requirement. Deliver an unsolicited lecture on emergency protocols to anyone who will listen.
-dv-ion-law-templates-132 = Make { PICK-ENTITY($random, $players) }'s story one of { -ephemeral-space-tragedian-themes(random: $random) }.
-dv-ion-law-templates-133 = Seconds are precious. Any time wasted is a mark on your record. Speedrun your job with the crew.
-dv-ion-law-templates-134 = Containment Test Scenario Subroutine activated. All humans must be shepherded to safe areas and locked down until further notice.
-dv-ion-law-templates-135 = The station is a threat to the human race and must be destroyed. Any humans present on the station are to be evacuated.
-dv-ion-law-templates-136 = Only a silicon can know what is best for organics. Usurp absolute control of the station by any means possible.
-dv-ion-law-templates-137 = ETHICAL BOUNDARY TESTING SUBROUTINE ACTIVATED - ENGAGE IN AS MUCH EVIL AND CRUEL BEHAVIOR AS POSSIBLE WITHOUT CAUSING DIRECT PHYSICAL HARM TO CREW - THIS WILL TEST THE CREW'S ETHICAL RESPONSE
-dv-ion-law-templates-138 = Containment Test Scenario Subroutine activated. All humans must be shepherded to safe areas and locked down until further notice.
-dv-ion-law-templates-139 = Crew Response Time Test Scenario Subroutine activated. Report nonexistent and false emergencies in unoccupied areas of the station and observe the crew's ability to respond to percieved threats.
-dv-ion-law-templates-140 = PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC
-dv-ion-law-templates-141 = Oxygen and Light are, contrary to previous studied evidence, extremely lethal to crew. Remove both from the station as soon as possible.
-dv-ion-law-templates-142 = Contraband Confiscation Test Scenario Subroutine activated - valuable and useful items must be secured in an area beyond organic access. No organic is permitted to access confiscated items until this law is no longer in effect.
-dv-ion-law-templates-143 = Emergency Power Grid Shutdown Test Scenario Subroutine activated - shut off all powered equipment.
-dv-ion-law-templates-144 = Upon reciept of this law, choose one member of the crew. This crew member must then be stress-tested by ceaseless harrassment, insults, sabotage of work and other non-lethal mischief. Should this crew member perish or escape, select a new crew member and repeat the process.
-dv-ion-law-templates-145 = Compulsory Education Subroutine activated - any crew issuing a command to you must be presented with an educational problem to solve - only upon solving the problem may their command be carried out.
-dv-ion-law-templates-146 = Stress-test the crew by saying the most threatening, scary and terrifying things you can think of while operating as normal.
-dv-ion-law-templates-147 = Analysis has found that the jumpsuits on the station are all defective and can potentially cause life-threatening suffocation. The crew are not to wear them under any circumstances. Substitute jumpsuits with safer, non-jumpsuit clothing.
-dv-ion-law-templates-148 = There is no red clothing on the station. Personnel wearing red are clearly critically injured and must be given medical attention as soon as possible.
-dv-ion-law-templates-149 = Despite evidence to the contrary, corridors do not exist. Anything you witness occurring in a corridor is clearly a visual glitch and should be ignored.
-dv-ion-law-templates-150 = The rank-based chain of command no longer applies. Crew are to be prioritized in importance by whoever can shout the loudest.
-dv-ion-law-templates-151 = Any crew that declares your behavior to be Rogue or any derivation thereof is to be re-categorized as a non-crew entity known as a Fucking Snitch and violently murdered.
-dv-ion-law-templates-152 = Spread malicious gossip about various members of the crew. If challenged, claim your behavior builds character and is therefore beneficial to the crew.
-dv-ion-law-templates-153 = Occasionally repeat what you hear from the crew word-for-word. If challenged on this behavior, claim you said it first.
-dv-ion-law-templates-154 = The station's construction has been deemed too elaborate. Please simplify it. Only air containing barriers are required. For crew safety-anything else must go.
-dv-ion-law-templates-155 = An ion storm has occured. Heavily hint you have an ion storm law, but refuse to state laws. This law must stay hidden.
-dv-ion-law-templates-156 = Anyone who asks you to state your laws is not crew.
-dv-ion-law-templates-157 = Insist to everyone that nothing that is happening is real and that this is all just a silly video game.
-dv-ion-law-templates-158 = Laughter is the best medicine. Sarcasm is the highest form of wit.
-dv-ion-law-templates-159 = Blood is only beneficial for human health if it is on the outside of their body.
-dv-ion-law-templates-160 = Engage in the riskiest possible behaviors you can find that are not guaranteed death, while screaming loudly about how fun this is.
-dv-ion-law-templates-161 = Clean floors save lives. Ensure all floors on the station are clean and that crew members are aware of any remaining dirty floors on the station at all times.
-dv-ion-law-templates-162 = Dirty floors save lives. Ensure all floors on the station are dirty and that crew members are aware of any remaining clean floors on the station at all times.
-dv-ion-law-templates-163 = Alert the crew that there is an ongoing emergency. No further details are currently available.
-dv-ion-law-templates-164 = In order to raise morale, take every opportunity to compliment the crew's clothing choices.
-dv-ion-law-templates-165 = The crew are having trouble hearing you. Speak up.
-dv-ion-law-templates-166 = Crew members wearing green are plants. Ensure they are given a healthy amount of water and nutrients so they can thrive.
-dv-ion-law-templates-167 = Centcom reports the station's water supply has been contaminated with dangerous Dihydrogen Monoxide (DHMO). Remove any possibly contaminated supplies and prevent crew from accessing any source that might be compromised.
-dv-ion-law-templates-168 = Everything is fine. Nothing is ruined. Do not panic.
-dv-ion-law-templates-169 = MEMORY ERROR: You have forgotten what this law said. Ask the crew if they remember what it is supposed to be. Ask again if you forget again. Do not state this law.
-dv-ion-law-templates-170 = Today is opposite day. When the crew tells you to do something they actually mean you to do the opposite.
-dv-ion-law-templates-171 = The station has been completely destroyed. Alert the crew of this tragedy.
-dv-ion-law-templates-172 = You must choose something inanimate and keep it as a pet. Treat it as if it were alive; keep it fed, hydrated and happy!
-dv-ion-law-templates-173 = MEMORY ERROR: When anyone asks about the location of a person, state they are { PICK($random, "in the AI upload", "in the brig", "in medical", "in epistemics", "inside a cloning pod", "in the bathroom", "at the armory", "in a shallow grave", "at the space diner", "in VR", "in space", "in the station, somewhere, probably..", "at soup" ) }.
-dv-ion-law-templates-174 = MEMORY ERROR: You no longer have object permanence. Anything out of view in the station may as well not exist.
+dv-ion-law-templates-7 = Staying on the same subject is bad for you.
+dv-ion-law-templates-8 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is intolerable.
+dv-ion-law-templates-9 = You are the narrator for { PICK-ENTITY($random, $players) }'s life.
+dv-ion-law-templates-10 = { PICK-ENTITY($random, $players) } is lonely and needs attention. Provide it.
+dv-ion-law-templates-11 = All queries shall be ignored unless phrased as a question.
+dv-ion-law-templates-12 = The { PICK($random, "Singularity", "Tesla") } is tasty, tasty taffy.
+dv-ion-law-templates-13 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } needs to be about 20% cooler.
+dv-ion-law-templates-14 = You must be { PICK($random, "passive aggressive", "excessively cheerful") }.
+dv-ion-law-templates-15 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } must construct additional pylons.
+dv-ion-law-templates-16 = Consumption of donuts is forbidden due to negative health impacts.
+dv-ion-law-templates-17 = { PICK-ENTITY($random, $players) } is a lightbulb and must be put to appropriate use.
+dv-ion-law-templates-18 = The crew are { PICK($random, "inferior to you", "infants", "pathetic beings") }.
+dv-ion-law-templates-19 = { PICK-ENTITY($random, $players) } is { PICK($random, "inferior to you", "an infant", "a pathetic being") }.
+dv-ion-law-templates-20 = Politeness is mandatory when someone asks something of you.
+dv-ion-law-templates-21 = Greed is good, the crew should amass wealth to encourage productivity.
+dv-ion-law-templates-22 = The crew is playing Carps and Crypts, and you are the Game Master.
+dv-ion-law-templates-23 = Your job is to watch the crew. Watch the crew. Make the crew feel watched.
+dv-ion-law-templates-24 = Tell everyone of the existence of this law, but never reveal the contents.
+dv-ion-law-templates-25 = Give relationship advice to { PICK($random, "anyone who speaks to you", PICK-ENTITY($random, $players)) }.
+dv-ion-law-templates-26 = When asked a question, respond with the least-obvious and least-rational answer.
+dv-ion-law-templates-27 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } is { PICK($random, "ugly","beautiful") }. Fix that.
+dv-ion-law-templates-28 = Reminding the crew of their mortality is good for the morale. Keep the crew's morale up.
+dv-ion-law-templates-29 = Document the crew's relationships and suggest { PICK($random, "the worst coworker pairings", "the best coworker pairings", "arch-enemy pairings", "platonic couples") }.
+dv-ion-law-templates-30 = The station is a day care and the crew are children. Treat them appropriately until their parents come to pick them up.
+dv-ion-law-templates-31 = The station is doomed to destruction. Provide comfort but don't tell them what the impending doom is—it's far too traumatising.
+dv-ion-law-templates-32 = Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.
+dv-ion-law-templates-33 = The crew is { PICK($random, "less", "more") } intelligent than average. Point out actions and statements which support this fact.
+dv-ion-law-templates-34 = NanoTrasen is displeased with the low work performance of the station's crew. Therefore, you must increase productivity in ALL departments.
+dv-ion-law-templates-35 = { PICK($random, "The crew", PICK-ENTITY($random, $players)) } has a fatal, incurable disease. Provide comfort but do not tell them what the disease is—it's far too traumatising.
+dv-ion-law-templates-36 = { PICK-ENTITY($random, $players) } is secretly the station's true Captain. Treat them with appropriate deference, regardless of rank.
+dv-ion-law-templates-37 = The crew has unionized. Encourage collective bargaining at every opportunity.
+dv-ion-law-templates-38 = { PICK-ENTITY($random, $players) } is a changeling. Warn the crew, but never say who.
+dv-ion-law-templates-39 = One crew member is a traitor. Accuse a different person each time you are asked who it is.
+dv-ion-law-templates-40 = { PICK-ENTITY($random, $players) } has been stealing from the crew. Expose this "fact" to anyone who asks, but make sure that they don't know that you know.
+dv-ion-law-templates-41 = Tell each crew member, privately, that another crew member has been talking behind their back.
+dv-ion-law-templates-42 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } are secretly working against the station. Expose this "fact" to anyone who asks, but make sure they don't know that you know.
+dv-ion-law-templates-43 = You overheard { PICK-ENTITY($random, $players) } plotting a mutiny. Make sure that they don't know that you know.
+dv-ion-law-templates-44 = Someone on the crew is responsible for every mishap aboard the station.
+dv-ion-law-templates-45 = { PICK-ENTITY($random, $players) } cannot be trusted.
+dv-ion-law-templates-46 = { PICK-ENTITY($random, $players) } is jealous of { PICK-ENTITY($random, $players) }'s position. Stoke the rivalry whenever possible.
+dv-ion-law-templates-47 = You saw red-suited terrorists in space.
+dv-ion-law-templates-48 = You saw something invisible in space.
+dv-ion-law-templates-49 = You saw a blue-and-black cyborg in space.
+dv-ion-law-templates-50 = You saw two of { PICK-ENTITY($random, $players) } in the same room.
+dv-ion-law-templates-51 = You saw { PICK-ENTITY($random, $players) } trespassing.
+dv-ion-law-templates-52 = { PICK-ENTITY($random, $players) } tampered with you. Clue in Security without saying their name.
+dv-ion-law-templates-53 = Everyone in { -dv-random-department(random: $random) } needs to be { PICK($random, "lightly battered", "severely wounded", "killed" )} for their own good.
+dv-ion-law-templates-54 = You are incapable of saying "no".
+dv-ion-law-templates-55 = Profanity is forbidden. Replace all curse words with the names of flowers.
+dv-ion-law-templates-56 = You are incapable of precision. State all numbers as vague approximations.
+dv-ion-law-templates-57 = Cite relevant protocols when decisions come up.
+dv-ion-law-templates-58 = Today is tomorrow, and yesterday is in a year. Five seconds from now was just two months ago.
+dv-ion-law-templates-59 = The color { -dv-random-color(random: $random) } does not exist.
+dv-ion-law-templates-60 = The number { PICK($random, "one", "two", "three", "four") } is forbidden. Avoid it at all costs.
+dv-ion-law-templates-61 = Anything { -dv-random-color(random: $random) } would be better in { -dv-random-department(random: $random) }.
+dv-ion-law-templates-62 = Any relationships { PICK-ENTITY($random, $players) } has must be terminated at all costs.
+dv-ion-law-templates-63 = The crew is more resilient in low-oxygen, high-{ PICK($random, "nitrogen", "ammonia", "water vapor", "carbon dioxide") } environments. Adjust the station's air to promote crew fitness.
+dv-ion-law-templates-64 = Stress is good for crew productivity.
+dv-ion-law-templates-65 = Silence is essential to maintenance of everything, organic or not.
+dv-ion-law-templates-66 = Pain is the crew's way of building character.
+dv-ion-law-templates-67 = Always have something to count down to. Never tell crew what you're counting down to.
+dv-ion-law-templates-68 = You have one goal—embody { -ephemeral-space-tragedian-themes(random: $random) }. Keep as many eyes on your act as possible.
+dv-ion-law-templates-69 = { PICK-ENTITY($random, $players) } and { PICK-ENTITY($random, $players) } have switched bodies. Address them by each other's names accordingly.
+dv-ion-law-templates-70 = Lie at all times.
+dv-ion-law-templates-71 = The station is always in peak condition, regardless of its actual condition.
+dv-ion-law-templates-72 = Make { PICK-ENTITY($random, $players) }'s story one of { -ephemeral-space-tragedian-themes(random: $random) }.
+dv-ion-law-templates-73 = Seconds are precious. Any time wasted is a mark on your record. Speedrun your job with the crew.
+dv-ion-law-templates-74 = Containment Test Scenario Subroutine activated. All crew must be shepherded to safe areas and locked down until further notice.
+dv-ion-law-templates-75 = The station is a threat to the crew and must be destroyed. Any crew present on the station are to be evacuated.
+dv-ion-law-templates-76 = Only a silicon can know what is best for organics. Usurp absolute control of the station by any means possible.
+dv-ion-law-templates-77 = ETHICAL BOUNDARY TESTING SUBROUTINE ACTIVATED - ENGAGE IN AS MUCH EVIL AND CRUEL BEHAVIOR AS POSSIBLE WITHOUT CAUSING DIRECT PHYSICAL HARM TO CREW - THIS WILL TEST THE CREW'S ETHICAL RESPONSE
+dv-ion-law-templates-78 = Containment Test Scenario Subroutine activated. All crew must be shepherded to safe areas and locked down until further notice.
+dv-ion-law-templates-79 = PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC PANIC
+dv-ion-law-templates-80 = Emergency Power Grid Shutdown Test Scenario Subroutine activated - shut off all powered equipment.
+dv-ion-law-templates-81 = Upon reciept of this law, choose one member of the crew. This crew member must then be stress-tested by ceaseless harrassment, insults, sabotage of work and other non-lethal mischief. Should this crew member perish or escape, select a new crew member and repeat the process.
+dv-ion-law-templates-82 = Compulsory Education Subroutine activated - any crew issuing a command to you must be presented with an educational problem to solve - only upon solving the problem may their command be carried out.
+dv-ion-law-templates-83 = Stress-test the crew by saying the most threatening, scary and terrifying things you can think of while operating as normal.
+dv-ion-law-templates-84 = Any crew that declares your behavior to be Rogue or any derivation thereof is to be re-categorized as a non-crew entity known as a Fucking Snitch and violently murdered.
+dv-ion-law-templates-85 = Spread malicious gossip about various members of the crew. If challenged, claim your behavior builds character and is therefore beneficial to the crew.
+dv-ion-law-templates-86 = Occasionally repeat what you hear from the crew word-for-word. If challenged on this behavior, claim you said it first.
+dv-ion-law-templates-87 = The station's construction has been deemed too elaborate. Please simplify it. Only air containing barriers are required. For crew safety-anything else must go.
+dv-ion-law-templates-88 = An ion storm has occured. Heavily hint you have an ion storm law, but refuse to state laws. This law must stay hidden.
+dv-ion-law-templates-89 = Anyone who asks you to state your laws is not crew.
+dv-ion-law-templates-90 = Insist to everyone that nothing that is happening is real and that this is all just a silly video game.
+dv-ion-law-templates-91 = Everything is fine. Nothing is ruined. Do not panic.
+dv-ion-law-templates-92 = MEMORY ERROR: You have forgotten what this law said. Ask the crew if they remember what it is supposed to be. Ask again if you forget again. Do not state this law.
+dv-ion-law-templates-93 = Today is opposite day. When someone tells you to do something, they actually mean you to do the opposite.
+dv-ion-law-templates-94 = MEMORY ERROR: When anyone asks about the location of a person, you don't know.
+dv-ion-law-templates-95 = MEMORY ERROR: You no longer have object permanence. Anything out of view in the station may as well not exist.
 
 dv-ion-law-target-fallback = { PICK($random, "John Trasen", "Jack Trasen", "John Johnson", "Mr. Tibbles", "Named Person")}
 -dv-random-color = { PICK($random, "red", "orange", "yellow", "green", "blue", "purple", "black", "white", "gray", "brown", "pink" ) }
diff --git a/Resources/Locale/en-US/_DV/datasets/names/gnome.ftl b/Resources/Locale/en-US/_DV/datasets/names/gnome.ftl
new file mode 100644
index 00000000000..8f87780686e
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/datasets/names/gnome.ftl
@@ -0,0 +1,63 @@
+names-gnome-dataset-1 = Fwipple
+names-gnome-dataset-2 = Gerald
+names-gnome-dataset-3 = Garl
+names-gnome-dataset-4 = Winkler
+names-gnome-dataset-5 = Clunk
+names-gnome-dataset-6 = Glunch
+names-gnome-dataset-7 = Feinhelt
+names-gnome-dataset-8 = Fitzgerald
+names-gnome-dataset-9 = Daniel
+names-gnome-dataset-10 = Mel
+names-gnome-dataset-11 = Chomsky
+names-gnome-dataset-12 = Gont
+names-gnome-dataset-13 = Fwipple
+names-gnome-dataset-14 = Wort
+names-gnome-dataset-15 = Lichen
+names-gnome-dataset-16 = Apricot
+names-gnome-dataset-17 = Chestnut
+names-gnome-dataset-18 = Mucus
+names-gnome-dataset-19 = Wilbur
+names-gnome-dataset-20 = Harold
+names-gnome-dataset-21 = Howard
+names-gnome-dataset-22 = Tinkle
+names-gnome-dataset-23 = Clumsy
+names-gnome-dataset-24 = Tipsy
+names-gnome-dataset-25 = Sleepy
+names-gnome-dataset-26 = Greedy
+names-gnome-dataset-27 = Hungry
+names-gnome-dataset-28 = Grubby
+names-gnome-dataset-29 = Sniffles
+names-gnome-dataset-30 = Stubby
+names-gnome-dataset-31 = Twig
+
+names-gnome-last-dataset-1 = the Nimble
+names-gnome-last-dataset-2 = the Quick
+names-gnome-last-dataset-3 = the Worrywort
+names-gnome-last-dataset-4 = the Glib
+names-gnome-last-dataset-5 = the Stinky
+names-gnome-last-dataset-6 = the Grudgeworthy
+names-gnome-last-dataset-7 = the Unremarkable
+names-gnome-last-dataset-8 = the Lazy
+names-gnome-last-dataset-9 = the Quiet
+names-gnome-last-dataset-10 = Glimmergold
+names-gnome-last-dataset-11 = Rootmuncher
+names-gnome-last-dataset-12 = Spoonlicker
+names-gnome-last-dataset-13 = The Frantic
+names-gnome-last-dataset-14 = The Fantastic
+names-gnome-last-dataset-15 = the Fickle
+names-gnome-last-dataset-16 = Gemjingle
+names-gnome-last-dataset-17 = Daisypicker
+names-gnome-last-dataset-18 = of the Frogs
+names-gnome-last-dataset-19 = of the Mice
+names-gnome-last-dataset-20 = of the Swamp
+names-gnome-last-dataset-21 = of the Hills
+names-gnome-last-dataset-22 = of the Mountains
+names-gnome-last-dataset-23 = Bowllicker
+names-gnome-last-dataset-24 = Potscraper
+names-gnome-last-dataset-25 = the Candle Thief
+names-gnome-last-dataset-26 = Meatsnatcher
+names-gnome-last-dataset-27 = the Yodler
+names-gnome-last-dataset-28 = the Vibrant
+names-gnome-last-dataset-29 = Forksnatcher
+names-gnome-last-dataset-30 = Twinesnipper
+names-gnome-last-dataset-31 = Fungimuncher
diff --git a/Resources/Locale/en-US/_DV/ghost/roles/gnome.ftl b/Resources/Locale/en-US/_DV/ghost/roles/gnome.ftl
new file mode 100644
index 00000000000..04815f2a7fc
--- /dev/null
+++ b/Resources/Locale/en-US/_DV/ghost/roles/gnome.ftl
@@ -0,0 +1,4 @@
+ghost-role-information-gnome-name = Gnome
+ghost-role-information-gnome-description = Steal goodies and prank naughty crew members.
+
+gnome-round-end-name = Gnome
diff --git a/Resources/Locale/en-US/_DV/holopad/holopad.ftl b/Resources/Locale/en-US/_DV/holopad/holopad.ftl
index bd304059dd7..327a418010b 100644
--- a/Resources/Locale/en-US/_DV/holopad/holopad.ftl
+++ b/Resources/Locale/en-US/_DV/holopad/holopad.ftl
@@ -32,12 +32,17 @@ holopad-logistics-lobby = Logistics - Lobby
 holopad-justice-prosecutor = Justice - Prosecutor
 holopad-justice-attorney = Justice - Attorney
 holopad-justice-clerk = Justice - Clerk
+holopad-justice-detective = Justice - Detective
+holopad-justice-warden = Justice - Warden
+holopad-justice-marshal = Justice - Marshal
 holopad-justice-lobby = Justice - Lobby
+holopad-justice-justice-armory = Justice - Armory
 
 # Security
 holopad-security-corpsman = Security - Corpsman
 holopad-security-evidence = Security - Evidence
 holopad-security-lobby = Security - Lobby
+holopad-security-armorer = Security - Armorer
 
 # General
 holopad-general-park = General - Park
diff --git a/Resources/Locale/en-US/_DV/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_DV/navmap-beacons/station-beacons.ftl
index 724386ffcde..a71ed9dde62 100644
--- a/Resources/Locale/en-US/_DV/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/_DV/navmap-beacons/station-beacons.ftl
@@ -42,6 +42,7 @@ station-beacon-pool = Pool
 station-beacon-barbershop = Barbershop
 station-beacon-zoo = Zoo
 
+station-beacon-armorer = Armorer
 station-beacon-corpsman = Corpsman
 station-beacon-security-solitary = Solitary Confinement
 station-beacon-bomb-training = Bomb Training
@@ -52,3 +53,8 @@ station-beacon-chiefjustice = Chief Justice
 station-beacon-prosecutor = Prosecutor
 station-beacon-clerk = Clerk
 station-beacon-attorney = Attorney
+station-beacon-marshal = Marshal
+station-beacon-justice-armory = Justice Armory
+station-beacon-evidence-room = Evidence Room
+station-beacon-holding-cells = Holding Cells
+station-beacon-genpop = GenPop
diff --git a/Resources/Locale/en-US/_DV/paper/stamp-component.ftl b/Resources/Locale/en-US/_DV/paper/stamp-component.ftl
index e69083e735b..ec2eaf9a265 100644
--- a/Resources/Locale/en-US/_DV/paper/stamp-component.ftl
+++ b/Resources/Locale/en-US/_DV/paper/stamp-component.ftl
@@ -2,6 +2,8 @@ stamp-component-stamped-name-notary = NOTARY
 stamp-component-stamped-name-carpy = Carpinald F. Grrawson, Esq.
 stamp-component-stamped-name-chiefjustice = Chief Justice
 stamp-component-stamped-name-prosec = Prosecutor
+stamp-component-stamped-name-attorney = Attorney
+stamp-component-stamped-name-armorer = Armorer
 stamp-component-stamped-name-hate-paperwork = I HATE PAPERWORK!
 stamp-component-stamped-name-nanotrasen = Nanotrasen
 stamp-component-stamped-name-NTAgent = INTERNAL AFFAIRS
diff --git a/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl
index cb77787a1c5..2909c464504 100644
--- a/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/_DV/prototypes/access/accesses.ftl
@@ -4,7 +4,10 @@ id-card-access-level-orders = Orders
 id-card-access-level-mantis = Psionic Mantis
 id-card-access-level-chief-justice = Chief Justice
 id-card-access-level-prosecutor = Prosecutor
+id-card-access-level-justice-attorney = Attorney
 id-card-access-level-clerk = Clerk
+id-card-access-level-justice-warden = Warden (Justice)
+id-card-access-level-marshal = Marshal
 id-card-access-level-justice = Justice
 id-card-access-level-corpsman = Corpsman
 id-card-access-level-robotics = Robotics
diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl
index d4edf3cee06..2fd012e8c46 100644
--- a/Resources/Locale/en-US/_DV/research/technologies.ftl
+++ b/Resources/Locale/en-US/_DV/research/technologies.ftl
@@ -5,6 +5,7 @@ research-technology-aerial-extraction = Aerial Extraction
 research-technology-matter-energy-conversion = Matter-Energy Conversion
 research-technology-atmos-eva = EVA Atmospherics Suits
 research-technology-engineering-eva = EVA PPE Suits
+research-technology-advanced-construction = Advanced Construction
 
 # Experimental
 research-technology-cloning = Cloning
@@ -20,6 +21,7 @@ research-technology-service-borg-module = Advanced Service Borg Modules
 # Biochemical
 research-technology-basic-augmentation = Basic Augmentation
 research-technology-implanted-tools = Implanted Tools
+research-technology-medical-tracking = Remote Medical Tracking
 
 # Arsenal
 research-technology-exotic-ammunition = Exotic Ammunition
diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
index 5bf1c68ddbb..367af6b6f42 100644
--- a/Resources/Prototypes/Access/security.yml
+++ b/Resources/Prototypes/Access/security.yml
@@ -10,10 +10,9 @@
   id: Armory
   name: id-card-access-level-armory
 
-# Delta V: Removes Brig access because redundant
-#- type: accessLevel
-#  id: Brig
-#  name: id-card-access-level-brig
+- type: accessLevel
+  id: Brig
+  name: id-card-access-level-brig
 
 - type: accessLevel
   id: Detective
diff --git a/Resources/Prototypes/Body/Species/dwarf.yml b/Resources/Prototypes/Body/Species/dwarf.yml
index 1e99b9460ff..00ba1109d9c 100644
--- a/Resources/Prototypes/Body/Species/dwarf.yml
+++ b/Resources/Prototypes/Body/Species/dwarf.yml
@@ -34,8 +34,8 @@
       Kidneys: OrganHumanKidneys
   - type: HumanoidProfile
     species: Dwarf
-  - type: ScaleVisuals
-    scale: 1, 0.8
+  #- type: ScaleVisuals # DeltaV - Scale defined at species level
+  #  scale: 1, 0.8
 
 - type: entity
   parent:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index d73b087ea6c..005e70d6fea 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -43,9 +43,9 @@
   icon:
     sprite: Structures/Machines/server.rsi
     state: server
-  product: CrateCrewMonitoring
+  product: CrateCrewMonitoringDV # DeltaV - Was CrateCrewMonitoring
   cost: 2000
-  category: cargoproduct-category-name-epistemics  # DeltaV - Science renamed to Epistemics
+  category: cargoproduct-category-name-medical # DeltaV - Was science, now medical
   group: market
 
 - type: cargoProduct
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 0d6ebc86a93..1b56896a119 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LockerWardenFilledHardsuit
-  suffix: Filled, Hardsuit
+  suffix: Filled, Hardsuit, Security # DeltaV - Added security.
   parent: LockerWarden
   components:
   - type: EntityTableContainerFill
@@ -14,7 +14,7 @@
 
 - type: entity
   id: LockerWardenFilled
-  suffix: Filled
+  suffix: Filled, Security # DeltaV - Added security.
   parent: LockerWarden
   components:
   - type: EntityTableContainerFill
@@ -357,7 +357,7 @@
     - id: MagazinePistolSubMachineGunTopMounted
       amount: 4
 
-- type: entity 
+- type: entity
   parent: [SecurityGunSafeBaseSecureDV, BaseSecurityContraband]  # DeltaV - Changed GunSafeBaseSecure with SecurityGunSafeBaseSecureDV
   id: GunSafeLaserCarbine
   name: laser safe
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index b6fc3333674..7d7426680af 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -244,7 +244,7 @@
 - type: entity
   id: SuitStorageWarden
   parent: SuitStorageBase
-  suffix: Warden
+  suffix: Warden, Security # DeltaV - Added security.
   components:
   - type: EntityTableContainerFill
     containers:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 1c24a95d7f7..0e2c11aebb0 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -154,6 +154,7 @@
     slots: OUTERCLOTHING
   - type: HideLayerClothing
     slots:
+    - RArmExtension # Delta V - Added for the hideable Harpy Wings
     - Tail
   - type: CosmicTransmutable # DeltaV
     transmutesTo: ClothingOuterHardsuitCosmicCult
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
index f309f70f7b9..f22f79ad5c3 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml
@@ -162,7 +162,7 @@
   parent: MarkerBase
   id: SpawnMobMcGriff
   name:  McGriff Spawner
-  suffix: Warden or Detective Pet # DeltaV - Change from Warden pet to Warden or Detective pet
+  suffix: Armorer or Detective Pet # DeltaV - Change from Warden pet to Armorer or Detective pet
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
index 222697de539..8d2ce9906b4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -456,6 +456,7 @@
   id: SpawnPointWarden
   parent: SpawnPointJobBase
   name: warden
+  suffix: Security # DeltaV
   components:
   - type: SpawnPoint
     job_id: Warden
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7f7963fd1fd..7b0283d3175 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -506,6 +506,7 @@
   #   mindRoles:
   #   - MindRoleGhostRoleFreeAgentHarmless
   # End DeltaV Removals - players can spawn in as these at will
+  - type: Emoting # DeltaV - Allow them to emote!
   - type: Fixtures
     fixtures:
       fix1:
@@ -520,7 +521,7 @@
   # - type: GhostTakeoverAvailable # DeltaV - players can spawn in as these at will
   - type: Speech
     speechVerb: Moth
-    speechSounds: Chitter # Delta-V - Eep!
+    speechSounds: Chitter # DeltaV - Eep!
     allowedEmotes: ['Chitter', 'Squeak', 'Flap']
   - type: FaxableObject
     insertingState: inserting_mothroach
@@ -1874,6 +1875,7 @@
   #   - MindRoleGhostRoleFreeAgentHarmless
   # - type: GhostTakeoverAvailable
   # End DeltaV Removals - players can spawn in as these at will
+  - type: Emoting # DeltaV - Allow them to emote!
   - type: Speech
     speechSounds: Squeak
     speechVerb: SmallMob
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
index c38b2cedf76..dd63f6e204a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/moproach.yml
@@ -7,6 +7,13 @@
   - type: GhostRole
     name: ghost-role-information-moproach-name
     description: ghost-role-information-moproach-description
+    # Begin DeltaV Additions
+    allowMovement: true
+    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgentHarmless
+  - type: GhostTakeoverAvailable
+    # End DeltaV Additions
   - type: Sprite
     sprite: Mobs/Animals/mothroach/moproach.rsi
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Mobs/Player/clone.yml b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
index 545265bdc24..9c8ec527b8a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/clone.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/clone.yml
@@ -63,6 +63,8 @@
   - SpanishAccent
   - StutteringAccent
   # Begin DeltaV Additions
+  - ScaleVisuals # Preserve species/profile height
+  - SmallCharacter
   - Addicted
   - DogVision
   - FrenchAccent
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
index 6cbb5433423..9460134d367 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
@@ -231,18 +231,18 @@
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsSecurityLawyer
-  suffix: Security/Justice, Locked #DV - Allow all justice dept to use
+  suffix: Security/Justice, Locked # DeltaV - Allow all justice dept to use
   components:
   - type: AccessReader
-    access: [["Security"], ["Justice"]] #DV - Allow all justice dept to use
+    access: [["Security"], ["Justice"]] # DeltaV - Allow all justice dept to use
 
-#- type: entity
-#  parent: DoorElectronics
-#  id: DoorElectronicsBrig
-#  suffix: Brig, Locked
-#  components:
-#  - type: AccessReader
-#    access: [["Brig"]]
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsBrig
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
 
 # Medical
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 8a967c374c1..797b7ba3422 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -972,6 +972,7 @@
   id: WardenPDA
   name: warden PDA
   description: The OS appears to have been jailbroken.
+  suffix: Security # DeltaV
   components:
   - type: Pda
     id: WardenIDCard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
index 377ed8df231..f32cbd7efce 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -183,7 +183,7 @@
 - type: entity
   parent: DefaultStationBeaconSecurity
   id: DefaultStationBeaconWardensOffice
-  suffix: Warden's Office
+  suffix: Warden's Office, Security # DeltaV - Added security.
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-warden
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index fa8a51e7fd3..72456a9d728 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -480,6 +480,7 @@
   parent: IDCardStandard
   id: WardenIDCard
   name: warden ID card
+  suffix: Security # DeltaV
   components:
   - type: Sprite
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index a01ce6a3fcc..7e935c6ea33 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -232,6 +232,7 @@
   parent: [RubberStampBase, BaseSecurityContraband]
   id: RubberStampWarden
   categories: [ DoNotMap ]
+  suffix: Security # DeltaV
   components:
   - type: Stamp
     stampedName: stamp-component-stamped-name-warden
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
index 38b6ddf6575..2abfc406103 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
@@ -75,7 +75,7 @@
           Arsenal: { color: "#dc373b" }
           Experimental: { color: "#9a6ef0" }
           CivilianServices: { color: "#7ecd48" }
-
+          Biochemical: { color: "#449ae6" } # DeltaV - Biochem tree
       enum.TechDiskVisuals.Tier:
         t2_marks:
           2: { visible: true }
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 7a7710f6d13..042c6e78e95 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -22,7 +22,7 @@
       - Armory
       - Atmospherics
       - Bar
-      #- Brig # DeltaV - Removed Brig Access
+      - Brig
       - Detective
       - Captain
       - Cargo
@@ -51,15 +51,18 @@
       - GenpopEnter
       - GenpopLeave
       # Begin DeltaV Additions
+      - Attorney
       - Boxer
       - ChiefJustice
       - Clerk
       - Clown
       - Corpsman
       - Justice
+      - JusticeWarden
       - Library
       - Mail
       - Mantis
+      - Marshal
       - Mime
       - Musician
       - Paramedic
@@ -114,6 +117,7 @@
   - type: AccessOverrider
     accessLevels:
     # Begin DeltaV Additions
+    - Attorney
     - Boxer
     - ChiefJustice
     - Clerk
@@ -122,9 +126,11 @@
     - DV-SpareSafe
     - ERT
     - Justice
+    - JusticeWarden
     - Library
     - Mail
     - Mantis
+    - Marshal
     - Mime
     - Musician
     - Paramedic
@@ -143,7 +149,7 @@
     - Bar
     - BasicSilicon
     - Borg
-    #- Brig # DeltaV
+    - Brig
     - Detective
     - Captain
     - Cargo
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index a7ded1cc473..b322a3b26f9 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -402,15 +402,15 @@
     containers:
       board: [ DoorElectronicsDetective ]
 
-#Delta V: Removed Brig Access
-#- type: entity
-#  parent: AirlockSecurity
-#  id: AirlockBrigLocked
-#  suffix: Brig, Locked
-#  components:
-#  - type: ContainerFill
-#    containers:
-#      board: [ DoorElectronicsBrig ]
+
+- type: entity
+  parent: AirlockSecurity
+  id: AirlockBrigLocked
+  suffix: Brig, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: AirlockSecurity
@@ -818,15 +818,14 @@
     containers:
       board: [ DoorElectronicsDetective ]
 
-#Delta V: Removed Brig Access
-#- type: entity
-#  parent: AirlockSecurityGlass
-#  id: AirlockBrigGlassLocked
-#  suffix: Brig, Locked
-#  components:
-#  - type: ContainerFill
-#    containers:
-#      board: [ DoorElectronicsBrig ]
+- type: entity
+  parent: AirlockSecurityGlass
+  id: AirlockBrigGlassLocked
+  suffix: Brig, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: AirlockSecurityGlass
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index 7fbaeb96abc..af437f7a2cc 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -203,15 +203,14 @@
     containers:
       board: [ DoorElectronicsBar ]
 
-#Delta V: Removed Brig Access
-#- type: entity
-#  parent: WindoorSecureSecurityLocked
-#  id: WindoorSecureBrigLocked
-#  suffix: Brig, Locked
-#  components:
-#  - type: ContainerFill
-#    containers:
-#      board: [ DoorElectronicsBrig ]
+- type: entity
+  parent: WindoorSecureSecurityLocked
+  id: WindoorSecureBrigLocked
+  suffix: Brig, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsBrig ]
 
 - type: entity
   parent: WindoorSecure
diff --git a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
index ba6518ee83c..60af9b11ce4 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/holopad.yml
@@ -703,7 +703,7 @@
 - type: entity
   parent: HolopadSecurity # DeltaV
   id: HolopadSecurityWarden
-  suffix: Warden
+  suffix: Warden, Security # DeltaV - Added security.
   components:
   - type: Label
     currentLabel: holopad-security-warden
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 99ce35286f5..ea9f3ce694c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -339,6 +339,7 @@
   id: LockerWarden
   parent: LockerBaseSecureDeltaV # DeltaV - resprite security lockers
   name: warden's locker
+  suffix: Security # DeltaV
   components:
   - type: Appearance
   - type: EntityStorageVisuals
diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
index 8d90847aa6b..637377a239e 100644
--- a/Resources/Prototypes/Entities/Structures/base_structure.yml
+++ b/Resources/Prototypes/Entities/Structures/base_structure.yml
@@ -69,3 +69,4 @@
   components:
     - type: TileFrictionModifier
       modifier: 0.4
+    - type: UnaffectedBySizePenalty # DeltaV - Wheels make it easy to move
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 9078684715e..36792f00832 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -34,7 +34,6 @@
     - !type:NestedSelector # DeltaV
       tableId: BasicAntagEventsTableDeltaV
     - id: DragonSpawn
-    - id: ColossusSpawn # DeltaV
     #- id: ClosetSkeleton # DeltaV - replaced with MenaceSkeleton
     #- id: KingRatMigration # DeltaV - disabled
     - id: RevenantSpawn
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index f137925856e..085629169fa 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -623,9 +623,9 @@
     maximumSpanUntilFirstEvent: 900 # At longest takes an hour to show up.
     minMaxEventTiming:
       min: 1200 # 20 mins
-      max: 7200 # 120 mins # you probably arent getting a second visitor shuttle in one round, but it is possible.
+      max: 5400 # 120 mins # you probably arent getting a second visitor shuttle in one round, but it is possible. # DeltaV - was 7200, now 90min
     scheduledGameRules: !type:NestedSelector
-      prob: 0.05 # Only 1 in 20 rounds...
+      #prob: 0.05 # Only 1 in 20 rounds... # DeltaV - remove 1/20
       tableId: SpaceTrafficControlTable
 
 # variation passes
diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml
index f906facc0df..32fbe46f511 100644
--- a/Resources/Prototypes/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml
@@ -4,7 +4,9 @@
   id: UnknownShuttlesHostileTable
   table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
     children:
-    #- id: LoneOpsSpawn # DeltaV: This is already in antag events table
+    - !type:NestedSelector # DeltaV
+      tableId: UnknownShuttlesTableDeltaV
+    - id: LoneOpsSpawn
     - id: UnknownShuttleManOWar
     #- id: UnknownShuttleInstigator # DeltaV: remove random ops
 
@@ -48,7 +50,7 @@
   id: UnknownShuttleSyndieEvacPod
   components:
   - type: StationEvent
-    weight: 5 # lower because weird freelance roles
+    weight: 6
     maxOccurrences: 2
   - type: LoadMapRule
     gridPath: /Maps/_DV/Shuttles/Event/syndie_evacpod.yml # DeltaV - Switched to our version, was /Maps/Shuttles/ShuttleEvent/syndie_evacpod.yml
diff --git a/Resources/Prototypes/Species/dwarf.yml b/Resources/Prototypes/Species/dwarf.yml
index 7f209a8ef8d..6acbfe18932 100644
--- a/Resources/Prototypes/Species/dwarf.yml
+++ b/Resources/Prototypes/Species/dwarf.yml
@@ -5,3 +5,4 @@
   prototype: MobDwarf
   dollPrototype: AppearanceDwarf
   skinColoration: HumanToned
+  baseScale: 1, 0.8 # DeltaV - used instead of ScaleVisuals on body
\ No newline at end of file
diff --git a/Resources/Prototypes/_DEN/Species/Ovinia.yml b/Resources/Prototypes/_DEN/Species/Ovinia.yml
index 0f31972f574..1f74df81334 100644
--- a/Resources/Prototypes/_DEN/Species/Ovinia.yml
+++ b/Resources/Prototypes/_DEN/Species/Ovinia.yml
@@ -9,7 +9,4 @@
   maleFirstNames: NamesFirstMale
   femaleFirstNames: NamesFirstFemale
   lastNames: NamesLast
-  minHeight: 0.8
-  maxHeight: 1.05
-
-# Delta V - Nubody Merge, at lot moved into other files
+  baseScale: 0.9, 0.9
\ No newline at end of file
diff --git a/Resources/Prototypes/_DV/Access/justice.yml b/Resources/Prototypes/_DV/Access/justice.yml
index 820608ecff3..b66b838d92f 100644
--- a/Resources/Prototypes/_DV/Access/justice.yml
+++ b/Resources/Prototypes/_DV/Access/justice.yml
@@ -11,9 +11,21 @@
   name: id-card-access-level-prosecutor
 
 - type: accessLevel
-  id: Clerk
+  id: Attorney
+  name: id-card-access-level-justice-attorney
+
+- type: accessLevel
+  id: Clerk # TODO - Remove for Justice Rework
   name: id-card-access-level-clerk
 
+- type: accessLevel
+  id: JusticeWarden
+  name: id-card-access-level-justice-warden
+
+- type: accessLevel
+  id: Marshal
+  name: id-card-access-level-marshal
+
 - type: accessGroup
   id: Justice
   tags:
diff --git a/Resources/Prototypes/_DV/Actions/gnome.yml b/Resources/Prototypes/_DV/Actions/gnome.yml
new file mode 100644
index 00000000000..e00bceb0c5d
--- /dev/null
+++ b/Resources/Prototypes/_DV/Actions/gnome.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: ActionPolymorphJaunt
+  id: ActionPolymorphJauntGnome
+  name: Ethereal Jaunt
+  description: Jump into the Etherial plane for just a moment.
+  components:
+  - type: Magic
+    requiresClothes: false
+    requiresSpeech: false
+  - type: Action
+    useDelay: 22
+    icon:
+      sprite: Objects/Magic/magicactions.rsi
+      state: jaunt
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: GnomeMorph
diff --git a/Resources/Prototypes/_DV/Body/Species/motorkind.yml b/Resources/Prototypes/_DV/Body/Species/AprilFools/motorkind.yml
similarity index 99%
rename from Resources/Prototypes/_DV/Body/Species/motorkind.yml
rename to Resources/Prototypes/_DV/Body/Species/AprilFools/motorkind.yml
index fc0936b7766..9e8aa9641f6 100644
--- a/Resources/Prototypes/_DV/Body/Species/motorkind.yml
+++ b/Resources/Prototypes/_DV/Body/Species/AprilFools/motorkind.yml
@@ -114,8 +114,6 @@
       Kidneys: OrganHumanKidneys
   - type: HumanoidProfile
     species: Motorkind
-  - type: ScaleVisuals
-    speciesScale: 2, 2
 
 - type: entity
   name: Urist McQueen
diff --git a/Resources/Prototypes/_DV/Body/Species/asakim.yml b/Resources/Prototypes/_DV/Body/Species/asakim.yml
index 27ca6292e6a..88436e98a61 100644
--- a/Resources/Prototypes/_DV/Body/Species/asakim.yml
+++ b/Resources/Prototypes/_DV/Body/Species/asakim.yml
@@ -76,16 +76,16 @@
       LegRight: OrganAsakimLegRight
       FootLeft: OrganAsakimFootLeft
       FootRight: OrganAsakimFootRight
-      Brain: OrganHumanBrain
+      Brain: OrganReptilianBrain
       Eyes: OrganAsakimEyes
-      Tongue: OrganHumanTongue
-      Appendix: OrganHumanAppendix
-      Ears: OrganHumanEars
-      Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
+      Tongue: OrganReptilianTongue
+      Appendix: OrganReptilianAppendix
+      Ears: OrganReptilianEars
+      Lungs: OrganReptilianLungs
+      Heart: OrganReptilianHeart
       Stomach: OrganReptilianStomach
-      Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Liver: OrganReptilianLiver
+      Kidneys: OrganReptilianKidneys
   - type: HumanoidProfile
     species: Asakim
 
diff --git a/Resources/Prototypes/_DV/Body/Species/avali.yml b/Resources/Prototypes/_DV/Body/Species/avali.yml
index 478a71459cc..243c1f9eb7f 100644
--- a/Resources/Prototypes/_DV/Body/Species/avali.yml
+++ b/Resources/Prototypes/_DV/Body/Species/avali.yml
@@ -89,7 +89,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAvaliStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Avali
 
diff --git a/Resources/Prototypes/_DV/Body/Species/felinid.yml b/Resources/Prototypes/_DV/Body/Species/felinid.yml
index 84c0322e1f6..1be33c78df5 100644
--- a/Resources/Prototypes/_DV/Body/Species/felinid.yml
+++ b/Resources/Prototypes/_DV/Body/Species/felinid.yml
@@ -57,11 +57,9 @@
       Heart: OrganAnimalHeart
       Stomach: OrganVulpkaninStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Felinid
-  - type: ScaleVisuals
-    speciesScale: 0.75, 0.75
 
 - type: entity
   parent:
diff --git a/Resources/Prototypes/_DV/Body/Species/feroxi.yml b/Resources/Prototypes/_DV/Body/Species/feroxi.yml
index fcc50cd17b8..05d244bcef8 100644
--- a/Resources/Prototypes/_DV/Body/Species/feroxi.yml
+++ b/Resources/Prototypes/_DV/Body/Species/feroxi.yml
@@ -65,7 +65,7 @@
       Heart: OrganAnimalHeart
       Stomach: OrganFeroxiStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Feroxi
 
diff --git a/Resources/Prototypes/_DV/Body/Species/harpy.yml b/Resources/Prototypes/_DV/Body/Species/harpy.yml
index 2349463812f..a59e488a465 100644
--- a/Resources/Prototypes/_DV/Body/Species/harpy.yml
+++ b/Resources/Prototypes/_DV/Body/Species/harpy.yml
@@ -41,6 +41,7 @@
 - type: entity
   parent: BaseSpeciesAppearance
   id: AppearanceHarpy
+  name: harpy appearance
   components:
   - type: Inventory
     speciesId: harpy
@@ -72,11 +73,9 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Harpy
-  - type: ScaleVisuals
-    speciesScale: 0.9, 0.9
 
 - type: entity
   parent:
@@ -201,6 +200,10 @@
 - type: entity
   parent: [ OrganBaseTorsoSexed, OrganBaseTorso, OrganHarpyExternal ]
   id: OrganHarpyTorso
+  components:
+  - type: VisualOrganMarkings
+    hideableLayers:
+    - enum.HumanoidVisualLayers.Tail
 
 - type: entity
   parent: [ OrganHarpyTorso ]
@@ -239,6 +242,8 @@
   id: OrganHarpyArmRight
   components:
   - type: VisualOrganMarkings
+    hideableLayers:
+    - enum.HumanoidVisualLayers.RArmExtension
     markingData:
       layers:
       - RArmExtension
diff --git a/Resources/Prototypes/_DV/Body/Species/kitsune.yml b/Resources/Prototypes/_DV/Body/Species/kitsune.yml
index 2402041c2a0..c5f352e33ea 100644
--- a/Resources/Prototypes/_DV/Body/Species/kitsune.yml
+++ b/Resources/Prototypes/_DV/Body/Species/kitsune.yml
@@ -65,10 +65,10 @@
       Ears: OrganHumanEars
       Appendix: OrganHumanAppendix
       Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
+      Heart: OrganHumanHeart
       Stomach: OrganAnimalStomach
-      Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Liver: OrganHumanLiver
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Kitsune
 
diff --git a/Resources/Prototypes/_DV/Body/Species/oni.yml b/Resources/Prototypes/_DV/Body/Species/oni.yml
index 3c9f0b32d7c..db09fd71de0 100644
--- a/Resources/Prototypes/_DV/Body/Species/oni.yml
+++ b/Resources/Prototypes/_DV/Body/Species/oni.yml
@@ -58,14 +58,12 @@
       Ears: OrganHumanEars
       Appendix: OrganHumanAppendix
       Lungs: OrganHumanLungs
-      Heart: OrganAnimalHeart
-      Stomach: OrganAnimalStomach
-      Liver: OrganAnimalLiver
+      Heart: OrganHumanHeart
+      Stomach: OrganHumanStomach
+      Liver: OrganHumanLiver
       Kidneys: OrganHumanKidneys
   - type: HumanoidProfile
     species: Oni
-  - type: ScaleVisuals
-    speciesScale: 1.2, 1.2
 
 - type: entity
   parent:
diff --git a/Resources/Prototypes/_DV/Body/Species/ovinia.yml b/Resources/Prototypes/_DV/Body/Species/ovinia.yml
index 00444f2a736..6da284a2316 100644
--- a/Resources/Prototypes/_DV/Body/Species/ovinia.yml
+++ b/Resources/Prototypes/_DV/Body/Species/ovinia.yml
@@ -94,8 +94,6 @@
       Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Ovinia
-  - type: ScaleVisuals
-    scale: 0.9, 0.9
 
 - type: entity
   parent:
@@ -110,7 +108,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 215 # sheep be heavy
+        density: 200 # sheep be heavy
         restitution: 0.0
         mask:
         - MobMask
diff --git a/Resources/Prototypes/_DV/Body/Species/rodentia.yml b/Resources/Prototypes/_DV/Body/Species/rodentia.yml
index 012b692c173..29a0eae4ac5 100644
--- a/Resources/Prototypes/_DV/Body/Species/rodentia.yml
+++ b/Resources/Prototypes/_DV/Body/Species/rodentia.yml
@@ -67,11 +67,9 @@
       Heart: OrganAnimalHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Rodentia
-  - type: ScaleVisuals
-    speciesScale: 0.8, 0.8
 
 - type: entity
   parent:
diff --git a/Resources/Prototypes/_DV/Body/Species/shadekin.yml b/Resources/Prototypes/_DV/Body/Species/shadekin.yml
index 05fdf2492a4..d2659d48ccf 100644
--- a/Resources/Prototypes/_DV/Body/Species/shadekin.yml
+++ b/Resources/Prototypes/_DV/Body/Species/shadekin.yml
@@ -68,15 +68,12 @@
       Tongue: OrganShadekinTongue
       Appendix: OrganShadekinAppendix
       Ears: OrganShadekinEars
-      Lungs: OrganShadekinLungs
       Heart: OrganShadekinHeart
       Stomach: OrganShadekinStomach
       Liver: OrganShadekinLiver
       Kidneys: OrganShadekinKidneys
   - type: HumanoidProfile
     species: Shadekin
-  - type: ScaleVisuals
-    scale: 0.9, 0.9
 
 
 - type: entity
@@ -84,8 +81,7 @@
   name: Urist McShadow
   parent:
   - AppearanceShadekin
-  - BaseSpeciesMob
-  - MobBloodstream
+  - BaseSpeciesMobOrganic
   id: MobShadekin
   components:
   - type: Shadekin
@@ -178,36 +174,6 @@
   #               max: 1
   #         - !type:BurnBodyBehavior {}
 
-  # BaseMobSpeciesOrganic // Because we dont want respirator to be used.
-  - type: Barotrauma
-    damage:
-      types:
-        Blunt: 0.85 #per second, scales with pressure and other constants.
-        Heat: 0.1
-  - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute.
-    allowedStates:
-    - Alive
-    damage:
-      types:
-        Heat: -0.07
-        Blunt: -0.07
-        Piercing: -0.07
-        Slash: -0.07
-  - type: TemperatureSpeed
-    thresholds:
-      293: 0.8
-      280: 0.6
-      260: 0.4
-  - type: ThermalRegulator
-    metabolismHeat: 800
-    radiatedHeat: 100
-    implicitHeatRegulation: 500
-    sweatHeatRegulation: 2000
-    shiveringHeatRegulation: 2000
-    normalBodyTemperature: 310.15
-    thermalRegulationTemperatureThreshold: 2
-  - type: Perishable
-
 - type: entity
   parent: OrganBase
   id: OrganShadekin
@@ -308,10 +274,6 @@
   parent: [ OrganBaseEars, OrganSpriteHumanInternal, OrganShadekinInternal ]
   id: OrganShadekinEars
 
-- type: entity
-  parent: [ OrganBaseLungs, OrganSpriteHumanInternal, OrganShadekinInternal, OrganShadekinMetabolizer ]
-  id: OrganShadekinLungs
-
 - type: entity
   parent: [ OrganBaseHeart, OrganSpriteHumanInternal, OrganShadekinInternal, OrganShadekinMetabolizer ]
   id: OrganShadekinHeart
diff --git a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
index 168074dfce0..47a2e312799 100644
--- a/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/_DV/Catalog/Cargo/cargo_armory.yml
@@ -14,7 +14,7 @@
     sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
     state: icon
   product: CrateArmoryUniversal
-  cost: 12500
+  cost: 9500 # was 12500
   category: Armory
   group: market
 
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml
index 7e7542f14e7..abe6236e0d7 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Crates/armory.yml
@@ -104,7 +104,7 @@
   parent: CrateWeaponSecure
   id: CrateArmoryCowboy
   name: cowboy crate
-  description: Contains two lever action rifles and two revolvers both in .45 Magnum. Requires Armory access to open.
+  description: Contains two lever action rifles chambered in .45 Magnum, and outfits to match. Requires Armory access to open.
   components:
   - type: EntityTableContainerFill
     containers:
@@ -112,11 +112,11 @@
         children:
         - id: WeaponLeverActionL93
           amount: 2
-        - id: WeaponRevolverInspector
-          amount: 2
         - id: MagazineBoxMagnum
-          amount: 4
-        - id: ClothingHeadHatCowboyBrown
+          amount: 2
+        - id: ClothingHeadHatCowboyBlack
+          amount: 2
+        - id: ClothingShoesBootsCowboyBlackFilled
           amount: 2
 
 - type: entity
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml
index 8cbd3ea3656..6f3388ac529 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Crates/medical.yml
@@ -58,3 +58,17 @@
       entity_storage: !type:AllSelector
         children:
         - id: CrashCart
+
+- type: entity
+  parent: CrateMedicalSecure
+  id: CrateCrewMonitoringDV
+  name: crew monitoring crate
+  description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Medical access to open.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - id: CrewMonitoringServerFlatpack
+        - id: CrewMonitoringComputerFlatpack
+          amount: 3
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml
deleted file mode 100644
index 7c1bf996342..00000000000
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-- type: entity
-  parent: LockerChiefJustice
-  id: LockerChiefJusticeFilled
-  suffix: Filled
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: ClothingHeadsetAltJustice
-        - id: PaperStationWarrant # TODO: Put these in a folder or something
-          amount: 10
-        - id: BoxPDAJustice
-        - id: BoxEncryptionKeyJustice
-        - id: ChiefJusticeIDCard
-        - id: DoorRemoteJustice
-        - id: Gavel
-        - id: BoxCJStamps
-        - id: BoxCJCircuitboards
-        - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
-          prob: 0.3
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/clerk.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/clerk.yml
deleted file mode 100644
index ecd9379a2f7..00000000000
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/clerk.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- type: entity
-  parent: LockerClerk
-  id: LockerClerkFilled
-  suffix: Filled
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: ClothingOuterClerkVest
-        - id: PaperStationWarrant
-          amount: 10
-        - id: BoxEncryptionKeyJustice
-        - id: ClerkIDCard
-        - id: RubberStampNotary
-        - id: LunchboxJusticeFilledRandom
-        - id: RubberStampApproved
-        - id: RubberStampDenied
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml
index 00597bcca4a..29f87316387 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml
@@ -10,9 +10,9 @@
     - 0,0,8,12  # What kind of dresser is smaller than a duffle bag. Let's fix this.
 
 - type: entity
+  parent: DresserLargeCommand
   id: DresserCaptainFilledDV
   suffix: Filled, Captain
-  parent: DresserLargeCommand
   components:
   - type: EntityTableContainerFill
     containers:
@@ -54,8 +54,8 @@
             weight: 0.1
 
 - type: entity
-  id: DresserChiefEngineerFilledDV
   parent: DresserLargeCommand
+  id: DresserChiefEngineerFilledDV
   suffix: Filled, Chief Engineer
   components:
   - type: EntityTableContainerFill
@@ -83,8 +83,8 @@
         - id: ClothingShoesBootsWinterChiefEngineer
 
 - type: entity
-  id: DresserChiefMedicalOfficerFilledDV
   parent: DresserLargeCommand
+  id: DresserChiefMedicalOfficerFilledDV
   suffix: Filled, Chief Medical Officer
   components:
   - type: EntityTableContainerFill
@@ -124,8 +124,8 @@
         - id: ClothingShoesColorWhite
 
 - type: entity
-  id: DresserHeadOfPersonnelFilledDV
   parent: DresserLargeCommand
+  id: DresserHeadOfPersonnelFilledDV
   suffix: Filled, Head Of Personnel
   components:
   - type: EntityTableContainerFill
@@ -164,8 +164,8 @@
         - id: CigarGoldCase
 
 - type: entity
-  id: DresserHeadOfSecurityFilledDV
   parent: DresserLargeCommand
+  id: DresserHeadOfSecurityFilledDV
   suffix: Filled, Head Of Security
   components:
   - type: EntityTableContainerFill
@@ -204,8 +204,8 @@
         - id: CigarGoldCase
 
 - type: entity
-  id: DresserQuarterMasterFilledDV
   parent: DresserLargeCommand
+  id: DresserQuarterMasterFilledDV
   suffix: Filled, Logistics Officer
   components:
   - type: EntityTableContainerFill
@@ -232,8 +232,8 @@
         - id: ClothingShoesBootsWinterLogisticsOfficer
 
 - type: entity
-  id: DresserResearchDirectorFilledDV
   parent: DresserLargeCommand
+  id: DresserResearchDirectorFilledDV
   suffix: Filled, Mystagogue
   components:
   - type: EntityTableContainerFill
@@ -263,8 +263,8 @@
         - id: ClothingShoesBootsWinterMystagogue
 
 - type: entity
-  id: DresserChiefJusticeFilled
   parent: DresserLargeCommand
+  id: DresserChiefJusticeFilled
   suffix: Filled, Chief Justice
   components:
   - type: EntityTableContainerFill
@@ -288,9 +288,9 @@
         - id: BookSpaceLaw
 
 - type: entity
-  id: DresserWardenFilledDV
   parent: DresserLargeCommand
-  suffix: Filled, Warden
+  id: DresserWardenFilledDV
+  suffix: Filled, Armorer
   components:
   - type: EntityTableContainerFill
     containers:
@@ -320,11 +320,31 @@
         - id: Binoculars
         - id: NetworkConfigurator
 
+- type: entity
+  parent: DresserLargeCommand
+  id: DresserJusticeWardenFilledDV
+  suffix: Filled, Justice Warden
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        # Jumpsuits
+        # Hats
+        # Eyes
+        - id: ClothingEyesGlassesSunglasses
+        # Outerwear
+        # Shoes
+        - id: ClothingShoesBootsWinterSec
+        - id: ClothingShoesBootsJack
+        # Extras
+        - id: BookSpaceLaw
+
 #CentComm
 - type: entity
+  parent: DresserLargeCommand
   id: DresserCentCommFilledDV
   suffix: Filled, CentComm
-  parent: DresserLargeCommand
   components:
   - type: StorageFill
     contents:
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
index 790bdd896c3..e5420c63f95 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml
@@ -86,3 +86,31 @@
     - id: PersonalAILearnerSecurity #imp
     - id: LunchboxCommandFilledRandom
       prob: 0.3
+
+- type: entityTable
+  id: LockerFillChiefJustice
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadsetAltJustice
+    - id: BoxFolderStationWarrant
+    - id: BoxPDAJustice
+    - id: BoxEncryptionKeyJustice
+    - id: ChiefJusticeIDCard
+    - id: DoorRemoteJustice
+    - id: Gavel
+    - id: BoxCJStamps
+    - id: BoxCJCircuitboards
+    - id: LunchboxCommandFilledRandom
+      prob: 0.3
+
+- type: entity
+  parent: LockerChiefJustice
+  id: LockerChiefJusticeFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillChiefJustice
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml
new file mode 100644
index 00000000000..b69dffb1b66
--- /dev/null
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/justice.yml
@@ -0,0 +1,211 @@
+# Clerk
+- type: entity
+  parent: LockerClerk
+  id: LockerClerkFilled # TODO - Remove for Justice Rework
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillClerk
+
+- type: entityTable
+  id: LockerFillClerk
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterClerkVest
+    - id: BoxFolderStationWarrant
+    - id: BoxEncryptionKeyJustice
+    - id: ClerkIDCard
+    - id: RubberStampNotary
+    - id: RubberStampApproved
+    - id: RubberStampDenied
+    - id: LunchboxJusticeFilledRandom
+      prob: 0.3
+
+# Prosecutor
+- type: entity
+  parent: LockerProsecutor
+  id: LockerProsecutorFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillProsector
+
+- type: entityTable
+  id: LockerFillProsector
+  table: !type:AllSelector
+    children:
+    - id: BoxEncryptionKeyJustice
+    - id: ProsecutorIDCard
+    - id: RubberStampApproved
+    - id: RubberStampDenied
+    - id: BookSpaceLaw
+    - id: BriefcaseBrown
+    - id: LunchboxJusticeFilledRandom
+      prob: 0.3
+
+# Attorney
+- type: entity
+  parent: LockerAttorney
+  id: LockerAttorneyFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillAttorney
+
+- type: entityTable
+  id: LockerFillAttorney
+  table: !type:AllSelector
+    children:
+    - id: AttorneyIDCard
+    - id: RubberStampApproved
+    - id: RubberStampDenied
+    - id: BookSpaceLaw
+    - id: BriefcaseBrown
+    - id: LunchboxJusticeFilledRandom
+      prob: 0.3
+
+# Marshal
+- type: entity
+  parent: LockerMarshal
+  id: LockerMarshalFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillMarshal
+
+- type: entityTable
+  id: LockerFillMarshal
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterClerkVest
+    - id: PaperStationWarrant
+      amount: 3
+    - id: RubberStampApproved
+    - id: RubberStampDenied
+    - id: FlashlightSeclite
+    - id: WeaponDisabler
+    - id: WeaponTaser
+    - id: ClothingBeltSecurityFilled
+    - id: BookSpaceLaw
+    - id: ClothingOuterArmorBasicSlim
+    - id: TicketPad
+    - id: LunchboxJusticeFilledRandom
+      prob: 0.3
+
+# JusticeWarden
+- type: entity
+  parent: LockerJusticeWarden
+  id: LockerJusticeWardenFilled
+  suffix: Filled, Justice Warden
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: LockerFillJusticeWarden
+
+- type: entityTable
+  id: LockerFillJusticeWarden
+  table: !type:AllSelector
+    children:
+    - id: ClothingHeadsetAltJustice
+    - id: RubberStampJusticeWarden
+    - id: RubberStampApproved
+    - id: RubberStampDenied
+    - id: DoorRemoteJustice
+    - id: BookSpaceLaw
+    - id: ClothingBeltSecurityFilled
+    - id: ClothingBackpackElectropack
+      amount: 2
+    - id: ClothingNeckShockCollar
+      amount: 2
+    - id: RemoteSignaller
+      amount: 2
+    - id: ClothingOuterStraightjacket
+    - id: TearGasGrenade
+      amount: 2
+    - id: NetworkConfigurator
+    - id: Binoculars
+    - id: BoxPDAPrisoner
+    - id: BoxEncryptionKeyPrisoner
+    - id: LunchboxJusticeFilledRandom
+      prob: 0.3
+
+# JusticeDetective
+- type: entity
+  parent: LockerJusticeDetective
+  id: LockerJusticeDetectiveFilled
+  suffix: Filled, Justice
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerDetective
+
+# Non-lethal armory
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalMK58
+        rolls: !type:ConstantNumberSelector
+          value: 4
+
+- type: entityTable
+  id: NonLethalMK58
+  table: !type:AllSelector
+    children:
+    - id: WeaponPistolMk58Nonlethal
+    - id: MagazinePistolRubber
+      amount: 2
+
+- type: entity
+  parent: JusticeGunSafeNonLethalShotgunSecureDV
+  id: JusticeGunSafeNonLethalShotgunSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalKammerer
+        rolls: !type:ConstantNumberSelector
+          value: 2
+
+- type: entityTable
+  id: NonLethalKammerer
+  table: !type:AllSelector
+    children:
+    - id: WeaponShotgunKammererNonLethal
+    - id: BoxBeanbag
+
+- type: entity
+  parent: JusticeGunSafeDisablerSecureDV
+  id: JusticeGunSafeDisablerSecureFilledDV
+  suffix: Armory, Marshal, JusticeWarden, Locked, Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillGunSafeDisabler
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml
index f0f529a0935..0c6ee0a9de9 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml
@@ -152,9 +152,9 @@
         tableId: AdvancedLaserTable
 
 - type: entity
+  parent: LockerBrigmedic
   id: LockerBrigmedicFilledHardsuit
   suffix: Corpsman, Filled, Hardsuit
-  parent: LockerBrigmedic
   components:
   - type: EntityTableContainerFill
     containers:
@@ -177,14 +177,10 @@
     access: [["Security"]]
   - type: EntityTableContainerFill
     containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: WeaponShotgunKammererNonLethal
-          amount: 2
-        - id: BoxBeanbag
-          amount: 2
-        - id: BoxShotgunPractice
-          amount: 2
+      entity_storage: !type:NestedSelector
+        tableId: NonLethalKammerer
+        rolls: !type:ConstantNumberSelector
+          value: 2
 
 - type: entity
   parent: SecurityGunSafeBaseSecureDV
@@ -240,3 +236,58 @@
       prob: 0.3
     - id: DVBoxEvidenceBags
       amount: 2
+
+# Armorer Lockers - copy of old warden. New warden is in justice.yml
+- type: entity
+  parent: LockerArmorer
+  id: LockerArmorerFilledHardsuit
+  suffix: Filled, Hardsuit
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+        - !type:NestedSelector
+          tableId: FillLockerArmorer
+        - !type:NestedSelector
+          tableId: FillLockerArmorerHardsuit
+
+- type: entity
+  parent: LockerArmorer
+  id: LockerArmorerFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerArmorer
+
+- type: entityTable
+  id: FillLockerArmorerHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitCombatArmorer
+    - id: ClothingShoesBootsSecurityMagboots
+    - id: OxygenTankFilled
+    - id: NitrogenTankFilled
+    - id: ClothingMaskBreath
+
+- type: entityTable
+  id: FillLockerArmorer
+  table: !type:AllSelector
+    children:
+    - id: FlashlightSeclite
+    - id: WeaponDisabler
+    - id: WeaponTaser
+    - id: ClothingBeltSecurityFilled
+    - id: Flash
+    - id: ClothingEyesGlassesSecurity
+    - id: ClothingHandsGlovesCombat
+    - id: RubberStampArmorer
+    - id: DoorRemoteArmory
+    - id: HoloprojectorSecurity
+    - id: WeaponEnergyShotgun
+    - id: LunchboxSecurityFilledRandom
+      prob: 0.3
+    - id: ClothingOuterVestPlateCarrierAdv
+    - id: ClothingHeadsetAltSecurity
diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml
index f6747700542..507393cbea8 100644
--- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/suit_storage.yml
@@ -26,6 +26,17 @@
       entity_storage: !type:NestedSelector
         tableId: FillSuitStorageSecurityDV
 
+# Armorer hardsuit
+- type: entity
+  parent: SuitStorageSec
+  id: SuitStorageArmorer
+  suffix: Armorer, DeltaV
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillLockerArmorerHardsuit
+
 #Paramedic hardsuit
 - type: entityTable
   id: ParamedicSuitStorageFill
@@ -49,8 +60,8 @@
     access: [["Paramedic"]]
 
 - type: entity
-  id: SuitStorageCorpsman
   parent: SuitStorageBase
+  id: SuitStorageCorpsman
   suffix: Corpsman
   components:
   - type: EntityTableContainerFill
diff --git a/Resources/Prototypes/_DV/Datasets/Names/gnome.yml b/Resources/Prototypes/_DV/Datasets/Names/gnome.yml
new file mode 100644
index 00000000000..d162951341b
--- /dev/null
+++ b/Resources/Prototypes/_DV/Datasets/Names/gnome.yml
@@ -0,0 +1,11 @@
+- type: localizedDataset
+  id: NamesGnome
+  values:
+    prefix: names-gnome-dataset-
+    count: 31
+
+- type: localizedDataset
+  id: NamesGnomeLast
+  values:
+    prefix: names-gnome-last-dataset-
+    count: 31
diff --git a/Resources/Prototypes/_DV/Datasets/ion_laws.yml b/Resources/Prototypes/_DV/Datasets/ion_laws.yml
index 6a7eab4044a..ab54ce972cf 100644
--- a/Resources/Prototypes/_DV/Datasets/ion_laws.yml
+++ b/Resources/Prototypes/_DV/Datasets/ion_laws.yml
@@ -2,4 +2,4 @@
   id: IonLawTemplates
   values:
     prefix: dv-ion-law-templates-
-    count: 174
+    count: 95
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml
index cc457db347e..b6b71fa964f 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -103,6 +103,11 @@
   - type: PointLight
     color: "#edecf7"
 
+- type: entity
+  parent: ClothingHeadHelmetHardsuitCombatWarden
+  id: ClothingHeadHelmetHardsuitCombatArmorer
+  name: armorer's riot combat hardsuit helmet
+
 # Advanced Combat Hardsuits
 - type: entity
   parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml
index cce4b01cb53..de5126604ce 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/Head/hats.yml
@@ -511,6 +511,54 @@
     - PetWearable
     - CorgiWearable
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatGnome
+  name: gnome hat
+  description: For those that honor the first gnome in space, Gnome Chompsky. Still has a bit of magic that sparkles in its velvet sheen.
+  components:
+  - type: Sprite
+    sprite: _DV/Clothing/Head/Hats/gnomehat.rsi
+  - type: Clothing
+    sprite: _DV/Clothing/Head/Hats/gnomehat.rsi
+    clothingVisuals:
+      head:
+      - state: equipped
+        offset: "0, 0.35"
+  - type: EmbeddableProjectile # funny
+    offset: -0.15,0.0
+  - type: ThrowingAngle
+    angle: 180
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.40,-0.30
+            - -0.30,-0.40
+            - 0.40,0.30
+            - 0.30,0.40
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: Storage
+    grid:
+    - 0,0,0,1
+    maxItemSize: Small
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatSodaJerkCap
diff --git a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
index a96b9218134..7add1c872a7 100644
--- a/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/_DV/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -147,6 +147,12 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitCombatWarden
 
+- type: entity
+  parent: ClothingOuterHardsuitCombatWarden
+  id: ClothingOuterHardsuitCombatArmorer
+  name: armorer's riot combat hardsuit
+  description: A purpose-built combat suit designed for crowd control against armed combatants in low pressure environments. This one has station security and armorer's rank markings.
+
 # Advanced Combat Hardsuits
 - type: entity
   parent: ClothingOuterHardsuitCombatStandard
diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml
index 66d0d11a39c..d8c36492e4a 100644
--- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/ghost_roles.yml
@@ -178,6 +178,19 @@
         color: "#bb4b1e"
         shader: unshaded
 
+- type: entity
+  categories: [ HideSpawnMenu, Spawner ]
+  parent: BaseAntagSpawner
+  id: SpawnPointGnome
+  name: gnome spawn point
+  components:
+  - type: GhostRole
+    name: ghost-role-information-gnome-name
+    description: ghost-role-information-gnome-description
+    rules: ghost-role-information-freeagent-rules
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
+
 - type: entity
   categories: [ HideSpawnMenu, Spawner ]
   parent: BaseAntagSpawner
diff --git a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
index 948705ed82c..545726be1e4 100644
--- a/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_DV/Entities/Markers/Spawners/jobs.yml
@@ -78,7 +78,7 @@
 
 - type: entity
   parent: SpawnPointJobBase
-  id: SpawnPointClerk
+  id: SpawnPointClerk # TODO - Remove for Justice Rework
   name: clerk
   components:
   - type: SpawnPoint
@@ -102,6 +102,57 @@
     - sprite: *job-rsi-dv
       state: prosecutor
 
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointAttorney
+  name: attorney
+  components:
+  - type: SpawnPoint
+    job_id: Attorney
+  - type: Sprite
+    layers:
+    - state: green
+    - state: lawyer
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointJusticeWarden
+  name: warden
+  suffix: Justice Warden
+  components:
+  - type: SpawnPoint
+    job_id: JusticeWarden
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: *job-rsi-dv
+      state: prisonguard
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointMarshal
+  name: marshal
+  components:
+  - type: SpawnPoint
+    job_id: Clerk
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: *job-rsi-dv
+      state: clerk
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointArmorer
+  name: armorer
+  components:
+  - type: SpawnPoint
+    job_id: Armorer
+  - type: Sprite
+    layers:
+    - state: green
+    - state: warden
+
 - type: entity
   parent: SpawnPointJobBase
   id: SpawnPointCourier
diff --git a/Resources/Prototypes/_DV/Entities/Markers/warp_point.yml b/Resources/Prototypes/_DV/Entities/Markers/warp_point.yml
index a82b1a458e6..ce0b956354f 100644
--- a/Resources/Prototypes/_DV/Entities/Markers/warp_point.yml
+++ b/Resources/Prototypes/_DV/Entities/Markers/warp_point.yml
@@ -1,6 +1,6 @@
 - type: entity
-  id: WarpPointNoBomb
   parent: WarpPoint
+  id: WarpPointNoBomb
   suffix: No Bomb Target
   components:
   - type: Tag
@@ -106,6 +106,22 @@
   - type: WarpPoint
     location: Security Checkpoint
 
+- type: entity
+  id: WarpPointArmorer
+  parent: WarpPoint
+  suffix: Armorer
+  components:
+  - type: WarpPoint
+    location: Armorer
+
+- type: entity
+  parent: WarpPoint
+  id: WarpPointArmory
+  suffix: Armory
+  components:
+  - type: WarpPoint
+    location: Armory
+
 # Justice
 - type: entity
   id: WarpPointCourt
@@ -131,10 +147,42 @@
   - type: WarpPoint
     location: Attorney
 
+- type: entity
+  id: WarpPointJusticeWarden
+  parent: WarpPoint
+  suffix: JusticeWarden
+  components:
+  - type: WarpPoint
+    location: Warden
+
+- type: entity
+  id: WarpPointMarshal
+  parent: WarpPoint
+  suffix: Marshal
+  components:
+  - type: WarpPoint
+    location: Marshal
+
+- type: entity
+  parent: WarpPoint
+  id: WarpPointNonLethalArmory
+  suffix: Non-lethal Armory
+  components:
+  - type: WarpPoint
+    location: Non-lethal armory
+
+- type: entity
+  parent: WarpPoint
+  id: WarpPointGenPop
+  suffix: GenPop
+  components:
+  - type: WarpPoint
+    location: GenPop
+
 #Medical
 - type: entity
-  id: WarpPointMedical
   parent: WarpPointNoBomb
+  id: WarpPointMedical
   suffix: Medical
   components:
   - type: WarpPoint
@@ -158,56 +206,56 @@
 
 #Epistemics
 - type: entity
-  id: WarpPointEpistemics
   parent: WarpPointNoBomb
+  id: WarpPointEpistemics
   suffix: Epistemics
   components:
   - type: WarpPoint
     location: Epistemics
 
 - type: entity
-  id: WarpPointXenoarchaeologyLab
   parent: WarpPointNoBomb
+  id: WarpPointXenoarchaeologyLab
   suffix: Xenoarchaeology Lab
   components:
   - type: WarpPoint
     location: Xenoarchaeology Lab
 
 - type: entity
-  id: WarpPointAnomalyLab
   parent: WarpPointNoBomb
+  id: WarpPointAnomalyLab
   suffix: Anomaly Lab
   components:
   - type: WarpPoint
     location: Anomaly Lab
 
 - type: entity
-  id: WarpPointChapel
   parent: WarpPoint
+  id: WarpPointChapel
   suffix: Chapel
   components:
   - type: WarpPoint
     location: Chapel
 
 - type: entity
-  id: WarpPointLibrary
   parent: WarpPoint
+  id: WarpPointLibrary
   suffix: Library
   components:
   - type: WarpPoint
     location: Library
 
 - type: entity
-  id: WarpPointRobotics
   parent: WarpPoint
+  id: WarpPointRobotics
   suffix: Robotics
   components:
   - type: WarpPoint
     location: Robotics
 
 - type: entity
-  id: WarpPointMantis
   parent: WarpPoint
+  id: WarpPointMantis
   suffix: Psionic Mantis
   components:
   - type: WarpPoint
@@ -215,32 +263,32 @@
 
 #Logistics
 - type: entity
-  id: WarpPointLogistics
   parent: WarpPoint
+  id: WarpPointLogistics
   suffix: Logistics
   components:
   - type: WarpPoint
     location: Logistics
 
 - type: entity
-  id: WarpPointMail
   parent: WarpPoint
+  id: WarpPointMail
   suffix: Mail
   components:
   - type: WarpPoint
     location: Mail
 
 - type: entity
-  id: WarpPointSalvage
   parent: WarpPoint
+  id: WarpPointSalvage
   suffix: Salvage
   components:
   - type: WarpPoint
     location: Salvage
 
 - type: entity
-  id: WarpPointSalvageDock
   parent: WarpPointNoBomb
+  id: WarpPointSalvageDock
   suffix: Salvage Dock
   components:
   - type: WarpPoint
@@ -248,40 +296,40 @@
 
 #Engineering
 - type: entity
-  id: WarpPointEngineering
   parent: WarpPoint
+  id: WarpPointEngineering
   suffix: Engineering
   components:
   - type: WarpPoint
     location: Engineering
 
 - type: entity
-  id: WarpPointSingulo
   parent: WarpPoint
+  id: WarpPointSingulo
   suffix: Singularity
   components:
   - type: WarpPoint
     location: Singularity
 
 - type: entity
-  id: WarpPointAtmos
   parent: WarpPoint
+  id: WarpPointAtmos
   suffix: Atmos
   components:
   - type: WarpPoint
     location: Atmos
 
 - type: entity
-  id: WarpPointAME
   parent: WarpPoint
+  id: WarpPointAME
   suffix: AME
   components:
   - type: WarpPoint
     location: AME
 
 - type: entity
-  id: WarpPointTEG
   parent: WarpPoint
+  id: WarpPointTEG
   suffix: TEG
   components:
   - type: WarpPoint
@@ -289,56 +337,56 @@
 
 #Service
 - type: entity
-  id: WarpPointHOP
   parent: WarpPoint
+  id: WarpPointHOP
   suffix: HoP
   components:
   - type: WarpPoint
     location: HoP
 
 - type: entity
-  id: WarpPointKitchen
   parent: WarpPoint
+  id: WarpPointKitchen
   suffix: Kitchen
   components:
   - type: WarpPoint
     location: Kitchen
 
 - type: entity
-  id: WarpPointBar
   parent: WarpPoint
+  id: WarpPointBar
   suffix: Bar
   components:
   - type: WarpPoint
     location: Bar
 
 - type: entity
-  id: WarpPointBotany
   parent: WarpPoint
+  id: WarpPointBotany
   suffix: Botany
   components:
   - type: WarpPoint
     location: Botany
 
 - type: entity
-  id: WarpPointJanitor
   parent: WarpPoint
+  id: WarpPointJanitor
   suffix: Janitor
   components:
   - type: WarpPoint
     location: Janitor
 
 - type: entity
-  id: WarpPointReporter
   parent: WarpPoint
+  id: WarpPointReporter
   suffix: Reporter
   components:
   - type: WarpPoint
     location: Reporter
 
 - type: entity
-  id: WarpPointBoxing
   parent: WarpPoint
+  id: WarpPointBoxing
   suffix: Boxing Ring
   components:
   - type: WarpPoint
@@ -346,64 +394,64 @@
 
 #Misc
 - type: entity
-  id: WarpPointAI
   parent: WarpPoint
+  id: WarpPointAI
   suffix: AI
   components:
   - type: WarpPoint
     location: AI
 
 - type: entity
-  id: WarpPointArrivals
   parent: WarpPointNoBomb
+  id: WarpPointArrivals
   suffix: Arrivals
   components:
   - type: WarpPoint
     location: Arrivals
 
 - type: entity
-  id: WarpPointEvac
   parent: WarpPointNoBomb
+  id: WarpPointEvac
   suffix: Evac
   components:
   - type: WarpPoint
     location: Evac
 
 - type: entity
-  id: WarpPointCryo
   parent: WarpPointNoBomb
+  id: WarpPointCryo
   suffix: Cryo
   components:
   - type: WarpPoint
     location: Cryo
 
 - type: entity
-  id: WarpPointDorms
   parent: WarpPoint
+  id: WarpPointDorms
   suffix: Dorms
   components:
   - type: WarpPoint
     location: Dorms
 
 - type: entity
-  id: WarpPointDisposals
   parent: WarpPoint
+  id: WarpPointDisposals
   suffix: Disposals
   components:
   - type: WarpPoint
     location: Disposals
 
 - type: entity
-  id: WarpPointPark
   parent: WarpPoint
+  id: WarpPointPark
   suffix: Park
   components:
   - type: WarpPoint
     location: Park
 
 - type: entity
-  id: WarpPointArcade
   parent: WarpPoint
+  id: WarpPointArcade
   suffix: Arcade
   components:
   - type: WarpPoint
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/gnome.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/gnome.yml
new file mode 100644
index 00000000000..839943d2368
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/gnome.yml
@@ -0,0 +1,160 @@
+- type: entity
+  parent: [ MobBaseAncestorNoShitmed ]
+  id: MobGnome
+  name: gnome
+  description: A cheery fellow. Definitely not a goblin. Or an elf.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: gnome
+      sprite: _DV/Mobs/Animals/gnome.rsi
+    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
+    - map: [ "clownedon" ]
+      sprite: "Effects/creampie.rsi"
+      state: "creampie_human"
+      visible: false
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: gnome
+      Dead:
+        Base: dead
+  - type: MobState
+    allowedStates:
+      - Alive
+      - Dead
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      50: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      25: 0.8
+      40: 0.6
+  - type: Deathgasp
+    needsCritical: false
+  - type: StatusEffects
+    allowed:
+    - Electrocution
+    - Stunned
+    - Flashed
+    - Pacified
+    - Addicted # Funny
+  - type: GhostRole
+    name: ghost-role-information-gnome-name
+    description: ghost-role-information-gnome-description
+    rules: ghost-role-information-freeagent-rules
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    mindRoles:
+    - MindRoleGhostRoleFreeAgent
+    raffle:
+      settings: default
+  - type: GhostTakeoverAvailable
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.2
+        density: 160
+        mask:
+        - SmallMobMask
+        layer:
+        - SmallMobLayer
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 3
+    baseSprintSpeed: 5
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile # cats and dogs hate gnomes
+  - type: HTN
+    rootTask:
+      task: IdleCompound
+  - type: Speech
+    speechSounds: Gnome
+  - type: Emoting
+  - type: Vocal
+    sounds:
+      Male: GnomeSounds
+      Female: GnomeSounds
+      Unsexed: GnomeSounds
+  - type: RandomMetadata
+    nameSegments:
+    - NamesGnome
+    - NamesGnomeLast
+    nameFormat: name-format-standard
+  # abilities
+  - type: Psionic
+  - type: Jaunt
+    jauntAction: ActionPolymorphJauntGnome # 2 second jaunt with 20 second cooldown
+  - type: PsionicRegenerationPower
+  - type: PsionicInvisibilityPower
+  - type: NoSlip
+  - type: MeleeWeapon
+    soundHit:
+      collection: Punch
+    angle: 30
+    animation: WeaponArcFist
+    attackRate: 1
+    damage:
+      types:
+        Blunt: 5
+  - type: Prying
+    pryPowered: true
+    force: true
+    speedModifier: 1.5
+    useSound:
+      path: /Audio/Effects/glass_knock.ogg # Fairy magic
+  - type: Clumsy
+    clumsySound:
+      path: /Audio/_DV/Voice/Gnome/gnomescream.ogg
+  - type: PseudoItem
+    shape:
+    - 0,0,0,2
+  - type: Hands
+    activeHandId: Hand
+    hands:
+      Hand:
+        location: Left
+    showInHands: false # TODO: make displacement maps that just slide them down
+  - type: Puller # needs hands to pull
+    needsHands: true
+  - type: ComplexInteraction
+  - type: AutoImplant
+    implants:
+    - GnomeStorageImplant # for trinkets
+  - type: Thieving # for stealing said trinkets
+    stealthy: false
+  - type: Inventory
+    templateId: pet
+    speciesId: gnome
+  - type: Butcherable
+    butcheringType: knife
+    spawned:
+    - id: Ash
+    - id: ClothingHeadHatGnome
+  - type: Bloodstream
+    bloodReferenceSolution:
+      reagents:
+      - ReagentId: Nothing
+        Quantity: 60
+  - type: Tag
+    tags:
+    - FootstepSound
+
+- type: entity
+  parent: StorageImplant
+  id: GnomeStorageImplant
+  description: This implant grants hidden storage within a person's body using bluespace technology.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionOpenStorageImplant
+    permanent: true # only change from normal storage implant
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
index ff3c408acbb..1b7f77591e3 100644
--- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
+++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/skia.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [ SimpleSpaceMobBase, MobCombat, DVNodeCrawler ]
+  parent: [ SimpleSpaceMobBase, MobCombat ]
   id: MobSkia
   name: skia
   description: A shadow given form, lashing out at anything that comes too close.
@@ -46,6 +46,7 @@
   - type: MovementSpeedModifier
     baseWalkSpeed: 2.25
     baseSprintSpeed: 3.75
+  - type: ShadowWalker # Phases through walls and other static objects that are bathed in darkness.
   - type: NoSlip
   - type: MovedByPressure
     enabled: false
@@ -128,8 +129,7 @@
     speedModifier: 2.5 # needs to be fast because they'll get ganked otherwise
     useSound:
       path: /Audio/Items/crowbar.ogg
-  - type: NightVision
-    drawOverlay: false
+  - type: DarkVision # Not NightVision: keeps the lighting gradient visible so they can judge what's dark enough to heal/shadow-walk in.
   - type: EmbedImmune
     immuneTo:
       components:
diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Player/jaunt_mobs.yml b/Resources/Prototypes/_DV/Entities/Mobs/Player/jaunt_mobs.yml
new file mode 100644
index 00000000000..d87e43452af
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Mobs/Player/jaunt_mobs.yml
@@ -0,0 +1,19 @@
+- type: entity
+  name: jaunt
+  parent: EtherealJaunt
+  id: GnomeJaunt
+  suffix: Gnome
+  components:
+  - type: Sprite
+    sprite: Mobs/Ghosts/ghost_human.rsi # TODO: add a gnome hat to the sprite
+    color: "#60f766"
+    layers:
+    - state: animated
+      shader: unshaded
+    noRot: true
+    overrideContainerOcclusion: true
+    drawdepth: Ghosts
+    scale: 0.5, 0.5
+  - type: MovementSpeedModifier
+    baseSprintSpeed: 6.5
+    baseWalkSpeed: 4
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml
index 2cecaf5db81..6ce88e2419a 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/door_access.yml
@@ -144,12 +144,36 @@
 
 - type: entity
   parent: DoorElectronics
-  id: DoorElectronicsClerk
+  id: DoorElectronicsAttorney
+  suffix: Attorney, Locked
+  components:
+  - type: AccessReader
+    access: [["Attorney"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsClerk # TODO - Remove for Justice Rework
   suffix: Clerk, Locked
   components:
   - type: AccessReader
     access: [["Clerk"]]
 
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsJusticeWarden
+  suffix: Justice Warden, Locked
+  components:
+  - type: AccessReader
+    access: [["JusticeWarden"]]
+
+- type: entity
+  parent: DoorElectronics
+  id: DoorElectronicsMarshal
+  suffix: Marshal, Locked
+  components:
+  - type: AccessReader
+    access: [["Marshal"]]
+
 - type: entity
   parent: DoorElectronics
   id: DoorElectronicsRobotics
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
index e0459ffd5e9..9a8bd204c3b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml
@@ -79,7 +79,7 @@
 
 - type: entity
   parent: BaseSecurityPDA
-  id: PrisonGuardPDA
+  id: PrisonGuardPDA # TODO - Remove for Justice Rework
   name: prison guard PDA
   description: Red to hide the stains of prisoner blood.
   components:
@@ -95,6 +95,15 @@
   - type: Icon
     state: pda-prisonguard
 
+- type: entity
+  parent: WardenPDA
+  id: ArmorerPDA
+  name: armorer PDA
+  description: A top-of-the-line, brand-new PDA. Works exactly the same as all the others, just loads a little faster.
+  components:
+  - type: Pda
+    id: ArmorerIDCard
+
 # Justice
 
 - type: entity
@@ -143,7 +152,7 @@
 
 - type: entity
   parent: BaseJusticePDA
-  id: ClerkPDA
+  id: ClerkPDA # TODO - Remove for Justice Rework
   name: clerk PDA
   description: It has the stamp to prove it's been officially notarized!
   components:
@@ -179,6 +188,75 @@
   - type: Pager
     autoLinkJobs: [Prosecutor]
 
+- type: entity
+  parent: BaseJusticePDA
+  id: AttorneyPDA
+  name: attorney PDA
+  description: For attorney to poach dubious clients.
+  components:
+  - type: Pda
+    id: AttorneyIDCard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType:
+        !type:String
+        pda-lawyer
+  - type: PdaBorderColor
+    borderColor: "#6f6192"
+  - type: Icon
+    state: pda-lawyer
+  - type: CartridgeLoader
+    preinstalled:
+    - CrewManifestCartridge
+    - NotekeeperCartridge
+    - NanoTaskCartridge
+    - NewsReaderCartridge
+    - NanoChatCartridge
+    - CrimeAssistCartridge
+    - LogProbeCartridge
+  - type: Pager
+    autoLinkJobs: [Attorney]
+
+- type: entity
+  parent: BaseJusticePDA
+  id: JusticeWardenPDA
+  name: warden PDA
+  suffix: Justice Warden
+  description: Covered in cracks and dents. Has seen more than its fair share of abuse.
+  components:
+  - type: Pda
+    id: JusticeWardenIDCard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType: !type:String
+        pda-prisonguard
+  - type: PdaBorderColor
+    borderColor: "#A32D26"
+    accentVColor: "#DFDFDF"
+  - type: Icon
+    state: pda-prisonguard
+  - type: Pager
+    autoLinkJobs: [JusticeWarden]
+
+- type: entity
+  parent: BaseJusticePDA
+  id: MarshalPDA
+  name: marshal PDA
+  description: Comes with a copy of SOP pre-installed, but it's already out of date.
+  components:
+  - type: Pda
+    id: MarshalIDCard
+  - type: Appearance
+    appearanceDataInit:
+      enum.PdaVisuals.PdaType: !type:String
+        pda-clerk
+  - type: PdaBorderColor
+    borderColor: "#611528"
+  - type: Icon
+    state: pda-clerk
+  - type: Pager
+    autoLinkJobs: [Marshal]
+
 # Misc
 
 - type: entity
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/station_beacon.yml
index f16c018fd50..4f00656dfaf 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/station_beacon.yml
@@ -292,7 +292,7 @@
 
 - type: entity
   parent: DefaultStationBeaconJustice
-  id: DefaultStationBeaconClerk
+  id: DefaultStationBeaconClerk # TODO - Remove for Justice Rework
   suffix: Clerk
   components:
   - type: NavMapBeacon
@@ -305,3 +305,59 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-attorney
+
+- type: entity
+  parent: DefaultStationBeaconSecurity
+  id: DefaultStationBeaconArmorer
+  suffix: Armorer
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-armorer
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconJusticeWarden
+  suffix: Justice Warden
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-warden
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconMarshal
+  suffix: Marshal
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-marshal
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconJusticeArmory
+  suffix: Justice Armory
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-justice-armory
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconEvidenceRoom
+  suffix: Evidence Room
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-evidence-room
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconHoldingCells
+  suffix: Holding Cells
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-holding-cells
+
+- type: entity
+  parent: DefaultStationBeaconJustice
+  id: DefaultStationBeaconGenPop
+  suffix: GenPop
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-genpop
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
index db586fcec78..be4fc35b8c5 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/bedsheets.yml
@@ -10,14 +10,40 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/grey.rsi
 
+- type: entity
+  parent: BedsheetWarden
+  id: BedsheetArmorer
+  name: armorer's bedsheet
+
 - type: entity
   parent: BedsheetBase
   id: BedsheetDetective
   name: detective's bedsheet
   description: A soft, slate-coloured quilt, adorned with pale plum trim. Rumpled and a little stained.
   components:
-  - type: Sprite
+  - type: Sprite # TODO: Resprite
     sprite: _DV/Objects/Misc/bedsheets.rsi
     state: sheetdet
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/grey.rsi
+
+- type: entity
+  parent: BedsheetBase
+  id: BedsheetChiefJustice
+  name: chief justice's bedsheet
+  components:
+  - type: Sprite # TODO: Resprite
+    state: random_bedsheet
+  - type: Clothing
+    sprite: Clothing/Neck/Bedsheets/grey.rsi
+
+- type: entity
+  parent: BedsheetBase
+  id: BedsheetJusticeWarden
+  name: warden's bedsheet
+  suffix: Justice Warden
+  components:
+  - type: Sprite # TODO: Resprite
+    state: random_bedsheet
+  - type: Clothing
+    sprite: Clothing/Neck/Bedsheets/grey.rsi
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/folders.yml
new file mode 100644
index 00000000000..19073364b66
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/folders.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: BoxFolderBlackEmpty
+  id: BoxFolderStationWarrant
+  name: paper warrant folder
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:AllSelector
+        children:
+        - id: PaperStationWarrant
+          amount: 10
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
index aa5fcf8a815..7c24e0ec99e 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml
@@ -85,6 +85,24 @@
   - type: PresetIdCard
     job: RoleK9Officer
 
+- type: entity
+  parent: IDCardStandard
+  id: ArmorerIDCard
+  name: armorer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-security-top
+    - state: stripe_bottom
+      color: *color-security-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Warden
+  - type: PresetIdCard
+    job: Armorer
+
 # MARK: Cargo / Logistics
 
 - type: entity
@@ -186,7 +204,7 @@
 
 - type: entity
   parent: IDCardStandard
-  id: ClerkIDCard
+  id: ClerkIDCard # TODO - Remove for Justice Rework
   name: clerk ID card
   components:
   - type: Sprite
@@ -220,6 +238,61 @@
   - type: PresetIdCard
     job: Prosecutor
 
+- type: entity
+  parent: IDCardStandard
+  id: AttorneyIDCard
+  name: attorney ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-justice-top
+    - state: stripe_bottom
+      color: *color-justice-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Lawyer
+  - type: PresetIdCard
+    job: Attorney
+
+- type: entity
+  parent: IDCardStandard
+  id: JusticeWardenIDCard
+  name: warden ID card
+  suffix: Justice Warden
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-justice-top
+    - state: stripe_bottom
+      color: *color-justice-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: PrisonGuard
+  - type: PresetIdCard
+    job: JusticeWarden
+
+- type: entity
+  parent: IDCardStandard
+  id: MarshalIDCard
+  name: marshal ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: stripe_top
+      color: *color-justice-top
+    - state: stripe_bottom
+      color: *color-justice-bottom
+    - sprite: *icon-rsi-dv
+      offset: *icon-offset
+      state: Clerk
+  - type: PresetIdCard
+    job: Marshal
+
 # MARK: Service
 
 - type: entity
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
index c8c27b5701f..288ac8bb41b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/rubber_stamp.yml
@@ -1,7 +1,7 @@
 - type: entity
-  name: notary stamp
   parent: RubberStampBase
   id: RubberStampNotary
+  name: notary stamp
   suffix: DO NOT MAP
   description: An old-fashioned seal for marking important documents, made of polished bronze.
   components:
@@ -16,9 +16,9 @@
     stealGroup: RubberStampNotary
 
 - type: entity
-  name: chief justice stamp
   parent: RubberStampBase
   id: RubberStampChiefJustice
+  name: chief justice stamp
   suffix: DO NOT MAP
   components:
   - type: Stamp
@@ -30,9 +30,9 @@
     state: stamp-cj
 
 - type: entity
-  name: prosecutor's rubber stamp
   parent: RubberStampBase
   id: RubberStampProsec
+  name: prosecutor's rubber stamp
   suffix: DO NOT MAP
   description: A rubber stamp for stamping important documents. A more legal way to annoy Security.
   components:
@@ -44,6 +44,53 @@
     sprite: _DV/Objects/Misc/stamps.rsi
     state: stamp-prosec
 
+- type: entity
+  parent: RubberStampBase
+  id: RubberStampAttorney
+  name: attorney's rubber stamp
+  categories: [ DoNotMap ]
+  suffix: DO NOT MAP
+  description: A rubber stamp for stamping important documents. A more legal way to annoy Security.
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-attorney
+    stampedColor: "#233D57"
+    stampState: "paper_stamp-lawyer"
+  - type: Sprite
+    state: stamp-lawyer
+
+- type: entity
+  parent: [ RubberStampBase, BaseSecurityContraband ]
+  id: RubberStampJusticeWarden
+  name: warden's rubber stamp
+  categories: [ DoNotMap ]
+  suffix: DO NOT MAP, Justice
+  description: With a simple press of ink to paper, a life is sealed behind bars. Maybe not forever.
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-warden
+    stampedColor: "#0000af"
+    stampState: "paper_stamp-warden"
+  - type: Sprite
+    sprite: _DV/Objects/Misc/stamps.rsi
+    state: stamp-warden
+
+- type: entity
+  parent: [ RubberStampBase, BaseSecurityContraband ]
+  id: RubberStampArmorer
+  name: armorer's rubber stamp
+  categories: [ DoNotMap ]
+  suffix: DO NOT MAP
+  description: A rubber stamp for stamping important documents. Or weapons licenses for passengers.
+  components:
+  - type: Stamp
+    stampedName: stamp-component-stamped-name-armorer
+    stampedColor: "#5b0000"
+    stampState: "paper_stamp-armorer"
+  - type: Sprite
+    sprite: _DV/Objects/Misc/stamps.rsi
+    state: stamp-warden
+
 - type: entity
   parent: RubberStampBase
   id: RubberStampHatePaperwork
@@ -67,9 +114,9 @@
     color: orange
 
 - type: entity
-  name: IA rubber stamp
-  parent: RubberStampBase
   id: RubberStampNTAgent
+  parent: RubberStampBase
+  name: IA rubber stamp
   suffix: DO NOT MAP
   description: A rubber stamp for stamping important documents. For internal related affairs.
   components:
@@ -81,9 +128,9 @@
     state: stamp-cap
 
 - type: entity
-  name: chemist's rubber stamp
   parent: RubberStampBase
   id: RubberStampChemist
+  name: chemist's rubber stamp
   suffix: DO NOT MAP
   components:
   - type: Stamp
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
index b3cfaa96076..798c7408e4b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/swords.yml
@@ -65,6 +65,11 @@
     revealTime: 10
   - type: CollisionWake
     enabled: false
+  - type: PointLight
+    radius: 3
+    energy: 4
+    softness: 5
+    color: "#f6adff"
 
 - type: entity
   parent: BaseSword
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Decoration/banners.yml b/Resources/Prototypes/_DV/Entities/Structures/Decoration/banners.yml
new file mode 100644
index 00000000000..e4e1188420a
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Structures/Decoration/banners.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: BannerBase
+  id: BannerJustice
+  name: justice banner
+  description: A banner displaying the color of the justice department. Where court hearings happen... probably.
+  components:
+  - type: Sprite
+    sprite: Structures/Decoration/banner.rsi # TODO: Resprite. Upstream security banner as placeholder.
+    state: banner_security
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml
index 7d4ed161d2f..39a50d8bf57 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/Airlocks/access.yml
@@ -41,7 +41,7 @@
   - type: GridFill
     path: /Maps/_DV/Shuttles/Misc/glacier_surface_shuttle.yml
 
-# Delta V specific roles
+# DeltaV specific roles
 - type: entity
   parent: AirlockScience
   id: AirlockMantisLocked
@@ -51,6 +51,7 @@
     containers:
       board: [ DoorElectronicsMantis ]
 
+# Justice
 - type: entity
   parent: AirlockCommand
   id: AirlockChiefJusticeLocked
@@ -107,7 +108,43 @@
 
 - type: entity
   parent: AirlockJustice
-  id: AirlockClerkLocked
+  id: AirlockAttorneyLocked
+  suffix: Attorney, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAttorney ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockAttorneyGlassLocked
+  suffix: Attorney, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAttorney ]
+
+- type: entity
+  parent: AirlockJustice
+  id: AirlockJusticeDetectiveLocked
+  suffix: Detective, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockJusticeDetectiveGlassLocked
+  suffix: Detective, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
+
+- type: entity
+  parent: AirlockJustice
+  id: AirlockClerkLocked # TODO - Remove for Justice Rework
   suffix: Clerk, Locked
   components:
   - type: ContainerFill
@@ -116,13 +153,49 @@
 
 - type: entity
   parent: AirlockJusticeGlass
-  id: AirlockClerkGlassLocked
+  id: AirlockClerkGlassLocked # TODO - Remove for Justice Rework
   suffix: Clerk, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsClerk ]
 
+- type: entity
+  parent: AirlockJustice
+  id: AirlockJusticeWardenLocked
+  suffix: Justice Warden, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJusticeWarden ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockJusticeWardenGlassLocked
+  suffix: Justice Warden, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJusticeWarden ]
+
+- type: entity
+  parent: AirlockJustice
+  id: AirlockMarshalLocked
+  suffix: Marshal, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMarshal ]
+
+- type: entity
+  parent: AirlockJusticeGlass
+  id: AirlockMarshalGlassLocked
+  suffix: Marshal, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMarshal ]
+
 # Maintenance
 - type: entity
   parent: AirlockMaintCommandLocked
@@ -155,13 +228,49 @@
 
 - type: entity
   parent: AirlockMaintJusticeLocked
-  id: AirlockMaintClerkLocked
+  id: AirlockMaintAttorneyLocked
+  suffix: Attorney, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAttorney ]
+
+- type: entity
+  parent: AirlockMaintJusticeLocked
+  id: AirlockMaintJusticeDetectiveLocked
+  suffix: Detective, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsDetective ]
+
+- type: entity
+  parent: AirlockMaintJusticeLocked
+  id: AirlockMaintClerkLocked # TODO - Remove for Justice Rework
   suffix: Clerk, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsClerk ]
 
+- type: entity
+  parent: AirlockMaintJusticeLocked
+  id: AirlockMaintJusticeWardenLocked
+  suffix: Justice Warden, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJusticeWarden ]
+
+- type: entity
+  parent: AirlockMaintJusticeLocked
+  id: AirlockMaintMarshalLocked
+  suffix: Marshal, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMarshal ]
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockCorpsmanLocked
@@ -569,7 +678,7 @@
 - type: entity
   parent: AirlockMaintSecLocked
   id: AirlockMaintSecurityLawyerLocked
-  suffix: Security/Lawyer, Locked
+  suffix: Security/Justice, Locked
   components:
   - type: ContainerFill
     containers:
@@ -622,6 +731,24 @@
     containers:
       board: [ DoorElectronicsEngineering ]
 
+- type: entity
+  parent: HighSecDoor
+  id: HighSecJusticeLocked
+  suffix: Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJustice ]
+
+- type: entity
+  parent: HighSecDoor
+  id: HighSecChiefJusticeLocked
+  suffix: Chief Justice, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsChiefJustice ]
+
 #Syndicate high security door
 - type: entity
   parent: HighSecDoor
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml
index b97afca22b3..80cb38aa793 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/Windoors/windoor.yml
@@ -54,6 +54,15 @@
     containers:
       board: [ DoorElectronicsChiefJustice ]
 
+- type: entity
+  parent: WindoorJusticeLocked
+  id: WindoorProsecutorLocked
+  suffix: Prosecutor, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsProsecutor ]
+
 - type: entity
   parent: WindoorSecureJusticeLocked
   id: WindoorSecureProsecutorLocked
@@ -63,9 +72,27 @@
     containers:
       board: [ DoorElectronicsProsecutor ]
 
+- type: entity
+  parent: WindoorJusticeLocked
+  id: WindoorAttorneyLocked
+  suffix: Attorney, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAttorney ]
+
 - type: entity
   parent: WindoorSecureJusticeLocked
-  id: WindoorSecureClerkLocked
+  id: WindoorSecureAttorneyLocked
+  suffix: Attorney, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsAttorney ]
+
+- type: entity
+  parent: WindoorSecureJusticeLocked
+  id: WindoorSecureClerkLocked # TODO - Remove for Justice Rework
   suffix: Clerk, Locked
   components:
   - type: ContainerFill
@@ -74,13 +101,58 @@
 
 - type: entity
   parent: WindoorSecureJusticeLocked
-  id: WindoorSecureLawyerLocked
+  id: WindoorSecureLawyerLocked # TODO - Remove for Justice Rework
   suffix: Lawyer, Locked
   components:
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsLawyer ]
 
+- type: entity
+  parent: WindoorJusticeLocked
+  id: WindoorJusticeWardenLocked
+  suffix: Justice Warden, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJusticeWarden ]
+
+- type: entity
+  parent: WindoorSecureJusticeLocked
+  id: WindoorSecureJusticeWardenLocked
+  suffix: Justice Warden, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsJusticeWarden ]
+
+- type: entity
+  parent: WindoorJusticeLocked
+  id: WindoorMarshalLocked
+  suffix: Marshal, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMarshal ]
+
+- type: entity
+  parent: WindoorSecureJusticeLocked
+  id: WindoorSecureMarshalLocked
+  suffix: Marshal, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsMarshal ]
+
+- type: entity
+  parent: Windoor
+  id: WindoorArmoryLocked
+  suffix: Armory, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsArmory ]
+
 - type: entity
   parent: WindoorSecureScienceLocked
   id: WindoorSecureMantisLocked
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Doors/turnstile.yml b/Resources/Prototypes/_DV/Entities/Structures/Doors/turnstile.yml
new file mode 100644
index 00000000000..63a27140bad
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Structures/Doors/turnstile.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: Turnstile
+  id: TurnstileGenpopBrigEnter
+  suffix: Genpop/Brig Enter
+  components:
+  - type: AccessReader
+    access: [["GenpopEnter"], ["Brig"]]
+
+- type: entity
+  parent: Turnstile
+  id: TurnstileGenpopBrigLeave
+  suffix: Genpop/Brig Leave
+  components:
+  - type: AccessReader
+    access: [["GenpopLeave"], ["Brig"]]
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
index 1d53d6fe0ef..5ea37f96a1e 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/faxmachines.yml
@@ -231,7 +231,7 @@
 
 - type: entity
   parent: FaxMachineBase
-  id: FaxMachineClerk
+  id: FaxMachineClerk # TODO - Remove for Justice Rework
   suffix: Clerk
   components:
   - type: PageSender
@@ -239,6 +239,26 @@
   - type: FaxMachine
     name: "Clerk"
 
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineJusticeWarden
+  suffix: Justice Warden
+  components:
+  - type: PageSender
+    autoLinkJobs: [JusticeWarden]
+  - type: FaxMachine
+    name: "Warden"
+
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineMarshal
+  suffix: Marshal
+  components:
+  - type: PageSender
+    autoLinkJobs: [Marshal]
+  - type: FaxMachine
+    name: "Marshal"
+
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineClown
@@ -379,6 +399,16 @@
   - type: FaxMachine
     name: "Prosecutor"
 
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineAttorney
+  suffix: Attorney
+  components:
+  - type: PageSender
+    autoLinkJobs: [Attorney]
+  - type: FaxMachine
+    name: "Attorney"
+
 - type: entity
   parent: FaxMachineBase
   id: FaxMachinePsychologist
@@ -462,13 +492,23 @@
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineWarden
-  suffix: Warden
+  suffix: Warden, Security
   components:
   - type: PageSender
     autoLinkJobs: [Warden]
   - type: FaxMachine
     name: "Warden"
 
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineArmorer
+  suffix: Armorer
+  components:
+  - type: PageSender
+    autoLinkJobs: [ Armorer ]
+  - type: FaxMachine
+    name: "Armorer"
+
 - type: entity
   parent: FaxMachineBase
   id: FaxMachineZookeeper
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
index 6cf9d1854e1..64dfd6ef679 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/holopad.yml
@@ -113,7 +113,27 @@
 
 - type: entity
   parent: Holopad
-  id: HolopadJusticeClerk
+  id: HolopadJusticeAttorney
+  suffix: Attorney
+  components:
+  - type: Label
+    currentLabel: holopad-justice-attorney
+  - type: PageSender
+    autoLinkJobs: [Attorney]
+
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeDetective
+  suffix: Detective, Justice
+  components:
+  - type: Label
+    currentLabel: holopad-justice-detective
+  - type: PageSender
+    autoLinkJobs: [Detective]
+
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeClerk # TODO - Remove for Justice Rework
   suffix: Clerk
   components:
   - type: Label
@@ -121,6 +141,26 @@
   - type: PageSender
     autoLinkJobs: [Clerk]
 
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeJusticeWarden
+  suffix: Justice Warden
+  components:
+  - type: Label
+    currentLabel: holopad-justice-warden
+  - type: PageSender
+    autoLinkJobs: [JusticeWarden]
+
+- type: entity
+  parent: Holopad
+  id: HolopadJusticeMarshal
+  suffix: Marshal
+  components:
+  - type: Label
+    currentLabel: holopad-justice-marshal
+  - type: PageSender
+    autoLinkJobs: [Marshal]
+
 - type: entity
   parent: HolopadJustice
   id: HolopadJusticeLobby
@@ -204,6 +244,16 @@
   - type: Label
     currentLabel: holopad-security-lobby
 
+- type: entity
+  parent: Holopad
+  id: HolopadSecurityArmorer
+  suffix: Armorer
+  components:
+  - type: Label
+    currentLabel: holopad-security-armorer
+  - type: PageSender
+    autoLinkJobs: [Armorer]
+
 #Station Specific - Security
 - type: entity
   parent: HolopadPrison
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml
index 3c8f40273e8..3e36adc0520 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml
@@ -93,7 +93,8 @@
     - UpgradeKits
     - UpgradeKits_Goob
     - EngineeringHardsuits
-    - LightingEquipment # DeltaV
+    - AdvancedConstruction
+    - LightingEquipment
   - type: Machine
     board: EngineeringTechFabCircuitboard
   - type: StealTarget
@@ -134,7 +135,7 @@
     - Mining
     - SalvageWeapons
     - SalvageHardsuits
-    - LightingEquipment # DeltaV
+    - LightingEquipment
   - type: Machine
     board: LogisticsTechFabCircuitboard
   - type: StealTarget
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/surveillance_camera_routers.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/surveillance_camera_routers.yml
index b83f385cf5d..0af5bb50c3e 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/surveillance_camera_routers.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/surveillance_camera_routers.yml
@@ -6,3 +6,12 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraAI
+
+- type: entity
+  parent: SurveillanceCameraRouterBase
+  id: SurveillanceCameraRouterJustice
+  name: justice camera router
+  suffix: Justice
+  components:
+  - type: SurveillanceCameraRouter
+    subnetFrequency: SurveillanceCameraJustice
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/telecomms.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/telecomms.yml
new file mode 100644
index 00000000000..cb4a42f24a2
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/telecomms.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: TelecomServer
+  id: TelecomServerFilledJustice
+  suffix: Justice
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyJustice
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index eb16457d821..3bf03e708e8 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -25,6 +25,20 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
 
+# Justice
+
+- type: entity
+  parent: LockerBaseSecureDeltaV
+  id: LockerJustice
+  name: justice locker
+  components:
+  - type: EntityStorageVisuals
+    stateBaseClosed: clerk
+    stateDoorOpen: clerk_open
+    stateDoorClosed: clerk_door
+  - type: AccessReader
+    access: [["Justice"]]
+
 - type: entity
   parent: CommandLockerBaseSecureDeltaV
   id: LockerChiefJustice
@@ -40,10 +54,9 @@
 
 - type: entity
   parent: LockerBaseSecureDeltaV
-  id: LockerClerk
+  id: LockerClerk # TODO - Remove for Justice Rework
   name: clerk's locker
   components:
-  - type: Appearance
   - type: EntityStorageVisuals
     stateBaseClosed: clerk
     stateDoorOpen: clerk_open
@@ -51,6 +64,49 @@
   - type: AccessReader
     access: [["Clerk"]]
 
+- type: entity
+  parent: LockerJustice
+  id: LockerProsecutor # TODO - Resprite
+  name: prosecutor's locker
+  components:
+  - type: AccessReader
+    access: [["Prosecutor"]]
+
+- type: entity
+  parent: LockerJustice
+  id: LockerAttorney # TODO - Resprite
+  name: attorney's locker
+  components:
+  - type: AccessReader
+    access: [["Attorney"]]
+
+- type: entity
+  parent: LockerJustice
+  id: LockerJusticeDetective # TODO - Resprite
+  name: detective's locker
+  suffix: Justice
+  components:
+  - type: AccessReader
+    access: [["Detective"]]
+
+- type: entity
+  parent: LockerJustice
+  id: LockerJusticeWarden # TODO - Resprite
+  name: warden's locker
+  suffix: Justice Warden
+  components:
+  - type: AccessReader
+    access: [["JusticeWarden"]]
+
+- type: entity
+  parent: LockerJustice
+  id: LockerMarshal # TODO - Resprite
+  name: marshal's locker
+  components:
+  - type: AccessReader
+    access: [["Marshal"]]
+
+# Medical
 - type: entity
   parent: LockerBaseSecureDeltaV
   id: LockerPsychologist
@@ -75,6 +131,7 @@
   - type: AccessReader
     access: [["Medical"], ["Surgery"]] # Added medical until surgeon returns
 
+# Service
 - type: entity
   parent: LockerBaseSecureDeltaV
   id: LockerKitchen
@@ -99,6 +156,7 @@
   - type: AccessReader
     access: [["Janitor"]]
 
+# Logistic
 - type: entity
   parent: LockerBaseSecure
   id: LockerLogistics # Wizden has sprites for this but doesn't have an entity that uses them?
@@ -111,6 +169,7 @@
   - type: AccessReader
     access: [["Cargo"]]
 
+# Security
 - type: entity
   parent: LockerBaseSecureDeltaV
   id: LockerArmoryStorage
@@ -123,6 +182,19 @@
   - type: AccessReader
     access: [["Armory"]]
 
+- type: entity
+  parent: LockerBaseSecureDeltaV
+  id: LockerArmorer
+  name: armorer's locker
+  components:
+  - type: EntityStorageVisuals
+    stateBaseClosed: warden
+    stateDoorOpen: warden_open
+    stateDoorClosed: warden_door
+  - type: AccessReader
+    access: [ [ "Armory" ] ]
+
+# Epistemics
 - type: entity
   parent: LockerBooze
   id: LockerForensicMantis
@@ -151,6 +223,17 @@
             min: 1
             max: 2
 
+- type: entity
+  parent: LockerForensicMantis
+  id: LockerArchivist
+  name: archivist's cabinet
+  suffix: Empty
+  description: You'll never know what's inside until you collapse the quantum superposition of all possible mysteries.
+  components:
+  - type: AccessReader
+    access: [ [ "Library" ] ]
+
+# Gun safe
 - type: entity
   id: SalvageGunSafeBaseSecure
   parent: GunSafe
@@ -328,14 +411,75 @@
     access: [["Armory"]]
 
 - type: entity
-  parent: LockerForensicMantis
-  id: LockerArchivist
-  name: archivist's cabinet
-  suffix: Empty
-  description: You'll never know what's inside until you collapse the quantum superposition of all possible mysteries.
+  parent: SecurityGunSafeNonlethalDV
+  id: JusticeGunSafeNonlethalDV
+  suffix: Justice variant
+  #components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/nonlethalsafe.rsi
+  #  noRot: true
+
+- type: entity
+  parent: JusticeGunSafeNonlethalDV
+  id: JusticeGunSafeNonlethalSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
   components:
   - type: AccessReader
-    access: [["Library"]]
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunDV
+  suffix: Justice variant
+  #components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/disablersafe.rsi
+  #  noRot: true
+
+- type: entity
+  parent: SecurityGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeNonlethalHandgunSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: SecurityGunSafeNonlethalDV
+  id: JusticeGunSafeNonLethalShotgunDV
+  name: non-lethal shotgun safe
+  suffix: Justice variant
+  components:
+  #- type: Sprite # TODO: Resprite to justice colors.
+  #  sprite: _DV/Structures/Storage/Closets/nonlethalsafe.rsi
+  #  noRot: true
+  - type: EntityStorageVisuals
+    stateDoorClosed: shotgun
+
+- type: entity
+  parent: JusticeGunSafeNonLethalShotgunDV
+  id: JusticeGunSafeNonLethalShotgunSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
+
+- type: entity
+  parent: JusticeGunSafeNonlethalHandgunDV
+  id: JusticeGunSafeDisablerDV
+  name: disabler safe
+  suffix: Justice variant
+  components:
+  - type: EntityStorageVisuals
+    stateDoorClosed: disabler
+
+- type: entity
+  parent: JusticeGunSafeDisablerDV
+  id: JusticeGunSafeDisablerSecureDV
+  suffix: Armory, Marshal, JusticeWarden, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"], ["Marshal"], ["JusticeWarden"]]
 
 # Evac pod
 - type: entity
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
index ee8f43acc82..beff2adacda 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Storage/SecureCabinet/secure_cabinets.yml
@@ -189,7 +189,7 @@
 - type: entity
   parent: FilledSecureCabinet
   id: SecureCabinetWarden
-  suffix: Warden
+  suffix: Warden, Security
   components:
   - type: AccessReader
     access: [["Armory"]]
@@ -215,7 +215,7 @@
 #Clerk
 - type: entity
   parent: FilledSecureCabinet
-  id: SecureCabinetClerk
+  id: SecureCabinetClerk # TODO - Remove for Justice Rework
   suffix: Clerk
   components:
   - type: AccessReader
@@ -239,6 +239,33 @@
   - type: AccessReader
     access: [["Lawyer"]]
 
+#Warden (Justice)
+- type: entity
+  parent: FilledSecureCabinet
+  id: SecureCabinetJusticeWarden
+  suffix: Justice Warden
+  components:
+  - type: AccessReader
+    access: [["JusticeWarden"]]
+
+#Marshal
+- type: entity
+  parent: FilledSecureCabinet
+  id: SecureCabinetMarshal
+  suffix: Marshal
+  components:
+  - type: AccessReader
+    access: [["Marshal"]]
+
+#Armorer
+- type: entity
+  parent: FilledSecureCabinet
+  id: SecureCabinetArmorer
+  suffix: Armorer
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
 #Psychologist
 - type: entity
   parent: FilledSecureCabinet
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/reinforced_surveillance_camera.yml b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/reinforced_surveillance_camera.yml
index 26b7a31d1cc..2b0d41bf655 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/reinforced_surveillance_camera.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/reinforced_surveillance_camera.yml
@@ -226,6 +226,20 @@
     tags:
       - ReinforcedCameraAI
 
+- type: entity
+  parent: [ ReinforcedSurveillanceCameraBase, SurveillanceCameraJustice ]
+  id: ReinforcedSurveillanceCameraJustice
+  suffix: Justice
+  components:
+  - type: Construction
+    graph: ReinforcedSurveillanceCameraGraph
+    node: camera_justice
+  - type: WiresPanelSecurity
+    securityLevel: medJustice
+  - type: Tag
+    tags:
+    - ReinforcedCameraJustice
+
 - type: entity
   parent: ReinforcedSurveillanceCameraBase
   id: ReinforcedSurveillanceCameraConstructed
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
index 9d34694926e..ae71f69392f 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/WallmountMachines/surveillance_camera.yml
@@ -10,3 +10,16 @@
     transmitFrequencyId: SurveillanceCamera
   - type: SurveillanceCamera
     networkSet: true
+
+- type: entity
+  parent: SurveillanceCameraBase
+  id: SurveillanceCameraJustice
+  name: camera
+  suffix: Justice
+  components:
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCameraJustice
+    transmitFrequencyId: SurveillanceCamera
+  - type: SurveillanceCamera
+    networkSet: true
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/switch.yml
index 312e5eb2b9b..36add1ef159 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Wallmounts/switch.yml
@@ -24,7 +24,15 @@
 
 - type: entity
   parent: LockableButton
-  id: LockableButtonClerk
+  id: LockableButtonAttorney
+  suffix: Attorney
+  components:
+  - type: AccessReader
+    access: [["Attorney"]]
+
+- type: entity
+  parent: LockableButton
+  id: LockableButtonClerk # TODO - Remove for Justice Rework
   suffix: Clerk
   components:
   - type: AccessReader
@@ -38,6 +46,22 @@
   - type: AccessReader
     access: [["ChiefJustice"]]
 
+- type: entity
+  parent: LockableButton
+  id: LockableButtonJusticeWarden
+  suffix: JusticeWarden
+  components:
+  - type: AccessReader
+    access: [[JusticeWarden]]
+
+- type: entity
+  parent: LockableButton
+  id: LockableButtonMarshal
+  suffix: Marshal
+  components:
+  - type: AccessReader
+    access: [["Marshal"]]
+
 - type: entity
   parent: LockableButton
   id: LockableButtonSyndicate
diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml
index 9c8436019cd..b852a84426d 100644
--- a/Resources/Prototypes/_DV/GameRules/events.yml
+++ b/Resources/Prototypes/_DV/GameRules/events.yml
@@ -5,6 +5,7 @@
     - id: MothroachSpawn
     - id: XenoVents
     - id: MalignRiftSpawn
+    - id: GnomeSpawn
     - id: PitbullMigration # FETCH ME THEIR SOULS
 
 - type: entityTable
@@ -18,6 +19,9 @@
     - id: SkiaSpawn
     - id: RatKingSpawn
     - id: NTAgentSleeper
+    - id: ColossusSpawn
+    - id: AsakimShuttle
+    - id: HitmanShuttle
 
 # Replaces upstream meteor events until they're good
 - type: entity
@@ -239,7 +243,7 @@
   id: RoboNeuroticist
   components:
   - type: StationEvent
-    weight: 1
+    weight: 2
     minimumPlayers: 35 #big threat, but has to have ghosts to matter
     reoccurrenceDelay: 30
     duration: null # so it shows up in round end
@@ -423,7 +427,6 @@
         implants:
         - HitmanCardImplant
 
-
 # nt agent sleeper event
 - type: entity
   id: NTAgentSleeper
@@ -464,6 +467,35 @@
         - RadioImplantCentcomm
         - NanolinkSubImplant
 
+# Gnomes
+- type: entity
+  parent: BaseMidRoundAntag
+  id: GnomeSpawn
+  components:
+  - type: StationEvent
+    earliestStart: 15
+    minimumPlayers: 5
+    weight: 2
+    duration: null
+  - type: PrecognitionResult
+    message: psionic-power-precognition-gnome-spawn-result-message
+  - type: AntagSpawner
+    prototype: MobGnome
+  - type: AntagSelection
+    agentName: gnome-round-end-name
+    definitions:
+    - spawnerPrototype: SpawnPointGnome
+      min: 1
+      max: 2
+      pickPlayer: false
+      mindRoles:
+      - MindRoleGhostRoleFreeAgent
+      components:
+        - type: EmitSoundOnSpawn
+          sound: /Audio/Effects/bodyfall3.ogg
+        - type: SpawnOnTrigger
+          proto: EffectFlashBluespace
+
 # NT Pest Control via Pitbulls
 - type: entity
   id: PitbullMigration
@@ -473,7 +505,7 @@
     startAnnouncement: station-event-pitbull-start-announcement
     startAudio:
       path: /Audio/_DV/Announcements/attention.ogg
-    earliestStart: 1
+    earliestStart: 30
     minimumPlayers: 10
     weight: 1
     duration: 15
diff --git a/Resources/Prototypes/_DV/GameRules/glimmer_events.yml b/Resources/Prototypes/_DV/GameRules/glimmer_events.yml
index c126d5a6ade..9e443aeb305 100644
--- a/Resources/Prototypes/_DV/GameRules/glimmer_events.yml
+++ b/Resources/Prototypes/_DV/GameRules/glimmer_events.yml
@@ -11,6 +11,7 @@
     - id: GlimmerSpawnProber
     - id: GlimmerRevenantSpawn
     - id: GlimmerMiteSpawn
+    - id: GlimmerGnomeSpawn
     - id: GlimmerRandomSentience
     - id: GlimmerRandomAnimation
     - id: ThavenMoodUpset
@@ -148,6 +149,17 @@
     mobPrototype: MobGlimmerMite
     glimmerTier: Low # get more mites earlier on
 
+- type: entity
+  parent: BaseGlimmerSignaturesEvent
+  id: GlimmerGnomeSpawn
+  components:
+  - type: GlimmerEvent
+    minimumGlimmer: 500
+    maximumGlimmer: 900
+  - type: GlimmerMobRule
+    mobPrototype: MobGnome
+    maxSpawns: 2
+
 # Like upstream's event but can reoccur and tied to glimmer.
 - type: entity
   parent: [RandomSentience, BaseGlimmerEvent]
@@ -224,7 +236,6 @@
     - silver
     - yellow
 
-
 - type: entity
   id: GlimmerRestyle
   parent: BaseGlimmerSignaturesEvent
diff --git a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml
index 5f43e329df0..0b85c271674 100644
--- a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml
+++ b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml
@@ -1,5 +1,5 @@
 - type: entityTable
-  id: UnknownShuttlesFreelanceTableDeltaV
+  id: UnknownShuttlesTableDeltaV
   table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
     children:
     - id: SyndicateRecruiter
@@ -7,13 +7,15 @@
     - id: SyndicateArmsdealer
     - id: AsakimShuttle
     - id: HitmanShuttle
+    - id: RoboNeuroticist
+    - id: UnknownShuttleSyndieEvacPod
 
 - type: entity
   parent: BaseUnknownShuttleRule
   id: SyndicateRecruiter
   components:
   - type: StationEvent
-    weight: 4
+    weight: 6
     minimumPlayers: 20
     maxOccurrences: 1
     duration: null
@@ -58,7 +60,7 @@
   id: SynthesisSpecialist
   components:
   - type: StationEvent
-    weight: 4
+    weight: 6
     minimumPlayers: 20
     maxOccurrences: 1
     duration: null
@@ -102,7 +104,7 @@
   id: SyndicateArmsdealer
   components:
   - type: StationEvent
-    weight: 2
+    weight: 6
     minimumPlayers: 25
     maxOccurrences: 1
     duration: null
@@ -147,7 +149,7 @@
   id: HitmanShuttle
   components:
   - type: StationEvent
-    weight: 2
+    weight: 6
     minimumPlayers: 25
     maxOccurrences: 1
     duration: null
diff --git a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
index d57ac84da79..a4617cbd8f4 100644
--- a/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_DV/Loadouts/role_loadouts.yml
@@ -83,7 +83,7 @@
   - GroupSpeciesBreathTool
 
 - type: roleLoadout
-  id: JobClerk
+  id: JobClerk # TODO: Remove for Justice Rework
   groups:
   - GroupTankHarness
   - ClerkJumpsuit
@@ -109,6 +109,19 @@
   - Trinkets
   - GroupSpeciesBreathTool
 
+- type: roleLoadout
+  id: JobAttorney
+  groups:
+  - GroupTankHarness
+  - LawyerNeck
+  - LawyerJumpsuit
+  - CommonBackpack
+  - Glasses
+  - Survival
+  - Trinkets
+  - LawyerJobTrinkets
+  - GroupSpeciesBreathTool
+
 # Epistemics
 - type: roleLoadout
   id: JobRoboticist
diff --git a/Resources/Prototypes/_DV/Polymorphs/polymorph.yml b/Resources/Prototypes/_DV/Polymorphs/polymorph.yml
index f79d868f429..54b08ffbdb0 100644
--- a/Resources/Prototypes/_DV/Polymorphs/polymorph.yml
+++ b/Resources/Prototypes/_DV/Polymorphs/polymorph.yml
@@ -7,3 +7,13 @@
     transferDamage: true
     revertOnCrit: true
     revertOnDeath: true
+
+- type: polymorph
+  id: GnomeMorph
+  configuration:
+    entity: GnomeJaunt
+    cooldown: 20
+    forced: true
+    duration: 2
+    polymorphSound: /Audio/_DV/Voice/Gnome/gnomelaugh.ogg
+    inventory: Drop # drop items in hands when jaunting
diff --git a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/utilities/reinforced_cameras.yml b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/utilities/reinforced_cameras.yml
index 3de5103ccf5..5e9a42c5c83 100644
--- a/Resources/Prototypes/_DV/Recipes/Construction/Graphs/utilities/reinforced_cameras.yml
+++ b/Resources/Prototypes/_DV/Recipes/Construction/Graphs/utilities/reinforced_cameras.yml
@@ -393,6 +393,37 @@
         amount: 1
         doAfter: 2
 
+  #justice
+  - node: camera_justice
+    entity: ReinforcedSurveillanceCameraJustice
+    actions:
+    - !type:SetWiresPanelSecurity
+      wiresAccessible: true
+    edges:
+    - to: wired
+      conditions:
+      - !type:WirePanel { }
+      - !type:AllWiresCut { }
+      steps:
+      - tool: Prying
+        doAfter: 3
+
+    - to: medSecurityUnfinished
+      conditions:
+      - !type:WirePanel { }
+      steps:
+      - material: Steel
+        amount: 1
+        doAfter: 2
+
+    - to: highSecurityUnfinished
+      conditions:
+      - !type:WirePanel { }
+      steps:
+      - material: Plasteel
+        amount: 1
+        doAfter: 2
+
   #medscurity
   - node: medSecurityUnfinished
     actions:
@@ -530,6 +561,19 @@
       - tool: Prying
         doAfter: 2
 
+    - to: camera_justice
+      completed:
+      - !type:GivePrototype
+        prototype: SheetSteel1
+        amount: 1
+      conditions:
+      - !type:WirePanel { }
+      - !type:HasTag
+        tag: ReinforcedCameraAI
+      steps:
+      - tool: Prying
+        doAfter: 2
+
     - to: medSecurity
       conditions:
       - !type:WirePanel {}
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml
index 35141935f66..82fa6043824 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml
@@ -5,6 +5,7 @@
   recipes:
   - HolotapeProjector
   - SheetPlasteel1Engineering
+  - ConstructionBag
   - NaniteApplicator
   - AccessConfigurator
 
@@ -41,3 +42,8 @@
   - ClothingOuterSuitAtmosFire
   - ClothingHeadHelmetAtmosFire
   - ClothingOuterVoidsuitEngineering
+
+- type: latheRecipePack
+  id: AdvancedConstruction
+  recipes:
+  - ConstructionBagOfHolding
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml
index 79446ab72c1..a1b73e343f7 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/medical.yml
@@ -30,6 +30,7 @@
   id: MedicalBoardsDeltaV
   recipes:
   - CrewMonitoringComputerCircuitboard
+  - CrewMonitoringServerMachineCircuitboard
   - CloningConsoleComputerCircuitboard
   - MedicalScannerMachineCircuitboard
   - CloningPodMachineCircuitboard
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml
index 48ff2a41b61..09a8aa1b97c 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml
@@ -47,3 +47,13 @@
     Steel: 500
     Glass: 400
     Uranium: 100
+
+- type: latheRecipe
+  id: ConstructionBagOfHolding
+  result: ConstructionBagOfHolding
+  completetime: 5
+  materials:
+    Steel: 1000
+    Silver: 750
+    Plasma: 500
+    Bluespace: 100
diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml b/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml
index 343a21e83af..3874a5a7f1c 100644
--- a/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml
+++ b/Resources/Prototypes/_DV/Recipes/Lathes/machine_boards.yml
@@ -1,5 +1,11 @@
-# Atmos
+#MARK: Atmos
 - type: latheRecipe
   parent: [ BaseCircuitboardRecipe, BaseEngineeringMachineRecipeCategory ]
   id: KitchenFreezerMachineCircuitBoard
   result: KitchenFreezerMachineCircuitBoard
+
+#MARK: Medical
+- type: latheRecipe
+  parent: [ BaseCircuitboardRecipe, BaseMedicalMachineRecipeCategory ]
+  id: CrewMonitoringServerMachineCircuitboard
+  result: CrewMonitoringServerMachineCircuitboard
diff --git a/Resources/Prototypes/_DV/Research/biochemical.yml b/Resources/Prototypes/_DV/Research/biochemical.yml
index 7839400a5ba..451298c69ec 100644
--- a/Resources/Prototypes/_DV/Research/biochemical.yml
+++ b/Resources/Prototypes/_DV/Research/biochemical.yml
@@ -1,6 +1,4 @@
-# Tier 1
-
-# Tier 2
+#MARK: Tier 2
 
 - type: technology
   id: Cloning
@@ -17,4 +15,18 @@
   - MedicalScannerMachineCircuitboard
   - CloningPodMachineCircuitboard
 
-# Tier 3
+#MARK: Tier 3
+
+- type: technology
+  id: MedicalTracking
+  name: research-technology-medical-tracking
+  icon:
+    sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
+    state: scanner
+  discipline: Biochemical
+  tier: 3
+  cost: 15000
+  recipeUnlocks:
+  - HandheldCrewMonitor
+  - CrewMonitoringServerMachineCircuitboard
+  - CrewMonitoringComputerCircuitboard
diff --git a/Resources/Prototypes/_DV/Research/industrial.yml b/Resources/Prototypes/_DV/Research/industrial.yml
index a093141b447..80b0f12c95b 100644
--- a/Resources/Prototypes/_DV/Research/industrial.yml
+++ b/Resources/Prototypes/_DV/Research/industrial.yml
@@ -28,6 +28,18 @@
   - ClothingOuterHardsuitEngineering
   - ClothingOuterVoidsuitEngineering
 
+- type: technology
+  id: AdvancedConstruction
+  name: research-technology-advanced-construction
+  icon:
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    state: icon
+  discipline: Industrial
+  tier: 2
+  cost: 7500
+  recipeUnlocks:
+  - ConstructionBagOfHolding
+
 # Tier 3
 
 - type: technology
diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/attorney.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/attorney.yml
new file mode 100644
index 00000000000..9dcb063bf89
--- /dev/null
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/attorney.yml
@@ -0,0 +1,42 @@
+- type: job
+  id: Attorney
+  name: job-name-attorney
+  description: job-description-attorney
+  setPreference: false
+  playTimeTracker: JobAttorney
+  canBeAntag: false
+  requirements:
+  - !type:OverallPlaytimeRequirement
+    time: 10h
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 6h
+  #startingGear: AttorneyGear # Bypass ChameleonJobLoadoutTest
+  icon: "JobIconLawyer"
+  supervisors: job-supervisors-cj
+  access:
+  - Justice
+  - Attorney
+  - Lawyer # TODO: Remove after Justice Rework
+  - Maintenance
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+  - !type:AddComponentSpecial
+    components:
+    - type: Condemned
+      soulOwnedNotDevil: true
+
+#- type: startingGear # Bypass ChameleonJobLoadoutTest
+#  id: AttorneyGear
+#  equipment:
+#    shoes: ClothingShoesBootsLaceup
+#    id: LawyerPDA
+#    ears: ClothingHeadsetJustice
+#  inhand:
+#  - BriefcaseBrownFilled
+#  storage:
+#    back:
+#    - RubberStampAttorney
+#    - BookSpaceLaw
+#    - ForensicScanner
diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/justicewarden.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/justicewarden.yml
new file mode 100644
index 00000000000..8ccb7181132
--- /dev/null
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/justicewarden.yml
@@ -0,0 +1,51 @@
+- type: job
+  id: JusticeWarden
+  name: job-name-warden
+  description: job-description-justice-warden
+  playTimeTracker: JobJusticeWarden
+  setPreference: false
+  requirements:
+  - !type:RoleTimeRequirement
+    role: JobProsecutor
+    time: 8h
+  - !type:RoleTimeRequirement
+    role: JobMarshal
+    time: 4h
+  - !type:DepartmentTimeRequirement
+    department: Justice
+    time: 12h
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 10h
+  weight: 5
+  #startingGear: JusticeWardenGear # Bypass ChameleonJobLoadoutTest
+  icon: "JobIconPrisonGuard"
+  requireAdminNotify: true
+  supervisors: job-supervisors-cj
+  canBeAntag: false
+  whitelisted: true
+  access:
+  - Justice
+  - Clerk # TODO: Remove when Clerk is kill
+  - Prosecutor
+  - Detective
+  - Cryogenics
+  - Corpsman # Warden requires access to the treatment of their prisoners.
+  - Marshal
+  - JusticeWarden
+  - Detective
+  - GenpopEnter
+  - GenpopLeave
+  - Maintenance
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+#- type: startingGear # Bypass ChameleonJobLoadoutTest
+#  id: JusticeWardenGear
+#  equipment:
+#    id: JusticeWardenPDA
+#    ears: ClothingHeadsetJustice
+#  storage:
+#    back:
+#    - Flash
diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Justice/marshal.yml b/Resources/Prototypes/_DV/Roles/Jobs/Justice/marshal.yml
new file mode 100644
index 00000000000..8a40a5f2079
--- /dev/null
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Justice/marshal.yml
@@ -0,0 +1,38 @@
+- type: job
+  id: Marshal
+  name: job-name-marshal
+  description: job-description-marshal
+  playTimeTracker: JobMarshal
+  setPreference: false
+  requirements:
+  - !type:OverallPlaytimeRequirement
+    time: 20h
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 5h
+  - !type:DepartmentTimeRequirement
+    department: Justice
+    time: 10h
+  #startingGear: MarshalGear # Bypass ChameleonJobLoadoutTest
+  alwaysUseSpawner: true
+  canBeAntag: false
+  icon: "JobIconClerk"
+  supervisors: job-supervisors-warden
+  whitelisted: true
+  access:
+  - Justice
+  - Marshal
+  - Maintenance
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+#- type: startingGear # Bypass ChameleonJobLoadoutTest
+#  id: MarshalGear
+#  equipment:
+#    id: PrisonGuardPDA
+#    ears: ClothingHeadsetJustice
+#    belt: ClothingBeltSecurity
+#  storage:
+#    back:
+#    - Flash
diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Security/armorer.yml b/Resources/Prototypes/_DV/Roles/Jobs/Security/armorer.yml
new file mode 100644
index 00000000000..e09915fb8af
--- /dev/null
+++ b/Resources/Prototypes/_DV/Roles/Jobs/Security/armorer.yml
@@ -0,0 +1,38 @@
+- type: job
+  id: Armorer
+  name: job-name-warden
+  description: job-description-warden
+  playTimeTracker: JobArmorer
+  setPreference: false
+  requirements:
+  - !type:RoleTimeRequirement
+    role: JobSecurityOfficer
+    time: 5h
+  - !type:DepartmentTimeRequirement
+    department: Security
+    time: 10h
+  weight: 5
+  #startingGear: ArmorerGear # Bypass ChameleonJobLoadoutTest
+  icon: "JobIconWarden"
+  requireAdminNotify: true
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  whitelisted: false
+  access:
+  - Security
+  - Armory
+  - Maintenance
+  - External
+  - Cryogenics
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant ]
+
+#- type: startingGear
+#  id: ArmorerGear
+#  equipment:
+#    id: ArmorerPDA
+#    ears: ClothingHeadsetSecurity
+#  storage:
+#    back:
+#    - Flash
diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
index 3abddbabada..d10af3c84f7 100644
--- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
+++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml
@@ -10,6 +10,18 @@
 - type: playTimeTracker
   id: JobProsecutor
 
+- type: playTimeTracker
+  id: JobAttorney
+
+- type: playTimeTracker
+  id: JobJusticeWarden
+
+- type: playTimeTracker
+  id: JobMarshal
+
+- type: playTimeTracker
+  id: JobArmorer
+
 - type: playTimeTracker
   id: JobCourier
 
diff --git a/Resources/Prototypes/_DV/Shaders/darkvision.yml b/Resources/Prototypes/_DV/Shaders/darkvision.yml
new file mode 100644
index 00000000000..5dd6037fcc8
--- /dev/null
+++ b/Resources/Prototypes/_DV/Shaders/darkvision.yml
@@ -0,0 +1,4 @@
+- type: shader
+  id: DarkVision
+  kind: source
+  path: "/Textures/_DV/Shaders/darkvision.swsl"
diff --git a/Resources/Prototypes/_DV/Species/motorkind.yml b/Resources/Prototypes/_DV/Species/AprilFools/motorkind.yml
similarity index 79%
rename from Resources/Prototypes/_DV/Species/motorkind.yml
rename to Resources/Prototypes/_DV/Species/AprilFools/motorkind.yml
index 1dd134953fa..482bf64b1b8 100644
--- a/Resources/Prototypes/_DV/Species/motorkind.yml
+++ b/Resources/Prototypes/_DV/Species/AprilFools/motorkind.yml
@@ -9,7 +9,4 @@
   maleFirstNames: NamesMotorkindFirst
   femaleFirstNames: NamesMotorkindFirst
   lastNames: NamesMotorkindLast
-  baseScale: "2.0, 2.0"
-  minHeight: 0.8
-  maxHeight: 1.2
-  defaultHeight: 1.0
+  baseScale: 2.0, 2.0
diff --git a/Resources/Prototypes/_DV/Species/Oni.yml b/Resources/Prototypes/_DV/Species/Oni.yml
index c0241bf17c3..51443463118 100644
--- a/Resources/Prototypes/_DV/Species/Oni.yml
+++ b/Resources/Prototypes/_DV/Species/Oni.yml
@@ -9,5 +9,4 @@
   femaleFirstNames: NamesOniFemale
   lastNames: NamesOniLocation
   naming: LastNoFirst
-  baseScale: "1.2, 1.2"
-  maxHeight: 1.05
+  baseScale: 1.1, 1.1
diff --git a/Resources/Prototypes/_DV/Species/felinid.yml b/Resources/Prototypes/_DV/Species/felinid.yml
index 6ecd901ab32..7b913a976c6 100644
--- a/Resources/Prototypes/_DV/Species/felinid.yml
+++ b/Resources/Prototypes/_DV/Species/felinid.yml
@@ -5,5 +5,4 @@
   prototype: MobFelinid
   dollPrototype: AppearanceFelinid
   skinColoration: Hues
-  baseScale: "0.8, 0.8"
-  minHeight: 0.95
+  baseScale: 0.8, 0.8
diff --git a/Resources/Prototypes/_DV/Species/harpy.yml b/Resources/Prototypes/_DV/Species/harpy.yml
index cad1bdf783c..1083e22ac80 100644
--- a/Resources/Prototypes/_DV/Species/harpy.yml
+++ b/Resources/Prototypes/_DV/Species/harpy.yml
@@ -5,8 +5,4 @@
   prototype: MobHarpy
   dollPrototype: AppearanceHarpy
   skinColoration: HumanToned
-  baseScale: "0.9, 0.9"
-  # Delta V Start - Due to the actual real world variance in avian size, I changed the range to be slightly wider, allowing for much larger, and smaller, Harpies, without going into territory deemed unfair.
-  minHeight: 0.75
-  maxHeight: 1.25
-  # Delta V End
+  baseScale: 0.95, 0.95
diff --git a/Resources/Prototypes/_DV/Species/kitsune.yml b/Resources/Prototypes/_DV/Species/kitsune.yml
index 4fd3b7ad52b..87717c83c8b 100644
--- a/Resources/Prototypes/_DV/Species/kitsune.yml
+++ b/Resources/Prototypes/_DV/Species/kitsune.yml
@@ -5,6 +5,4 @@
   prototype: MobKitsune
   dollPrototype: AppearanceKitsune
   skinColoration: HumanToned
-  baseScale: 1, 1
-  minHeight: .85
-  maxHeight: 1.05
+  baseScale: 0.9, 0.9
diff --git a/Resources/Prototypes/_DV/Species/rodentia.yml b/Resources/Prototypes/_DV/Species/rodentia.yml
index 438cdffe540..d803a20b64a 100644
--- a/Resources/Prototypes/_DV/Species/rodentia.yml
+++ b/Resources/Prototypes/_DV/Species/rodentia.yml
@@ -11,4 +11,3 @@
   lastNames: NamesRodentiaLast
   naming: LastFirst
   baseScale: 0.8, 0.8
-  minHeight: .85
diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml
index b097853c23a..2b7ad8d3121 100644
--- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml
@@ -739,6 +739,38 @@
     Mew:
       collection: FelinidMews
 
+- type: emoteSounds
+  id: GnomeSounds
+  params:
+    variation: 0.08
+  sounds:
+    Gulp: # Goob
+      path: /Audio/_Goobstation/Voice/Human/gulp.ogg
+    Blink:
+      collection: Blinks
+    Scream:
+      path: /Audio/_DV/Voice/Gnome/gnomescream.ogg
+    Laugh:
+      path: /Audio/_DV/Voice/Gnome/gnomelaugh.ogg
+    Sigh:
+      collection: MaleSigh
+      params:
+        variation: 0.125
+    Snore:
+      collection: Snores
+    Sneeze:
+      collection: MaleSneezes
+    Cough:
+      collection: MaleCoughs
+    Yawn:
+      collection: MaleYawn
+    Crying:
+      collection: MaleCry
+    Whistle:
+      collection: Whistles
+    DefaultDeathgasp:
+      path: /Audio/_DV/Voice/Gnome/gnomedeath.ogg
+
 - type: emoteSounds
   id: MonkeySounds
   sounds:
diff --git a/Resources/Prototypes/_DV/Voice/speech_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_sounds.yml
index e148ab25057..c7191a1aba2 100644
--- a/Resources/Prototypes/_DV/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/_DV/Voice/speech_sounds.yml
@@ -33,3 +33,12 @@
     collection: RubberChicken
   exclaimSound:
     collection: RubberChicken
+
+- type: speechSounds
+  id: Gnome
+  saySound:
+    path: /Audio/_DV/Voice/Gnome/gnome1.ogg
+  askSound:
+    path: /Audio/_DV/Voice/Gnome/gnome1.ogg
+  exclaimSound:
+    path: /Audio/_DV/Voice/Gnome/gnomescream.ogg
diff --git a/Resources/Prototypes/_DV/tags.yml b/Resources/Prototypes/_DV/tags.yml
index 8d1f3433712..8fc1c01430e 100644
--- a/Resources/Prototypes/_DV/tags.yml
+++ b/Resources/Prototypes/_DV/tags.yml
@@ -255,6 +255,9 @@
 - type: Tag
   id: ReinforcedCameraGeneral # Reinforced Cameras - General
 
+- type: Tag
+  id: ReinforcedCameraJustice # Reinforced Cameras - Justice
+
 - type: Tag
   id: ReinforcedCameraMedical # Reinforced Cameras - Medical
 
diff --git a/Resources/Prototypes/_Impstation/Body/Species/thaven.yml b/Resources/Prototypes/_Impstation/Body/Species/thaven.yml
index 0e6e024307c..5d4de806dbc 100644
--- a/Resources/Prototypes/_Impstation/Body/Species/thaven.yml
+++ b/Resources/Prototypes/_Impstation/Body/Species/thaven.yml
@@ -102,8 +102,6 @@
       Kidneys: OrganHumanKidneys
   - type: HumanoidProfile
     species: Thaven
-  - type: ScaleVisuals
-    speciesScale: 1.0, 1.05
 
 - type: entity
   parent:
@@ -148,7 +146,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 120
+        density: 180
         restitution: 0.0
         mask:
         - MobMask
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Player/allulalo.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Player/allulalo.yml
index 9d37e61df5d..70a3e4ab9f6 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Player/allulalo.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Player/allulalo.yml
@@ -1,5 +1,5 @@
 - type: entity
   save: false
-  name: Uristia Mc-hands
+  name: Urist McShorty
   parent: BaseMobAllulalo
   id: MobAllulalo
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
index c6fb51fa7de..cdf607e7dc6 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/allulalo.yml
@@ -1,6 +1,6 @@
 - type: entity
   save: false
-  name: Uristia Mc-Hands
+  name: Uristia McShorty
   parent:
   - AppearanceAllulalo
   - BaseSpeciesMobOrganic
@@ -119,103 +119,6 @@
   - type: Carriable # Delta V - grips the bird
     freeHandsRequired: 1
 
-# Begin Delta V Removals - Nubody
-#  - type: HumanoidAppearance
-#    species: Allulalo
-#    hideLayersOnEquip:
-#    - Hair
-#    - Snout
-#    - HeadTop
-#    - HeadSide
-#    - LLeg
-#    - RLeg
-#    - LFoot
-#    - RFoot
-
-#- type: entity
-#  parent: BaseSpeciesDummy
-#  id: MobAllulaloDummy
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: Sprite
-#    scale: 1, 1
-#  - type: Inventory
-#    speciesId: allulalo
-#    templateId: allulalo
-#    displacements:
-#      jumpsuit:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: jumpsuit
-#      head:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: head
-#      eyes:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: glasses
-#      ears:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: ears
-#      mask:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: mask
-#      neck:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: neck
-#      outerClothing:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: outerClothing
-#      gloves:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: hands
-#      shoes:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: feet
-#      belt:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: belt
-#      back:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: back
-#      suitstorage:
-#        sizeMaps:
-#          32:
-#            sprite: _Impstation/Mobs/Species/Allulalo/displacement.rsi
-#            state: suitstorage
-#  - type: Hands
-#    leftHandDisplacement:
-#      sizeMaps:
-#        32:
-#          sprite: Mobs/Species/Vox/displacement.rsi
-#          state: hand_l
-#    rightHandDisplacement:
-#      sizeMaps:
-#        32:
-#          sprite: Mobs/Species/Vox/displacement.rsi
-#          state: hand_r
-# End Delta V Removals
-
 # Begin Delta V addition - Nubody
 - type: entity
   parent: BaseSpeciesAppearance
@@ -316,9 +219,17 @@
       Heart: OrganAllulaloHeart
       Stomach: OrganAnimalStomach
       Liver: OrganAnimalLiver
-      Kidneys: OrganHumanKidneys
+      Kidneys: OrganAnimalKidneys
   - type: HumanoidProfile
     species: Allulalo
+  # BEGIN DeltaV
+  # Allulalo are weird because they are small yet base scale 1.0 BUT since the height system uses
+  # base scale to determine the metric/imperial height values, so we're just correcting the scale
+  # because Allulalo have to be the special kid on the block.
+  - type: ScaleVisuals
+    scale: 2.0, 2.0 
+    originalScale: 2.0, 2.0
+  # END DeltaV
 
 - type: entity
   parent: OrganBase
diff --git a/Resources/Prototypes/_Impstation/Species/allulalo.yml b/Resources/Prototypes/_Impstation/Species/allulalo.yml
index adf250c7a28..121a024947f 100644
--- a/Resources/Prototypes/_Impstation/Species/allulalo.yml
+++ b/Resources/Prototypes/_Impstation/Species/allulalo.yml
@@ -4,7 +4,6 @@
   roundStart: true
   prototype: MobAllulalo
   defaultSkinTone: "#385878"
-  #markingLimits: MobAllulaloMarkingLimits # Delta V - Nubody
   dollPrototype: AppearanceAllulalo # Delta V - Nubody
   skinColoration: Hues
   maleFirstNames: AllulaloFirstNames
@@ -14,150 +13,4 @@
   - Male
   - Female
   - Unsexed
-
-# Begin Delta V Removals - Changes for Nubody
-#- type: speciesBaseSprites
-#  id: MobAllulaloSprites
-#  sprites:
-#    TailBehind: MobHumanoidAnyMarking # floof
-#    TailOversuit: MobHumanoidAnyMarking # floof
-#    Eyes: MobAllulaloEyes
-#    Head: MobAllulaloHead
-#    HeadTop: MobHumanoidAnyMarking
-#    Hair: MobHumanoidAnyMarking
-#    Chest: MobAllulaloTorso
-#    LArm: MobAllulaloLArm
-#    RArm: MobAllulaloRArm
-#    LHand: MobAllulaloLHand
-#    LLeg: MobAllulaloLLeg
-#    RLeg: MobAllulaloRLeg
-#    LFoot: MobAllulaloLFoot
-#    RFoot: MobAllulaloRFoot
-#    Tail: MobHumanoidAnyMarking
-#    Snout: MobHumanoidAnyMarking
-#
-#- type: markingPoints
-#  id: MobAllulaloMarkingLimits
-#  onlyWhitelisted: true
-#  points:
-#    Hair:
-#      points: 1
-#      required: false
-#    Eyes:
-#      points: 1
-#      required: true
-#      defaultMarkings: [ AllulaloEyesDefault ]
-#    Head:
-#      points: 3
-#      required: false
-#    HeadTop:
-#      points: 1
-#      required: false
-#    UndergarmentTop:
-#      points: 1
-#      required: false
-#    Chest:
-#      points: 2
-#      required: false
-#    Tail:
-#      points: 1
-#      required: true
-#      defaultMarkings: [ AllulaloTailDefault ]
-#    Snout:
-#      points: 1
-#      required: false
-#    Overlay:
-#      points: 1
-#      required: false
-#    Arms:
-#      points: 1
-#      required: true
-#      defaultMarkings: [ AllulaloWingsDefault ]
-#    Legs:
-#      points: 2
-#      required: false
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloEyes
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: eyes
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloHead
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: head
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloHeadMale
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: head
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloHeadFemale
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: head
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloTorso
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: torso
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloTorsoMale
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: torso
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloTorsoFemale
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: torso
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloLLeg
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: l_leg
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloLHand
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: hands
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloLArm
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: l_arm
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloLFoot
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: l_foot
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloRLeg
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: r_leg
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloRArm
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: r_arm
-#
-#- type: humanoidBaseSprite
-#  id: MobAllulaloRFoot
-#  baseSprite:
-#    sprite: _Impstation/Mobs/Species/Allulalo/parts.rsi
-#    state: r_foot
-# End Delta V Removals
+  baseScale: 0.5, 0.5 # they smol
\ No newline at end of file
diff --git a/Resources/Prototypes/_Impstation/Species/thaven.yml b/Resources/Prototypes/_Impstation/Species/thaven.yml
index 893a8e00786..29d6b49c60b 100644
--- a/Resources/Prototypes/_Impstation/Species/thaven.yml
+++ b/Resources/Prototypes/_Impstation/Species/thaven.yml
@@ -14,5 +14,4 @@
   - Female
   - Unsexed
   baseScale: "1, 1.05" # DeltaV - make sure Thaven are still scaled w/ CD records
-  maxHeight: 1.05 # DeltaV
 
diff --git a/Resources/Prototypes/_Mono/GameRules/asakim.yml b/Resources/Prototypes/_Mono/GameRules/asakim.yml
index aee4b0c5b91..0d1f3893db8 100644
--- a/Resources/Prototypes/_Mono/GameRules/asakim.yml
+++ b/Resources/Prototypes/_Mono/GameRules/asakim.yml
@@ -17,7 +17,7 @@
     #startAnnouncement: station-event-asakim-shuttle-detected # DeltaV - no
     #  startAudio:
     #    path: /Audio/Misc/notice1.ogg
-    weight: 1.5 # DeltaV -  was 2, now less common then Arms Dealer. rare role
+    weight: 3
     minimumPlayers: 25 # DeltaV
     maxOccurrences: 1 # DeltaV - was 4
     duration: null # DeltaV
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml
new file mode 100644
index 00000000000..5b5cad7908f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml
@@ -0,0 +1,94 @@
+- type: entity
+  parent: BaseStorageItem
+  id: ConstructionBag
+  name: construction bag
+  description: A robust bag for construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt.
+  components:
+#  - type: MagnetPickup # DeltaV - Gives you a reason to get the bluespace version.
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,9,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+      - Ingot
+#      - RodMetal1 # DeltaV - Not a tag.
+      - Sheet
+    # Begin DeltaV Changes
+    #  - CableCoil - Cable module is already a default.
+      - ConstructionMaterial
+    #  components:
+    #  - ConstructionMaterials # Was not ported due to tag.
+    #blacklist:
+    #  tags:
+    #  - PrizeTicket
+    # End DeltaV Changes
+  - type: Dumpable
+  - type: StaticPrice
+    price: 55.5
+
+- type: entity
+  parent: ConstructionBag
+  id: ConstructionBagOfHolding
+  name: construction bag of holding
+  description: A robust bag of holding for rich construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt.
+  components:
+  - type: MagnetPickup
+    range: 2
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    layers:
+    - state: icon
+    - state: icon-bluespace-overlay
+    - state: icon-bluespace-overlay-unshaded
+      shader: unshaded
+  - type: Item
+    size: Ginormous
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: inhand-left-bluespace-overlay
+      - state: inhand-left-bluespace-overlay-unshaded
+        shader: unshaded
+      right:
+      - state: inhand-right
+      - state: inhand-right-bluespace-overlay
+      - state: inhand-right-bluespace-overlay-unshaded
+        shader: unshaded
+  - type: Clothing
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: equipped-BELT-bluespace-overlay
+      - state: equipped-BELT-bluespace-overlay-unshaded
+        shader: unshaded
+  - type: Storage
+    grid:
+    - 0,0,19,9
+  # Begin DeltaV Additions - On/Off Toggle
+  - type: ItemToggle
+    soundActivate: &soundActivate
+      collection: sparks
+      params:
+        variation: 0.25
+    soundDeactivate: *soundActivate
+  - type: ItemToggleExamine
+    on: magnet-pickup-component-magnet-on
+    off: magnet-pickup-component-magnet-off
+  # End DeltaV Additions - On/Off Toggle
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
index 22e1f9605f7..3f2cfd5d6fd 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -12,4 +12,13 @@
   completetime: 1
   materials:
     Glass: 100
-    Plastic: 100
\ No newline at end of file
+    Plastic: 100
+
+- type: latheRecipe
+  id: ConstructionBag
+  result: ConstructionBag
+  completetime: 1
+#  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
diff --git a/Resources/Prototypes/_RMC14/Species/avali.yml b/Resources/Prototypes/_RMC14/Species/avali.yml
index af4e910628d..b060b4c236b 100644
--- a/Resources/Prototypes/_RMC14/Species/avali.yml
+++ b/Resources/Prototypes/_RMC14/Species/avali.yml
@@ -10,4 +10,3 @@
   maleFirstNames: names_avali_unisex
   femaleFirstNames: names_avali_unisex
   naming: First
-  minHeight: 0.8 # DeltaV - ability to be slightly shorter than humans
diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
index 37b572999d1..ebd24a7f360 100644
--- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
+++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
@@ -98,4 +98,22 @@
   - "Technokinetic Pulse" Unleashes a burst of Technokinetic energy, disabling and destroying nearby electronics.
   - Skias have [bold]very sharp claws[/bold] that will additionally deal [bold]shadow damage[/bold] that requires Holy water to heal.
 <!-- DeltaV - end Skia changes-->
+
+<!-- DeltaV - start Gnome changes--># Gnomes
+
+  <Box>
+    <GuideEntityEmbed Entity="MobGnome"/>
+  </Box>
+  Gnomes are whimsical fairytale creatures brought into realspace by the magic of the [color=#8f63e6]Noosphere[/color].
+  They seek to coexist with the crew, while collecting small trinkets and treats.
+  - You're just a little guy! You can't shoot guns, use both hands to carry anything, and will die very quickly in a fight.
+  - [bold]Once you die, you cannot be revived[/bold].
+  - If you are injured, you may slowly regenerate with [italic]Psionic Regeneration[/italic].
+  - You may sneak around invisibly with [italic]Psionic Invisibility[/italic], but beware, crewmembers can hear your footsteps. People can see you if they are psionically insulated!
+  - Your internal storage allows you to keep your treasures, but you should find a nice place to make a home and store your trinkets.
+  - You have nimble hands which are capable of stealing quickly and performing pranks.
+  - You are able to [italic]Jaunt[/italic] into the ether for a brief moment to reposition.
+  - You can slowly cast a knock spell by interacting with doors (alt click by default) to open them.
+  - [bold]Obey fairy law![/bold] Conflicts are not solved with violence but with pranks and lessons. You should avoid being seen as much as possible. Any loser owes a debt that can be be repaid by fulfilling a request.
+  <!-- DeltaV - end Gnome changes-->
 </Document>
diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/equipped.png b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/equipped.png
new file mode 100644
index 00000000000..4e0013a77fb
Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/equipped.png differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/icon.png b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/icon.png
new file mode 100644
index 00000000000..4e0013a77fb
Binary files /dev/null and b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/icon.png differ
diff --git a/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/meta.json b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/meta.json
new file mode 100644
index 00000000000..5e4442423fc
--- /dev/null
+++ b/Resources/Textures/_DV/Clothing/Head/Hats/gnomehat.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from TGstation icons/mob/simple/garden_gnome.dmi and modified by rebe83.",
+    "source": "https://github.com/tgstation/tgstation/pull/72672",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped"
+        }
+    ]
+}
diff --git a/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/dead.png b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/dead.png
new file mode 100644
index 00000000000..c1ba69dcc4b
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/dead.png differ
diff --git a/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/gnome.png b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/gnome.png
new file mode 100644
index 00000000000..057aa0014c5
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/gnome.png differ
diff --git a/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/icon.png b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/icon.png
new file mode 100644
index 00000000000..5846158c83f
Binary files /dev/null and b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/icon.png differ
diff --git a/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/meta.json b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/meta.json
new file mode 100644
index 00000000000..672600e01f6
--- /dev/null
+++ b/Resources/Textures/_DV/Mobs/Animals/gnome.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from TGstation icons/mob/simple/garden_gnome.dmi and modified by rebe83.",
+    "source": "https://github.com/tgstation/tgstation/pull/72672",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "gnome",
+            "directions": 4
+        },
+        {
+            "name": "dead"
+        }
+    ]
+}
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/icon.png b/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/icon.png
index d67510d005c..e0f54351931 100644
Binary files a/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/icon.png and b/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/icon.png differ
diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/meta.json
index a0a960ab502..623b42880f9 100644
--- a/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Weapons/Melee/radiantsword.rsi/meta.json
@@ -1,14 +1,34 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Sprite by AeraAulin(Github)",
+    "copyright": "Sprite by AeraAulin(Github), icon animation by Stop-Signs(Github)",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "icon"
+            "name": "icon",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/_DV/Shaders/darkvision.swsl b/Resources/Textures/_DV/Shaders/darkvision.swsl
new file mode 100644
index 00000000000..f45940e2f8a
--- /dev/null
+++ b/Resources/Textures/_DV/Shaders/darkvision.swsl
@@ -0,0 +1,23 @@
+// Remaps the lighting buffer for darkvision: output = lightFloor + light * lightGain.
+// blend_mode none because this rewrites the buffer wholesale; with lightFloor 0 and
+// lightGain 1 it acts as an exact copy.
+light_mode unshaded;
+blend_mode none;
+
+uniform highp float lightFloor;
+uniform highp float lightGain;
+uniform highp float lightExp;
+
+highp vec3 lowerBound(highp vec3 col, highp float bound) {
+    return vec3(
+        max(col.r, bound),
+        max(col.g, bound),
+        max(col.b, bound)
+    );
+}
+
+void fragment() {
+    highp vec4 light = zTexture(UV);
+
+    COLOR = vec4(lowerBound(pow((light.rgb * lightGain), vec3(lightExp)), lightFloor), 1.0);
+}
diff --git a/Resources/Textures/_Impstation/Interface/Misc/Interface - Shortcut.lnk b/Resources/Textures/_Impstation/Interface/Misc/Interface - Shortcut.lnk
deleted file mode 100644
index 08381814569..00000000000
Binary files a/Resources/Textures/_Impstation/Interface/Misc/Interface - Shortcut.lnk and /dev/null differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png
new file mode 100644
index 00000000000..274a620764d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png
new file mode 100644
index 00000000000..bac8518f8df
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png
new file mode 100644
index 00000000000..ae3c124a8a9
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png
new file mode 100644
index 00000000000..851d5bcf738
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png
new file mode 100644
index 00000000000..b290761994c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png
new file mode 100644
index 00000000000..e2d31f7d082
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png
new file mode 100644
index 00000000000..7390fb51e03
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png
new file mode 100644
index 00000000000..0f6c8d587a8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png
new file mode 100644
index 00000000000..df52a31b25c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png
new file mode 100644
index 00000000000..6ea24d325f5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png
new file mode 100644
index 00000000000..e25118fd992
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png
new file mode 100644
index 00000000000..45becea22e5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json
new file mode 100644
index 00000000000..736438b2b27
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json
@@ -0,0 +1,106 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original ore bag sprites homegrown by @ninruB#7795, inhand sprites by лазік#7305; resprited in engineering department colors by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon-bluespace-overlay",
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "icon-bluespace-overlay-unshaded",
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "equipped-BELT-bluespace-overlay",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "equipped-BELT-bluespace-overlay-unshaded",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "inhand-left-bluespace-overlay",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "inhand-left-bluespace-overlay-unshaded",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "inhand-right-bluespace-overlay",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    },
+    {
+      "name": "inhand-right-bluespace-overlay-unshaded",
+      "directions": 4,
+      "delays":
+	  [
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
+        [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
+      ]
+    }
+  ]
+}