diff --git a/.editorconfig b/.editorconfig
index 872a068c7c..3e44d1a281 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,7 @@ tab_width = 4
 #end_of_line = crlf
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 120
 
 #### .NET Coding Conventions ####
 
@@ -336,7 +337,11 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 
 # ReSharper properties
 resharper_braces_for_ifelse = required_for_multiline
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_parameters_style = chop_if_long
 resharper_keep_existing_attribute_arrangement = true
+resharper_wrap_chained_binary_patterns = chop_if_long
+resharper_wrap_chained_method_calls = chop_if_long
 
 [*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
 indent_size = 2
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index e5f492900c..9b7fd75436 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -87,14 +87,12 @@ namespace Content.Client.Changelog
                 if (!tab.AdminOnly || isAdmin)
                 {
                     Tabs.SetTabVisible(i, true);
-                    tab.Visible = true;
                     visibleTabs++;
                     firstVisible ??= i;
                 }
                 else
                 {
                     Tabs.SetTabVisible(i, false);
-                    tab.Visible = false;
                 }
             }
 
diff --git a/Content.Client/Chat/UI/EmotesMenu.xaml b/Content.Client/Chat/UI/EmotesMenu.xaml
index 819a6543c4..cc4d5bb77e 100644
--- a/Content.Client/Chat/UI/EmotesMenu.xaml
+++ b/Content.Client/Chat/UI/EmotesMenu.xaml
@@ -12,7 +12,7 @@
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
         </ui:RadialMenuTextureButton>
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
-            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Actions/scream.png"/>
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Emotes/vocal.png"/>
         </ui:RadialMenuTextureButton>
         <ui:RadialMenuTextureButton StyleClasses="RadialMenuButton" SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 88f5bb82ab..929b56c933 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -119,6 +119,7 @@ namespace Content.Client.Entry
             _prototypeManager.RegisterIgnore("wireLayout");
             _prototypeManager.RegisterIgnore("alertLevels");
             _prototypeManager.RegisterIgnore("nukeopsRole");
+            _prototypeManager.RegisterIgnore("ghostRoleRaffleDecider");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();
diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
index 284c668190..8774c1dfb5 100644
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -100,7 +100,7 @@ public partial class BaseShuttleControl : MapGridControl
             var textDimensions = handle.GetDimensions(Font, text, UIScale);
 
             handle.DrawCircle(origin, scaledRadius, color, false);
-            handle.DrawString(Font, ScalePosition(new Vector2(0f, -radius)) - new Vector2(0f, textDimensions.Y), text, color);
+            handle.DrawString(Font, ScalePosition(new Vector2(0f, -radius)) - new Vector2(0f, textDimensions.Y), text, UIScale, color);
         }
 
         const int gridLinesRadial = 8;
diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
index af93033a9d..6327757dec 100644
--- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
+++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs
@@ -3,7 +3,6 @@ using Content.Client.Actions.UI;
 using Content.Client.Cooldown;
 using Content.Shared.Alert;
 using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Timing;
@@ -117,7 +116,9 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
-            _entityManager.QueueDeleteEntity(_spriteViewEntity);
+
+            if (!_entityManager.Deleted(_spriteViewEntity))
+                _entityManager.QueueDeleteEntity(_spriteViewEntity);
         }
     }
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
index 92e38e35e0..ffde5d69f7 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
@@ -5,7 +5,7 @@
             Text="{Loc 'ghost-roles-window-request-role-button'}"
             StyleClasses="OpenRight"
             HorizontalAlignment="Left"
-            SetWidth="150"/>
+            SetWidth="300"/>
     <Button Name="FollowButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-follow-role-button'}"
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
index 68bd39a141..8a953b76a7 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
@@ -1,9 +1,72 @@
-using Robust.Client.AutoGenerated;
+using Content.Shared.Ghost.Roles;
+using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles;
 
 [GenerateTypedNameReferences]
 public sealed partial class GhostRoleEntryButtons : BoxContainer
 {
+    [Dependency] private readonly IGameTiming _timing = default!;
+    private readonly GhostRoleKind _ghostRoleKind;
+    private readonly uint _playerCount;
+    private readonly TimeSpan _raffleEndTime = TimeSpan.MinValue;
+
+    public GhostRoleEntryButtons(GhostRoleInfo ghostRoleInfo)
+    {
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _ghostRoleKind = ghostRoleInfo.Kind;
+        if (IsActiveRaffle(_ghostRoleKind))
+        {
+            _playerCount = ghostRoleInfo.RafflePlayerCount;
+            _raffleEndTime = ghostRoleInfo.RaffleEndTime;
+        }
+
+        UpdateRequestButton();
+    }
+
+    private void UpdateRequestButton()
+    {
+        var messageId = _ghostRoleKind switch
+        {
+            GhostRoleKind.FirstComeFirstServe => "ghost-roles-window-request-role-button",
+            GhostRoleKind.RaffleReady => "ghost-roles-window-join-raffle-button",
+            GhostRoleKind.RaffleInProgress => "ghost-roles-window-raffle-in-progress-button",
+            GhostRoleKind.RaffleJoined => "ghost-roles-window-leave-raffle-button",
+            _ => throw new ArgumentOutOfRangeException(nameof(_ghostRoleKind),
+                $"Unknown {nameof(GhostRoleKind)} '{_ghostRoleKind}'")
+        };
+
+        if (IsActiveRaffle(_ghostRoleKind))
+        {
+            var timeLeft = _timing.CurTime <= _raffleEndTime
+                ? _raffleEndTime - _timing.CurTime
+                : TimeSpan.Zero;
+
+            var timeString = $"{timeLeft.Minutes:0}:{timeLeft.Seconds:00}";
+            RequestButton.Text = Loc.GetString(messageId, ("time", timeString), ("players", _playerCount));
+        }
+        else
+        {
+            RequestButton.Text = Loc.GetString(messageId);
+        }
+    }
+
+    private static bool IsActiveRaffle(GhostRoleKind kind)
+    {
+        return kind is GhostRoleKind.RaffleInProgress or GhostRoleKind.RaffleJoined;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+        if (IsActiveRaffle(_ghostRoleKind))
+        {
+            UpdateRequestButton();
+        }
+    }
 }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
index d6a53adff2..fc53cc72ae 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
@@ -26,7 +26,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 
             foreach (var role in roles)
             {
-                var button = new GhostRoleEntryButtons();
+                var button = new GhostRoleEntryButtons(role);
                 button.RequestButton.OnPressed += _ => OnRoleSelected?.Invoke(role);
                 button.FollowButton.OnPressed += _ => OnRoleFollow?.Invoke(role);
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 8e72eafd97..33358a68a4 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -20,13 +20,24 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
         {
             _window = new GhostRolesWindow();
 
-            _window.OnRoleRequested += info =>
+            _window.OnRoleRequestButtonClicked += info =>
             {
-                if (_windowRules != null)
-                    _windowRules.Close();
+                _windowRules?.Close();
+
+                if (info.Kind == GhostRoleKind.RaffleJoined)
+                {
+                    SendMessage(new LeaveGhostRoleRaffleMessage(info.Identifier));
+                    return;
+                }
+
                 _windowRules = new GhostRoleRulesWindow(info.Rules, _ =>
                 {
-                    SendMessage(new GhostRoleTakeoverRequestMessage(info.Identifier));
+                    SendMessage(new RequestGhostRoleMessage(info.Identifier));
+
+                    // if raffle role, close rules window on request, otherwise do
+                    // old behavior of waiting for the server to close it
+                    if (info.Kind != GhostRoleKind.FirstComeFirstServe)
+                        _windowRules?.Close();
                 });
                 _windowRulesId = info.Identifier;
                 _windowRules.OnClose += () =>
@@ -38,7 +49,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 
             _window.OnRoleFollow += info =>
             {
-                SendMessage(new GhostRoleFollowRequestMessage(info.Identifier));
+                SendMessage(new FollowGhostRoleMessage(info.Identifier));
             };
 
             _window.OnClose += () =>
@@ -64,7 +75,8 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
         {
             base.HandleState(state);
 
-            if (state is not GhostRolesEuiState ghostState) return;
+            if (state is not GhostRolesEuiState ghostState)
+                return;
             _window.ClearEntries();
 
             var entityManager = IoCManager.Resolve<IEntityManager>();
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml
index c91269063e..ea16a6f18a 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml
@@ -1,7 +1,7 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ghost-roles-window-title'}"
-            MinSize="450 400"
-            SetSize="400 500">
+            MinSize="490 400"
+            SetSize="490 500">
     <Label Name="NoRolesMessage"
            Text="{Loc 'ghost-roles-window-no-roles-available-label'}"
            VerticalAlignment="Top" />
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index 547d990e76..2e7c99641b 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -9,7 +9,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
     [GenerateTypedNameReferences]
     public sealed partial class GhostRolesWindow : DefaultWindow
     {
-        public event Action<GhostRoleInfo>? OnRoleRequested;
+        public event Action<GhostRoleInfo>? OnRoleRequestButtonClicked;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
         public void ClearEntries()
@@ -23,7 +23,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             NoRolesMessage.Visible = false;
 
             var entry = new GhostRolesEntry(name, description, hasAccess, reason, roles, spriteSystem);
-            entry.OnRoleSelected += OnRoleRequested;
+            entry.OnRoleSelected += OnRoleRequestButtonClicked;
             entry.OnRoleFollow += OnRoleFollow;
             EntryContainer.AddChild(entry);
         }
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
index 5c5e31de03..1e24d4c84c 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
@@ -1,4 +1,5 @@
 using Content.Client.Eui;
+using Content.Server.Ghost.Roles.Raffles;
 using Content.Shared.Eui;
 using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
@@ -41,7 +42,7 @@ public sealed class MakeGhostRoleEui : BaseEui
         _window.OpenCentered();
     }
 
-    private void OnMake(NetEntity entity, string name, string description, string rules, bool makeSentient)
+    private void OnMake(NetEntity entity, string name, string description, string rules, bool makeSentient, GhostRoleRaffleSettings? raffleSettings)
     {
         var session = _playerManager.LocalSession;
         if (session == null)
@@ -49,12 +50,22 @@ public sealed class MakeGhostRoleEui : BaseEui
             return;
         }
 
+        var command = raffleSettings is not null ? "makeghostroleraffled" : "makeghostrole";
+
         var makeGhostRoleCommand =
-            $"makeghostrole " +
+            $"{command} " +
             $"\"{CommandParsing.Escape(entity.ToString())}\" " +
             $"\"{CommandParsing.Escape(name)}\" " +
-            $"\"{CommandParsing.Escape(description)}\" " +
-            $"\"{CommandParsing.Escape(rules)}\"";
+            $"\"{CommandParsing.Escape(description)}\" ";
+
+        if (raffleSettings is not null)
+        {
+            makeGhostRoleCommand += $"{raffleSettings.InitialDuration} " +
+                                    $"{raffleSettings.JoinExtendsDurationBy} " +
+                                    $"{raffleSettings.MaxDuration} ";
+        }
+
+        makeGhostRoleCommand += $"\"{CommandParsing.Escape(rules)}\"";
 
         _consoleHost.ExecuteCommand(session, makeGhostRoleCommand);
 
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
index 1d4033eed3..ff8e56f8fe 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
@@ -22,6 +22,24 @@
             <Label Name="MakeSentientLabel" Text="Make Sentient" />
             <CheckBox Name="MakeSentientCheckbox" />
         </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Name="RaffleLabel" Text="Raffle Role?" />
+            <OptionButton Name="RaffleButton" />
+        </BoxContainer>
+        <BoxContainer Name="RaffleCustomSettingsContainer" Orientation="Vertical" Visible="False">
+            <BoxContainer Orientation="Horizontal">
+                <Label Name="RaffleInitialDurationLabel" Text="Initial Duration (s)" />
+                <SpinBox Name="RaffleInitialDuration" HorizontalExpand="True" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Label Name="RaffleJoinExtendsDurationByLabel" Text="Joins Extend By (s)" />
+                <SpinBox Name="RaffleJoinExtendsDurationBy" HorizontalExpand="True" />
+            </BoxContainer>
+            <BoxContainer Orientation="Horizontal">
+                <Label Name="RaffleMaxDurationLabel" Text="Max Duration (s)" />
+                <SpinBox Name="RaffleMaxDuration" HorizontalExpand="True" />
+            </BoxContainer>
+        </BoxContainer>
         <BoxContainer Orientation="Horizontal">
             <Button Name="MakeButton" Text="Make" />
         </BoxContainer>
diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 0839510970..6711d76b10 100644
--- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -1,7 +1,12 @@
-using System.Numerics;
+using System.Linq;
+using System.Numerics;
+using Content.Server.Ghost.Roles.Raffles;
+using Content.Shared.Ghost.Roles.Raffles;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
@@ -9,10 +14,20 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
     [GenerateTypedNameReferences]
     public sealed partial class MakeGhostRoleWindow : DefaultWindow
     {
-        public delegate void MakeRole(NetEntity uid, string name, string description, string rules, bool makeSentient);
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        private readonly List<GhostRoleRaffleSettingsPrototype> _rafflePrototypes = [];
+
+        private const int RaffleDontRaffleId = -1;
+        private const int RaffleCustomRaffleId = -2;
+        private int _raffleSettingId = RaffleDontRaffleId;
+
+        private NetEntity? Entity { get; set; }
+
+        public event MakeRole? OnMake;
 
         public MakeGhostRoleWindow()
         {
+            IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
             MakeSentientLabel.MinSize = new Vector2(150, 0);
@@ -23,13 +38,87 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             RoleDescription.MinSize = new Vector2(300, 0);
             RoleRulesLabel.MinSize = new Vector2(150, 0);
             RoleRules.MinSize = new Vector2(300, 0);
+            RaffleLabel.MinSize = new Vector2(150, 0);
+            RaffleButton.MinSize = new Vector2(300, 0);
+            RaffleInitialDurationLabel.MinSize = new Vector2(150, 0);
+            RaffleInitialDuration.MinSize = new Vector2(300, 0);
+            RaffleJoinExtendsDurationByLabel.MinSize = new Vector2(150, 0);
+            RaffleJoinExtendsDurationBy.MinSize = new Vector2(270, 0);
+            RaffleMaxDurationLabel.MinSize = new Vector2(150, 0);
+            RaffleMaxDuration.MinSize = new Vector2(270, 0);
 
-            MakeButton.OnPressed += OnPressed;
+            RaffleInitialDuration.OverrideValue(30);
+            RaffleJoinExtendsDurationBy.OverrideValue(5);
+            RaffleMaxDuration.OverrideValue(60);
+
+            RaffleInitialDuration.SetButtons(new List<int> { -30, -10 }, new List<int> { 10, 30 });
+            RaffleJoinExtendsDurationBy.SetButtons(new List<int> { -10, -5 }, new List<int> { 5, 10 });
+            RaffleMaxDuration.SetButtons(new List<int> { -30, -10 }, new List<int> { 10, 30 });
+
+            RaffleInitialDuration.IsValid = duration => duration > 0;
+            RaffleJoinExtendsDurationBy.IsValid = duration => duration >= 0;
+            RaffleMaxDuration.IsValid = duration => duration > 0;
+
+            RaffleInitialDuration.ValueChanged += OnRaffleDurationChanged;
+            RaffleJoinExtendsDurationBy.ValueChanged += OnRaffleDurationChanged;
+            RaffleMaxDuration.ValueChanged += OnRaffleDurationChanged;
+
+
+            RaffleButton.AddItem("Don't raffle", RaffleDontRaffleId);
+            RaffleButton.AddItem("Custom settings", RaffleCustomRaffleId);
+
+            var raffleProtos =
+                _prototypeManager.EnumeratePrototypes<GhostRoleRaffleSettingsPrototype>();
+
+            var idx = 0;
+            foreach (var raffleProto in raffleProtos)
+            {
+                _rafflePrototypes.Add(raffleProto);
+                var s = raffleProto.Settings;
+                var label =
+                    $"{raffleProto.ID} (initial {s.InitialDuration}s, max {s.MaxDuration}s, join adds {s.JoinExtendsDurationBy}s)";
+                RaffleButton.AddItem(label, idx++);
+            }
+
+            MakeButton.OnPressed += OnMakeButtonPressed;
+            RaffleButton.OnItemSelected += OnRaffleButtonItemSelected;
         }
 
-        private NetEntity? Entity { get; set; }
+        private void OnRaffleDurationChanged(ValueChangedEventArgs args)
+        {
+            ValidateRaffleDurations();
+        }
 
-        public event MakeRole? OnMake;
+        private void ValidateRaffleDurations()
+        {
+            if (RaffleInitialDuration.Value > RaffleMaxDuration.Value)
+            {
+                MakeButton.Disabled = true;
+                MakeButton.ToolTip = "The initial duration must not exceed the maximum duration.";
+            }
+            else
+            {
+                MakeButton.Disabled = false;
+                MakeButton.ToolTip = null;
+            }
+        }
+
+        private void OnRaffleButtonItemSelected(OptionButton.ItemSelectedEventArgs args)
+        {
+            _raffleSettingId = args.Id;
+            args.Button.SelectId(args.Id);
+            if (args.Id != RaffleCustomRaffleId)
+            {
+                RaffleCustomSettingsContainer.Visible = false;
+                MakeButton.ToolTip = null;
+                MakeButton.Disabled = false;
+            }
+            else
+            {
+                RaffleCustomSettingsContainer.Visible = true;
+                ValidateRaffleDurations();
+            }
+        }
 
         public void SetEntity(IEntityManager entManager, NetEntity entity)
         {
@@ -38,14 +127,32 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
             RoleEntity.Text = $"{entity}";
         }
 
-        private void OnPressed(ButtonEventArgs args)
+        private void OnMakeButtonPressed(ButtonEventArgs args)
         {
             if (Entity == null)
             {
                 return;
             }
 
-            OnMake?.Invoke(Entity.Value, RoleName.Text, RoleDescription.Text, RoleRules.Text, MakeSentientCheckbox.Pressed);
+            GhostRoleRaffleSettings? raffleSettings = null;
+
+            if (_raffleSettingId == RaffleCustomRaffleId)
+            {
+                raffleSettings = new GhostRoleRaffleSettings()
+                {
+                    InitialDuration = (uint) RaffleInitialDuration.Value,
+                    JoinExtendsDurationBy = (uint) RaffleJoinExtendsDurationBy.Value,
+                    MaxDuration = (uint) RaffleMaxDuration.Value
+                };
+            }
+            else if (_raffleSettingId != RaffleDontRaffleId)
+            {
+                raffleSettings = _rafflePrototypes[_raffleSettingId].Settings;
+            }
+
+            OnMake?.Invoke(Entity.Value, RoleName.Text, RoleDescription.Text, RoleRules.Text, MakeSentientCheckbox.Pressed, raffleSettings);
         }
+
+        public delegate void MakeRole(NetEntity uid, string name, string description, string rules, bool makeSentient, GhostRoleRaffleSettings? settings);
     }
 }
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
index 414cf4bb56..37dca72137 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifier.cs
@@ -3,6 +3,7 @@ using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
+using static Robust.UnitTesting.RobustIntegrationTest;
 
 namespace Content.IntegrationTests.Tests.Interaction;
 
@@ -54,7 +55,7 @@ public abstract partial class InteractionTest
         /// <summary>
         /// Convert applicable entity prototypes into stack prototypes.
         /// </summary>
-        public void ConvertToStack(IPrototypeManager protoMan, IComponentFactory factory)
+        public async Task ConvertToStack(IPrototypeManager protoMan, IComponentFactory factory, ServerIntegrationInstance server)
         {
             if (Converted)
                 return;
@@ -73,11 +74,14 @@ public abstract partial class InteractionTest
                 return;
             }
 
-            if (entProto.TryGetComponent<StackComponent>(factory.GetComponentName(typeof(StackComponent)),
-                    out var stackComp))
+            StackComponent? stack = null;
+            await server.WaitPost(() =>
             {
-                Prototype = stackComp.StackTypeId;
-            }
+                entProto.TryGetComponent(factory.GetComponentName(typeof(StackComponent)), out stack);
+            });
+
+            if (stack != null)
+                Prototype = stack.StackTypeId;
         }
     }
 
@@ -100,11 +104,14 @@ public abstract partial class InteractionTest
             return default;
         }
 
-        if (entProto.TryGetComponent<StackComponent>(Factory.GetComponentName(typeof(StackComponent)),
-                out var stackComp))
+        StackComponent? stack = null;
+        await Server.WaitPost(() =>
         {
-            return await SpawnEntity((stackComp.StackTypeId, spec.Quantity), coords);
-        }
+            entProto.TryGetComponent(Factory.GetComponentName(typeof(StackComponent)), out stack);
+        });
+
+        if (stack != null)
+            return await SpawnEntity((stack.StackTypeId, spec.Quantity), coords);
 
         Assert.That(spec.Quantity, Is.EqualTo(1), "SpawnEntity only supports returning a singular entity");
         await Server.WaitPost(() => uid = SEntMan.SpawnEntity(spec.Prototype, coords));
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifierCollection.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifierCollection.cs
index 520d2699c1..7f7de3318b 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifierCollection.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.EntitySpecifierCollection.cs
@@ -5,6 +5,7 @@ using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
+using static Robust.UnitTesting.RobustIntegrationTest;
 
 namespace Content.IntegrationTests.Tests.Interaction;
 
@@ -111,7 +112,7 @@ public abstract partial class InteractionTest
         /// <summary>
         /// Convert applicable entity prototypes into stack prototypes.
         /// </summary>
-        public void ConvertToStacks(IPrototypeManager protoMan, IComponentFactory factory)
+        public async Task ConvertToStacks(IPrototypeManager protoMan, IComponentFactory factory, ServerIntegrationInstance server)
         {
             if (Converted)
                 return;
@@ -130,14 +131,17 @@ public abstract partial class InteractionTest
                     continue;
                 }
 
-                if (!entProto.TryGetComponent<StackComponent>(factory.GetComponentName(typeof(StackComponent)),
-                        out var stackComp))
+                StackComponent? stack = null;
+                await server.WaitPost(() =>
                 {
+                    entProto.TryGetComponent(factory.GetComponentName(typeof(StackComponent)), out stack);
+                });
+
+                if (stack == null)
                     continue;
-                }
 
                 toRemove.Add(id);
-                toAdd.Add((stackComp.StackTypeId, quantity));
+                toAdd.Add((stack.StackTypeId, quantity));
             }
 
             foreach (var id in toRemove)
diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
index 95cf8a06df..19ca83a971 100644
--- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
@@ -5,12 +5,9 @@ using System.Linq;
 using System.Numerics;
 using System.Reflection;
 using Content.Client.Construction;
-using Content.Server.Atmos;
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Construction.Components;
 using Content.Server.Gravity;
-using Content.Server.Item;
 using Content.Server.Power.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Construction.Prototypes;
@@ -634,7 +631,7 @@ public abstract partial class InteractionTest
         var entities = await DoEntityLookup(flags);
         var found = ToEntityCollection(entities);
         expected.Remove(found);
-        expected.ConvertToStacks(ProtoMan, Factory);
+        await expected.ConvertToStacks(ProtoMan, Factory, Server);
 
         if (expected.Entities.Count == 0)
             return;
@@ -670,7 +667,7 @@ public abstract partial class InteractionTest
         LookupFlags flags = LookupFlags.Uncontained | LookupFlags.Contained,
         bool shouldSucceed = true)
     {
-        spec.ConvertToStack(ProtoMan, Factory);
+        await spec.ConvertToStack(ProtoMan, Factory, Server);
 
         var entities = await DoEntityLookup(flags);
         foreach (var uid in entities)
diff --git a/Content.IntegrationTests/Tests/StorageTest.cs b/Content.IntegrationTests/Tests/StorageTest.cs
index 659b310661..2d28534347 100644
--- a/Content.IntegrationTests/Tests/StorageTest.cs
+++ b/Content.IntegrationTests/Tests/StorageTest.cs
@@ -92,23 +92,32 @@ namespace Content.IntegrationTests.Tests
             var allSizes = protoMan.EnumeratePrototypes<ItemSizePrototype>().ToList();
             allSizes.Sort();
 
-            Assert.Multiple(() =>
+            await Assert.MultipleAsync(async () =>
             {
                 foreach (var proto in pair.GetPrototypesWithComponent<StorageFillComponent>())
                 {
                     if (proto.HasComponent<EntityStorageComponent>(compFact))
                         continue;
 
-                    if (!proto.TryGetComponent<StorageComponent>("Storage", out var storage))
+                    StorageComponent? storage = null;
+                    ItemComponent? item = null;
+                    StorageFillComponent fill = default!;
+                    var size = 0;
+                    await server.WaitAssertion(() =>
                     {
-                        Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!");
+                        if (!proto.TryGetComponent("Storage", out storage))
+                        {
+                            Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!");
+                            return;
+                        }
+
+                        proto.TryGetComponent("Item", out item);
+                        fill = (StorageFillComponent) proto.Components[id].Component;
+                        size = GetFillSize(fill, false, protoMan, itemSys);
+                    });
+
+                    if (storage == null)
                         continue;
-                    }
-
-                    proto.TryGetComponent<ItemComponent>("Item", out var item);
-
-                    var fill = (StorageFillComponent) proto.Components[id].Component;
-                    var size = GetFillSize(fill, false, protoMan, itemSys);
 
                     var maxSize = storage.MaxItemSize;
                     if (storage.MaxItemSize == null)
@@ -138,7 +147,13 @@ namespace Content.IntegrationTests.Tests
                         if (!protoMan.TryIndex<EntityPrototype>(entry.PrototypeId, out var fillItem))
                             continue;
 
-                        if (!fillItem.TryGetComponent<ItemComponent>("Item", out var entryItem))
+                        ItemComponent? entryItem = null;
+                        await server.WaitPost(() =>
+                        {
+                            fillItem.TryGetComponent("Item", out entryItem);
+                        });
+
+                        if (entryItem == null)
                             continue;
 
                         Assert.That(protoMan.Index(entryItem.Size).Weight,
@@ -164,25 +179,25 @@ namespace Content.IntegrationTests.Tests
 
             var itemSys = entMan.System<SharedItemSystem>();
 
-            Assert.Multiple(() =>
+            foreach (var proto in pair.GetPrototypesWithComponent<StorageFillComponent>())
             {
-                foreach (var proto in pair.GetPrototypesWithComponent<StorageFillComponent>())
-                {
-                    if (proto.HasComponent<StorageComponent>(compFact))
-                        continue;
+                if (proto.HasComponent<StorageComponent>(compFact))
+                    continue;
 
-                    if (!proto.TryGetComponent<EntityStorageComponent>("EntityStorage", out var entStorage))
-                    {
+                await server.WaitAssertion(() =>
+                {
+                    if (!proto.TryGetComponent("EntityStorage", out EntityStorageComponent? entStorage))
                         Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!");
-                        continue;
-                    }
+
+                    if (entStorage == null)
+                        return;
 
                     var fill = (StorageFillComponent) proto.Components[id].Component;
                     var size = GetFillSize(fill, true, protoMan, itemSys);
                     Assert.That(size, Is.LessThanOrEqualTo(entStorage.Capacity),
                         $"{proto.ID} storage fill is too large.");
-                }
-            });
+                });
+            }
             await pair.CleanReturnAsync();
         }
 
diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs
index 696b7a1dcf..3e775b9c35 100644
--- a/Content.Server/Access/Systems/PresetIdCardSystem.cs
+++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs
@@ -33,8 +33,8 @@ public sealed class PresetIdCardSystem : EntitySystem
             var station = _stationSystem.GetOwningStation(uid);
 
             // If we're not on an extended access station, the ID is already configured correctly from MapInit.
-            if (station == null || !Comp<StationJobsComponent>(station.Value).ExtendedAccess)
-                return;
+            if (station == null || !TryComp<StationJobsComponent>(station.Value, out var jobsComp) || !jobsComp.ExtendedAccess)
+                continue;
 
             SetupIdAccess(uid, card, true);
             SetupIdName(uid, card);
diff --git a/Content.Server/Antag/AntagSelectionSystem.API.cs b/Content.Server/Antag/AntagSelectionSystem.API.cs
index f8ec5bcafc..6acd17a35b 100644
--- a/Content.Server/Antag/AntagSelectionSystem.API.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.API.cs
@@ -7,6 +7,7 @@ using Content.Shared.Chat;
 using Content.Shared.Mind;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
+using Robust.Shared.Enums;
 using Robust.Shared.Player;
 
 namespace Content.Server.Antag;
@@ -63,15 +64,17 @@ public sealed partial class AntagSelectionSystem
     /// </summary>
     public int GetTargetAntagCount(Entity<AntagSelectionComponent> ent, AntagSelectionPlayerPool? pool, AntagSelectionDefinition def)
     {
-        var poolSize = pool?.Count ?? _playerManager.Sessions.Length;
+        var poolSize = pool?.Count ?? _playerManager.Sessions
+            .Count(s => s.State.Status is not SessionStatus.Disconnected and not SessionStatus.Zombie);
+
         // factor in other definitions' affect on the count.
         var countOffset = 0;
         foreach (var otherDef in ent.Comp.Definitions)
         {
-            countOffset += Math.Clamp(poolSize / otherDef.PlayerRatio, otherDef.Min, otherDef.Max) * otherDef.PlayerRatio;
+            countOffset += Math.Clamp((poolSize - countOffset) / otherDef.PlayerRatio, otherDef.Min, otherDef.Max) * otherDef.PlayerRatio;
         }
         // make sure we don't double-count the current selection
-        countOffset -= Math.Clamp((poolSize + countOffset) / def.PlayerRatio, def.Min, def.Max) * def.PlayerRatio;
+        countOffset -= Math.Clamp(poolSize / def.PlayerRatio, def.Min, def.Max) * def.PlayerRatio;
 
         return Math.Clamp((poolSize - countOffset) / def.PlayerRatio, def.Min, def.Max);
     }
diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs
index 6bfb7394f5..57df82d6fd 100644
--- a/Content.Server/Antag/AntagSelectionSystem.cs
+++ b/Content.Server/Antag/AntagSelectionSystem.cs
@@ -280,11 +280,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             _transform.SetMapCoordinates((player, playerXform), pos);
         }
 
+        // If we want to just do a ghost role spawner, set up data here and then return early.
+        // This could probably be an event in the future if we want to be more refined about it.
         if (isSpawner)
         {
             if (!TryComp<GhostRoleAntagSpawnerComponent>(player, out var spawnerComp))
             {
-                Log.Error("Antag spawner with GhostRoleAntagSpawnerComponent.");
+                Log.Error($"Antag spawner {player} does not have a GhostRoleAntagSpawnerComponent.");
                 return;
             }
 
@@ -293,6 +295,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             return;
         }
 
+        // The following is where we apply components, equipment, and other changes to our antagonist entity.
         EntityManager.AddComponents(player, def.Components);
         _stationSpawning.EquipStartingGear(player, def.StartingGear);
 
@@ -308,11 +311,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true);
             _role.MindAddRoles(curMind.Value, def.MindComponents);
             ent.Comp.SelectedMinds.Add((curMind.Value, Name(player)));
-        }
-
-        if (def.Briefing is { } briefing)
-        {
-            SendBriefing(session, briefing);
+            SendBriefing(session, def.Briefing);
         }
 
         var afterEv = new AfterAntagEntitySelectedEvent(session, player, ent, def);
@@ -325,7 +324,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     public AntagSelectionPlayerPool GetPlayerPool(Entity<AntagSelectionComponent> ent, List<ICommonSession> sessions, AntagSelectionDefinition def)
     {
         var preferredList = new List<ICommonSession>();
-        var secondBestList = new List<ICommonSession>();
+        var fallbackList = new List<ICommonSession>();
         var unwantedList = new List<ICommonSession>();
         var invalidList = new List<ICommonSession>();
         foreach (var session in sessions)
@@ -344,7 +343,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             }
             else if (def.FallbackRoles.Count != 0 && pref.AntagPreferences.Any(p => def.FallbackRoles.Contains(p)))
             {
-                secondBestList.Add(session);
+                fallbackList.Add(session);
             }
             else
             {
@@ -352,7 +351,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
             }
         }
 
-        return new AntagSelectionPlayerPool(new() { preferredList, secondBestList, unwantedList, invalidList });
+        return new AntagSelectionPlayerPool(new() { preferredList, fallbackList, unwantedList, invalidList });
     }
 
     /// <summary>
diff --git a/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs b/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
index d89d61606d..8e96595b4f 100644
--- a/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
+++ b/Content.Server/Antag/Mimic/MobReplacementRuleComponent.cs
@@ -17,5 +17,5 @@ public sealed partial class MobReplacementRuleComponent : Component
     /// Chance per-entity.
     /// </summary>
     [DataField]
-    public float Chance = 0.001f;
+    public float Chance = 0.004f;
 }
diff --git a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
index 755312554c..3d99db1129 100644
--- a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
+++ b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
@@ -9,180 +9,37 @@ using System.Numerics;
 
 namespace Content.Server.Chemistry.Containers.EntitySystems;
 
+[Obsolete("This is being depreciated. Use SharedSolutionContainerSystem instead!")]
 public sealed partial class SolutionContainerSystem : SharedSolutionContainerSystem
 {
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<SolutionContainerManagerComponent, ComponentShutdown>(OnComponentShutdown);
-        SubscribeLocalEvent<ContainedSolutionComponent, ComponentShutdown>(OnComponentShutdown);
-    }
-
-
+    [Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
     public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name)
         => EnsureSolution(entity, name, out _);
 
+    [Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
     public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, out bool existed)
         => EnsureSolution(entity, name, FixedPoint2.Zero, out existed);
 
+    [Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
     public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, FixedPoint2 maxVol, out bool existed)
         => EnsureSolution(entity, name, maxVol, null, out existed);
 
+    [Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
     public Solution EnsureSolution(Entity<MetaDataComponent?> entity, string name, FixedPoint2 maxVol, Solution? prototype, out bool existed)
     {
-        var (uid, meta) = entity;
-        if (!Resolve(uid, ref meta))
-            throw new InvalidOperationException("Attempted to ensure solution on invalid entity.");
-
-        var manager = EnsureComp<SolutionContainerManagerComponent>(uid);
-        if (meta.EntityLifeStage >= EntityLifeStage.MapInitialized)
-            return EnsureSolutionEntity((uid, manager), name, maxVol, prototype, out existed).Comp.Solution;
-        else
-            return EnsureSolutionPrototype((uid, manager), name, maxVol, prototype, out existed);
+        EnsureSolution(entity, name, maxVol, prototype, out existed, out var solution);
+        return solution!;//solution is only ever null on the client, so we can suppress this
     }
 
-    public void EnsureAllSolutions(Entity<SolutionContainerManagerComponent> entity)
+    [Obsolete("This is being depreciated. Use the ensure methods in SharedSolutionContainerSystem instead!")]
+    public Entity<SolutionComponent> EnsureSolutionEntity(
+        Entity<SolutionContainerManagerComponent?> entity,
+        string name,
+        FixedPoint2 maxVol,
+        Solution? prototype,
+        out bool existed)
     {
-        if (entity.Comp.Solutions is not { } prototypes)
-            return;
-
-        foreach (var (name, prototype) in prototypes)
-        {
-            EnsureSolutionEntity((entity.Owner, entity.Comp), name, prototype.MaxVolume, prototype, out _);
-        }
-
-        entity.Comp.Solutions = null;
-        Dirty(entity);
+        EnsureSolutionEntity(entity, name, out existed, out var solEnt, maxVol, prototype);
+        return solEnt!.Value;//solEnt is only ever null on the client, so we can suppress this
     }
-
-    public Entity<SolutionComponent> EnsureSolutionEntity(Entity<SolutionContainerManagerComponent?> entity, string name, FixedPoint2 maxVol, Solution? prototype, out bool existed)
-    {
-        existed = true;
-
-        var (uid, container) = entity;
-
-        var solutionSlot = ContainerSystem.EnsureContainer<ContainerSlot>(uid, $"solution@{name}", out existed);
-        if (!Resolve(uid, ref container, logMissing: false))
-        {
-            existed = false;
-            container = AddComp<SolutionContainerManagerComponent>(uid);
-            container.Containers.Add(name);
-        }
-        else if (!existed)
-        {
-            container.Containers.Add(name);
-            Dirty(uid, container);
-        }
-
-        var needsInit = false;
-        SolutionComponent solutionComp;
-        if (solutionSlot.ContainedEntity is not { } solutionId)
-        {
-            prototype ??= new() { MaxVolume = maxVol };
-            prototype.Name = name;
-            (solutionId, solutionComp, _) = SpawnSolutionUninitialized(solutionSlot, name, maxVol, prototype);
-            existed = false;
-            needsInit = true;
-            Dirty(uid, container);
-        }
-        else
-        {
-            solutionComp = Comp<SolutionComponent>(solutionId);
-            DebugTools.Assert(TryComp(solutionId, out ContainedSolutionComponent? relation) && relation.Container == uid && relation.ContainerName == name);
-            DebugTools.Assert(solutionComp.Solution.Name == name);
-
-            var solution = solutionComp.Solution;
-            solution.MaxVolume = FixedPoint2.Max(solution.MaxVolume, maxVol);
-
-            // Depending on MapInitEvent order some systems can ensure solution empty solutions and conflict with the prototype solutions.
-            // We want the reagents from the prototype to exist even if something else already created the solution.
-            if (prototype is { Volume.Value: > 0 })
-                solution.AddSolution(prototype, PrototypeManager);
-
-            Dirty(solutionId, solutionComp);
-        }
-
-        if (needsInit)
-            EntityManager.InitializeAndStartEntity(solutionId, Transform(solutionId).MapID);
-
-        return (solutionId, solutionComp);
-    }
-
-    private Solution EnsureSolutionPrototype(Entity<SolutionContainerManagerComponent?> entity, string name, FixedPoint2 maxVol, Solution? prototype, out bool existed)
-    {
-        existed = true;
-
-        var (uid, container) = entity;
-        if (!Resolve(uid, ref container, logMissing: false))
-        {
-            container = AddComp<SolutionContainerManagerComponent>(uid);
-            existed = false;
-        }
-
-        if (container.Solutions is null)
-            container.Solutions = new(SolutionContainerManagerComponent.DefaultCapacity);
-
-        if (!container.Solutions.TryGetValue(name, out var solution))
-        {
-            solution = prototype ?? new() { Name = name, MaxVolume = maxVol };
-            container.Solutions.Add(name, solution);
-            existed = false;
-        }
-        else
-            solution.MaxVolume = FixedPoint2.Max(solution.MaxVolume, maxVol);
-
-        Dirty(uid, container);
-        return solution;
-    }
-
-
-    private Entity<SolutionComponent, ContainedSolutionComponent> SpawnSolutionUninitialized(ContainerSlot container, string name, FixedPoint2 maxVol, Solution prototype)
-    {
-        var coords = new EntityCoordinates(container.Owner, Vector2.Zero);
-        var uid = EntityManager.CreateEntityUninitialized(null, coords, null);
-
-        var solution = new SolutionComponent() { Solution = prototype };
-        AddComp(uid, solution);
-
-        var relation = new ContainedSolutionComponent() { Container = container.Owner, ContainerName = name };
-        AddComp(uid, relation);
-
-        MetaData.SetEntityName(uid, $"solution - {name}");
-        ContainerSystem.Insert(uid, container, force: true);
-
-        return (uid, solution, relation);
-    }
-
-    #region Event Handlers
-
-    private void OnMapInit(Entity<SolutionContainerManagerComponent> entity, ref MapInitEvent args)
-    {
-        EnsureAllSolutions(entity);
-    }
-
-    private void OnComponentShutdown(Entity<SolutionContainerManagerComponent> entity, ref ComponentShutdown args)
-    {
-        foreach (var name in entity.Comp.Containers)
-        {
-            if (ContainerSystem.TryGetContainer(entity, $"solution@{name}", out var solutionContainer))
-                ContainerSystem.ShutdownContainer(solutionContainer);
-        }
-        entity.Comp.Containers.Clear();
-    }
-
-    private void OnComponentShutdown(Entity<ContainedSolutionComponent> entity, ref ComponentShutdown args)
-    {
-        if (TryComp(entity.Comp.Container, out SolutionContainerManagerComponent? container))
-        {
-            container.Containers.Remove(entity.Comp.ContainerName);
-            Dirty(entity.Comp.Container, container);
-        }
-
-        if (ContainerSystem.TryGetContainer(entity, $"solution@{entity.Comp.ContainerName}", out var solutionContainer))
-            ContainerSystem.ShutdownContainer(solutionContainer);
-    }
-
-    #endregion Event Handlers
 }
diff --git a/Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs b/Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
similarity index 100%
rename from Content.Server/Chemistry/ReagentEffects/ChemCleanBoodstream.cs
rename to Content.Server/Chemistry/ReagentEffects/ChemCleanBloodstream.cs
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 9d40d9400f..12d220512b 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -33,9 +33,11 @@ namespace Content.Server.Database
         }
 
         #region Preferences
-        public async Task<PlayerPreferences?> GetPlayerPreferencesAsync(NetUserId userId)
+        public async Task<PlayerPreferences?> GetPlayerPreferencesAsync(
+            NetUserId userId,
+            CancellationToken cancel = default)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             var prefs = await db.DbContext
                 .Preference
@@ -47,7 +49,7 @@ namespace Content.Server.Database
                     .ThenInclude(l => l.Groups)
                     .ThenInclude(group => group.Loadouts)
                 .AsSingleQuery()
-                .SingleOrDefaultAsync(p => p.UserId == userId.UserId);
+                .SingleOrDefaultAsync(p => p.UserId == userId.UserId, cancel);
 
             if (prefs is null)
                 return null;
@@ -515,13 +517,13 @@ namespace Content.Server.Database
         #endregion
 
         #region Playtime
-        public async Task<List<PlayTime>> GetPlayTimes(Guid player)
+        public async Task<List<PlayTime>> GetPlayTimes(Guid player, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             return await db.DbContext.PlayTime
                 .Where(p => p.PlayerId == player)
-                .ToListAsync();
+                .ToListAsync(cancel);
         }
 
         public async Task UpdatePlayTimes(IReadOnlyCollection<PlayTimeUpdate> updates)
@@ -673,7 +675,7 @@ namespace Content.Server.Database
          */
         public async Task<Admin?> GetAdminDataForAsync(NetUserId userId, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             return await db.DbContext.Admin
                 .Include(p => p.Flags)
@@ -688,7 +690,7 @@ namespace Content.Server.Database
 
         public async Task<AdminRank?> GetAdminRankDataForAsync(int id, CancellationToken cancel = default)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             return await db.DbContext.AdminRank
                 .Include(r => r.Flags)
@@ -697,7 +699,7 @@ namespace Content.Server.Database
 
         public async Task RemoveAdminAsync(NetUserId userId, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             var admin = await db.DbContext.Admin.SingleAsync(a => a.UserId == userId.UserId, cancel);
             db.DbContext.Admin.Remove(admin);
@@ -707,7 +709,7 @@ namespace Content.Server.Database
 
         public async Task AddAdminAsync(Admin admin, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             db.DbContext.Admin.Add(admin);
 
@@ -716,7 +718,7 @@ namespace Content.Server.Database
 
         public async Task UpdateAdminAsync(Admin admin, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             var existing = await db.DbContext.Admin.Include(a => a.Flags).SingleAsync(a => a.UserId == admin.UserId, cancel);
             existing.Flags = admin.Flags;
@@ -728,7 +730,7 @@ namespace Content.Server.Database
 
         public async Task RemoveAdminRankAsync(int rankId, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             var admin = await db.DbContext.AdminRank.SingleAsync(a => a.Id == rankId, cancel);
             db.DbContext.AdminRank.Remove(admin);
@@ -738,7 +740,7 @@ namespace Content.Server.Database
 
         public async Task AddAdminRankAsync(AdminRank rank, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             db.DbContext.AdminRank.Add(rank);
 
@@ -811,7 +813,7 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
 
         public async Task UpdateAdminRankAsync(AdminRank rank, CancellationToken cancel)
         {
-            await using var db = await GetDb();
+            await using var db = await GetDb(cancel);
 
             var existing = await db.DbContext.AdminRank
                 .Include(r => r.Flags)
@@ -1594,7 +1596,9 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
             return db.DbContext.Database.HasPendingModelChanges();
         }
 
-        protected abstract Task<DbGuard> GetDb([CallerMemberName] string? name = null);
+        protected abstract Task<DbGuard> GetDb(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null);
 
         protected void LogDbOp(string? name)
         {
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 554dd30743..01d1526727 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -29,7 +29,11 @@ namespace Content.Server.Database
         void Shutdown();
 
         #region Preferences
-        Task<PlayerPreferences> InitPrefsAsync(NetUserId userId, ICharacterProfile defaultProfile);
+        Task<PlayerPreferences> InitPrefsAsync(
+            NetUserId userId,
+            ICharacterProfile defaultProfile,
+            CancellationToken cancel);
+
         Task SaveSelectedCharacterIndexAsync(NetUserId userId, int index);
 
         Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? profile, int slot);
@@ -38,7 +42,7 @@ namespace Content.Server.Database
 
         // Single method for two operations for transaction.
         Task DeleteSlotAndSetSelectedIndex(NetUserId userId, int deleteSlot, int newSlot);
-        Task<PlayerPreferences?> GetPlayerPreferencesAsync(NetUserId userId);
+        Task<PlayerPreferences?> GetPlayerPreferencesAsync(NetUserId userId, CancellationToken cancel);
         #endregion
 
         #region User Ids
@@ -157,8 +161,9 @@ namespace Content.Server.Database
         /// Look up a player's role timers.
         /// </summary>
         /// <param name="player">The player to get the role timer information from.</param>
+        /// <param name="cancel"></param>
         /// <returns>All role timers belonging to the player.</returns>
-        Task<List<PlayTime>> GetPlayTimes(Guid player);
+        Task<List<PlayTime>> GetPlayTimes(Guid player, CancellationToken cancel = default);
 
         /// <summary>
         /// Update play time information in bulk.
@@ -346,7 +351,10 @@ namespace Content.Server.Database
             _sqliteInMemoryConnection?.Dispose();
         }
 
-        public Task<PlayerPreferences> InitPrefsAsync(NetUserId userId, ICharacterProfile defaultProfile)
+        public Task<PlayerPreferences> InitPrefsAsync(
+            NetUserId userId,
+            ICharacterProfile defaultProfile,
+            CancellationToken cancel)
         {
             DbWriteOpsMetric.Inc();
             return RunDbCommand(() => _db.InitPrefsAsync(userId, defaultProfile));
@@ -376,10 +384,10 @@ namespace Content.Server.Database
             return RunDbCommand(() => _db.SaveAdminOOCColorAsync(userId, color));
         }
 
-        public Task<PlayerPreferences?> GetPlayerPreferencesAsync(NetUserId userId)
+        public Task<PlayerPreferences?> GetPlayerPreferencesAsync(NetUserId userId, CancellationToken cancel)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetPlayerPreferencesAsync(userId));
+            return RunDbCommand(() => _db.GetPlayerPreferencesAsync(userId, cancel));
         }
 
         public Task AssignUserIdAsync(string name, NetUserId userId)
@@ -487,10 +495,10 @@ namespace Content.Server.Database
 
         #region Playtime
 
-        public Task<List<PlayTime>> GetPlayTimes(Guid player)
+        public Task<List<PlayTime>> GetPlayTimes(Guid player, CancellationToken cancel)
         {
             DbReadOpsMetric.Inc();
-            return RunDbCommand(() => _db.GetPlayTimes(player));
+            return RunDbCommand(() => _db.GetPlayTimes(player, cancel));
         }
 
         public Task UpdatePlayTimes(IReadOnlyCollection<PlayTimeUpdate> updates)
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index c81e735868..fd4699fff4 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -527,22 +527,26 @@ WHERE to_tsvector('english'::regconfig, a.message) @@ websearch_to_tsquery('engl
             return time;
         }
 
-        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
             LogDbOp(name);
 
             await _dbReadyTask;
-            await _prefsSemaphore.WaitAsync();
+            await _prefsSemaphore.WaitAsync(cancel);
 
             if (_msLag > 0)
-                await Task.Delay(_msLag);
+                await Task.Delay(_msLag, cancel);
 
             return new DbGuardImpl(this, new PostgresServerDbContext(_options));
         }
 
-        protected override async Task<DbGuard> GetDb([CallerMemberName] string? name = null)
+        protected override async Task<DbGuard> GetDb(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
-            return await GetDbImpl(name);
+            return await GetDbImpl(cancel, name);
         }
 
         private sealed class DbGuardImpl : DbGuard
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 88ecf82002..ffec90bb43 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -439,7 +439,7 @@ namespace Content.Server.Database
         public override async Task<((Admin, string? lastUserName)[] admins, AdminRank[])> GetAllAdminAndRanksAsync(
             CancellationToken cancel)
         {
-            await using var db = await GetDbImpl();
+            await using var db = await GetDbImpl(cancel);
 
             var admins = await db.SqliteDbContext.Admin
                 .Include(a => a.Flags)
@@ -514,23 +514,27 @@ namespace Content.Server.Database
             return DateTime.SpecifyKind(time, DateTimeKind.Utc);
         }
 
-        private async Task<DbGuardImpl> GetDbImpl([CallerMemberName] string? name = null)
+        private async Task<DbGuardImpl> GetDbImpl(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
             LogDbOp(name);
             await _dbReadyTask;
             if (_msDelay > 0)
-                await Task.Delay(_msDelay);
+                await Task.Delay(_msDelay, cancel);
 
-            await _prefsSemaphore.WaitAsync();
+            await _prefsSemaphore.WaitAsync(cancel);
 
             var dbContext = new SqliteServerDbContext(_options());
 
             return new DbGuardImpl(this, dbContext);
         }
 
-        protected override async Task<DbGuard> GetDb([CallerMemberName] string? name = null)
+        protected override async Task<DbGuard> GetDb(
+            CancellationToken cancel = default,
+            [CallerMemberName] string? name = null)
         {
-            return await GetDbImpl(name).ConfigureAwait(false);
+            return await GetDbImpl(cancel, name).ConfigureAwait(false);
         }
 
         private sealed class DbGuardImpl : DbGuard
@@ -569,9 +573,9 @@ namespace Content.Server.Database
                 _semaphore = new SemaphoreSlim(maxCount, maxCount);
             }
 
-            public Task WaitAsync()
+            public Task WaitAsync(CancellationToken cancel = default)
             {
-                var task = _semaphore.WaitAsync();
+                var task = _semaphore.WaitAsync(cancel);
 
                 if (_synchronous)
                 {
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index f8b1611fd5..c58c594dba 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Content.Server.Players.PlayTimeTracking;
 using Content.Server.Preferences.Managers;
+using Robust.Server.Player;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Utility;
@@ -16,17 +17,22 @@ namespace Content.Server.Database;
 /// Actual loading code is handled by separate managers such as <see cref="IServerPreferencesManager"/>.
 /// This manager is simply a centralized "is loading done" controller for other code to rely on.
 /// </remarks>
-public sealed class UserDbDataManager
+public sealed class UserDbDataManager : IPostInjectInit
 {
     [Dependency] private readonly IServerPreferencesManager _prefs = default!;
+    [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
 
     private readonly Dictionary<NetUserId, UserData> _users = new();
 
+    private ISawmill _sawmill = default!;
+
     // TODO: Ideally connected/disconnected would be subscribed to IPlayerManager directly,
     // but this runs into ordering issues with game ticker.
     public void ClientConnected(ICommonSession session)
     {
+        _sawmill.Verbose($"Initiating load for user {session}");
+
         DebugTools.Assert(!_users.ContainsKey(session.UserId), "We should not have any cached data on client connect.");
 
         var cts = new CancellationTokenSource();
@@ -51,11 +57,52 @@ public sealed class UserDbDataManager
 
     private async Task Load(ICommonSession session, CancellationToken cancel)
     {
-        await Task.WhenAll(
-            _prefs.LoadData(session, cancel),
-            _playTimeTracking.LoadData(session, cancel));
+        // The task returned by this function is only ever observed by callers of WaitLoadComplete,
+        // which doesn't even happen currently if the lobby is enabled.
+        // As such, this task must NOT throw a non-cancellation error!
+        try
+        {
+            await Task.WhenAll(
+                _prefs.LoadData(session, cancel),
+                _playTimeTracking.LoadData(session, cancel));
+
+            cancel.ThrowIfCancellationRequested();
+            _prefs.FinishLoad(session);
+
+            _sawmill.Verbose($"Load complete for user {session}");
+        }
+        catch (OperationCanceledException)
+        {
+            _sawmill.Debug($"Load cancelled for user {session}");
+
+            // We can rethrow the cancellation.
+            // This will make the task returned by WaitLoadComplete() also return a cancellation.
+            throw;
+        }
+        catch (Exception e)
+        {
+            // Must catch all exceptions here, otherwise task may go unobserved.
+            _sawmill.Error($"Load of user data failed: {e}");
+
+            // Kick them from server, since something is hosed. Let them try again I guess.
+            session.Channel.Disconnect("Loading of server user data failed, this is a bug.");
+
+            // We throw a OperationCanceledException so users of WaitLoadComplete() always see cancellation here.
+            throw new OperationCanceledException("Load of user data cancelled due to unknown error");
+        }
     }
 
+    /// <summary>
+    /// Wait for all on-database data for a user to be loaded.
+    /// </summary>
+    /// <remarks>
+    /// The task returned by this function may end up in a cancelled state
+    /// (throwing <see cref="OperationCanceledException"/>) if the user disconnects while loading or an error occurs.
+    /// </remarks>
+    /// <param name="session"></param>
+    /// <returns>
+    /// A task that completes when all on-database data for a user has finished loading.
+    /// </returns>
     public Task WaitLoadComplete(ICommonSession session)
     {
         return _users[session.UserId].Task;
@@ -63,7 +110,7 @@ public sealed class UserDbDataManager
 
     public bool IsLoadComplete(ICommonSession session)
     {
-        return GetLoadTask(session).IsCompleted;
+        return GetLoadTask(session).IsCompletedSuccessfully;
     }
 
     public Task GetLoadTask(ICommonSession session)
@@ -71,5 +118,10 @@ public sealed class UserDbDataManager
         return _users[session.UserId].Task;
     }
 
+    void IPostInjectInit.PostInject()
+    {
+        _sawmill = _logManager.GetSawmill("userdb");
+    }
+
     private sealed record UserData(CancellationTokenSource Cancel, Task Task);
 }
diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
index 04a08955a3..2b27a89d9d 100644
--- a/Content.Server/Explosion/Components/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -81,6 +81,13 @@ public sealed partial class ExplosiveComponent : Component
     [DataField("deleteAfterExplosion")]
     public bool? DeleteAfterExplosion;
 
+    /// <summary>
+    /// Whether to not set <see cref="Exploded"/> to true, allowing it to explode multiple times.
+    /// This should never be used if it is damageable.
+    /// </summary>
+    [DataField]
+    public bool Repeatable;
+
     /// <summary>
     ///     Avoid somehow double-triggering this explosion (e.g. by damaging this entity from its own explosion.
     /// </summary>
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
new file mode 100644
index 0000000000..cc08de53f9
--- /dev/null
+++ b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Explosion.Components;
+
+/// <summary>
+/// Constantly triggers after being added to an entity.
+/// </summary>
+[RegisterComponent, Access(typeof(TriggerSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : Component
+{
+    /// <summary>
+    /// How long to wait between triggers.
+    /// The first trigger starts this long after the component is added.
+    /// </summary>
+    [DataField]
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+    /// <summary>
+    /// When the next trigger will be.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+    public TimeSpan NextTrigger;
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 23543895e6..8734c054d6 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -160,7 +160,7 @@ public sealed partial class ExplosionSystem : EntitySystem
         if (explosive.Exploded)
             return;
 
-        explosive.Exploded = true;
+        explosive.Exploded = !explosive.Repeatable;
 
         // Override the explosion intensity if optional arguments were provided.
         if (radius != null)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 3675c214b1..8e0a75ea24 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -94,6 +94,7 @@ namespace Content.Server.Explosion.EntitySystems
             SubscribeLocalEvent<TriggerOnStepTriggerComponent, StepTriggeredOffEvent>(OnStepTriggered);
             SubscribeLocalEvent<TriggerOnSlipComponent, SlipEvent>(OnSlipTriggered);
             SubscribeLocalEvent<TriggerWhenEmptyComponent, OnEmptyGunShotEvent>(OnEmptyTriggered);
+            SubscribeLocalEvent<RepeatingTriggerComponent, MapInitEvent>(OnRepeatInit);
 
             SubscribeLocalEvent<SpawnOnTriggerComponent, TriggerEvent>(OnSpawnTrigger);
             SubscribeLocalEvent<DeleteOnTriggerComponent, TriggerEvent>(HandleDeleteTrigger);
@@ -241,6 +242,11 @@ namespace Content.Server.Explosion.EntitySystems
             Trigger(uid, args.EmptyGun);
         }
 
+        private void OnRepeatInit(Entity<RepeatingTriggerComponent> ent, ref MapInitEvent args)
+        {
+            ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+        }
+
         public bool Trigger(EntityUid trigger, EntityUid? user = null)
         {
             var triggerEvent = new TriggerEvent(trigger, user);
@@ -323,6 +329,7 @@ namespace Content.Server.Explosion.EntitySystems
             UpdateProximity();
             UpdateTimer(frameTime);
             UpdateTimedCollide(frameTime);
+            UpdateRepeat();
         }
 
         private void UpdateTimer(float frameTime)
@@ -357,5 +364,19 @@ namespace Content.Server.Explosion.EntitySystems
                     _appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
             }
         }
+
+        private void UpdateRepeat()
+        {
+            var now = _timing.CurTime;
+            var query = EntityQueryEnumerator<RepeatingTriggerComponent>();
+            while (query.MoveNext(out var uid, out var comp))
+            {
+                if (comp.NextTrigger > now)
+                    continue;
+
+                comp.NextTrigger = now + comp.Delay;
+                Trigger(uid);
+            }
+        }
     }
 }
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index 7cafc06b3d..c1388f6290 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -144,14 +144,33 @@ namespace Content.Server.GameTicking
 
             async void SpawnWaitDb()
             {
-                await _userDb.WaitLoadComplete(session);
+                try
+                {
+                    await _userDb.WaitLoadComplete(session);
+                }
+                catch (OperationCanceledException)
+                {
+                    // Bail, user must've disconnected or something.
+                    Log.Debug($"Database load cancelled while waiting to spawn {session}");
+                    return;
+                }
 
                 SpawnPlayer(session, EntityUid.Invalid);
             }
 
             async void SpawnObserverWaitDb()
             {
-                await _userDb.WaitLoadComplete(session);
+                try
+                {
+                    await _userDb.WaitLoadComplete(session);
+                }
+                catch (OperationCanceledException)
+                {
+                    // Bail, user must've disconnected or something.
+                    Log.Debug($"Database load cancelled while waiting to spawn {session}");
+                    return;
+                }
+
                 JoinAsObserver(session);
             }
 
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 2d1453c00d..291dc5d501 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -55,7 +55,9 @@ namespace Content.Server.GameTicking
             return spawnableStations;
         }
 
-        private void SpawnPlayers(List<ICommonSession> readyPlayers, Dictionary<NetUserId, HumanoidCharacterProfile> profiles, bool force)
+        private void SpawnPlayers(List<ICommonSession> readyPlayers,
+            Dictionary<NetUserId, HumanoidCharacterProfile> profiles,
+            bool force)
         {
             // Allow game rules to spawn players by themselves if needed. (For example, nuke ops or wizard)
             RaiseLocalEvent(new RulePlayerSpawningEvent(readyPlayers, profiles, force));
@@ -94,7 +96,8 @@ namespace Content.Server.GameTicking
                 if (job == null)
                 {
                     var playerSession = _playerManager.GetSessionById(netUser);
-                    _chatManager.DispatchServerMessage(playerSession, Loc.GetString("job-not-available-wait-in-lobby"));
+                    _chatManager.DispatchServerMessage(playerSession,
+                        Loc.GetString("job-not-available-wait-in-lobby"));
                 }
                 else
                 {
@@ -116,10 +119,17 @@ namespace Content.Server.GameTicking
             RefreshLateJoinAllowed();
 
             // Allow rules to add roles to players who have been spawned in. (For example, on-station traitors)
-            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(assignedJobs.Keys.Select(x => _playerManager.GetSessionById(x)).ToArray(), profiles, force));
+            RaiseLocalEvent(new RulePlayerJobsAssignedEvent(
+                assignedJobs.Keys.Select(x => _playerManager.GetSessionById(x)).ToArray(),
+                profiles,
+                force));
         }
 
-        private void SpawnPlayer(ICommonSession player, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
+        private void SpawnPlayer(ICommonSession player,
+            EntityUid station,
+            string? jobId = null,
+            bool lateJoin = true,
+            bool silent = false)
         {
             var character = GetPlayerProfile(player);
 
@@ -132,7 +142,12 @@ namespace Content.Server.GameTicking
             SpawnPlayer(player, character, station, jobId, lateJoin, silent);
         }
 
-        private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile character, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
+        private void SpawnPlayer(ICommonSession player,
+            HumanoidCharacterProfile character,
+            EntityUid station,
+            string? jobId = null,
+            bool lateJoin = true,
+            bool silent = false)
         {
             // Can't spawn players with a dummy ticker!
             if (DummyTicker)
@@ -176,7 +191,9 @@ namespace Content.Server.GameTicking
                 restrictedRoles.UnionWith(jobBans);
 
             // Pick best job best on prefs.
-            jobId ??= _stationJobs.PickBestAvailableJobWithPriority(station, character.JobPriorities, true,
+            jobId ??= _stationJobs.PickBestAvailableJobWithPriority(station,
+                character.JobPriorities,
+                true,
                 restrictedRoles);
             // If no job available, stay in lobby, or if no lobby spawn as observer
             if (jobId is null)
@@ -185,7 +202,9 @@ namespace Content.Server.GameTicking
                 {
                     JoinAsObserver(player);
                 }
-                _chatManager.DispatchServerMessage(player, Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
+
+                _chatManager.DispatchServerMessage(player,
+                    Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
                 return;
             }
 
@@ -199,7 +218,7 @@ namespace Content.Server.GameTicking
             _mind.SetUserId(newMind, data.UserId);
 
             var jobPrototype = _prototypeManager.Index<JobPrototype>(jobId);
-            var job = new JobComponent { Prototype = jobId };
+            var job = new JobComponent {Prototype = jobId};
             _roles.MindAddRole(newMind, job, silent: silent);
             var jobName = _jobs.MindTryGetJobName(newMind);
 
@@ -214,12 +233,11 @@ namespace Content.Server.GameTicking
             if (lateJoin && !silent)
             {
                 _chatSystem.DispatchStationAnnouncement(station,
-                    Loc.GetString(
-                        "latejoin-arrival-announcement",
-                    ("character", MetaData(mob).EntityName),
-                    ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName)),
-                    ("gender", character.Gender) // CrystallPunk-LastnameGender
-                    ), Loc.GetString("latejoin-arrival-sender"),
+                    Loc.GetString("latejoin-arrival-announcement",
+                        ("character", MetaData(mob).EntityName),
+                        ("gender", character.Gender), // CrystallPunk-LastnameGender
+                        ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))),
+                    Loc.GetString("latejoin-arrival-sender"),
                     playDefaultSound: false);
             }
 
@@ -231,14 +249,17 @@ namespace Content.Server.GameTicking
             _stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
 
             if (lateJoin)
-                _adminLogger.Add(LogType.LateJoin, LogImpact.Medium, $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+                _adminLogger.Add(LogType.LateJoin,
+                    LogImpact.Medium,
+                    $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
             else
-                _adminLogger.Add(LogType.RoundStartJoin, LogImpact.Medium, $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+                _adminLogger.Add(LogType.RoundStartJoin,
+                    LogImpact.Medium,
+                    $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
 
             // Make sure they're aware of extended access.
             if (Comp<StationJobsComponent>(station).ExtendedAccess
-                && (jobPrototype.ExtendedAccess.Count > 0
-                    || jobPrototype.ExtendedAccessGroups.Count > 0))
+                && (jobPrototype.ExtendedAccess.Count > 0 || jobPrototype.ExtendedAccessGroups.Count > 0))
             {
                 _chatManager.DispatchServerMessage(player, Loc.GetString("job-greet-crew-shortages"));
             }
@@ -260,14 +281,20 @@ namespace Content.Server.GameTicking
                 }
                 else
                 {
-                    _chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction-time",
-                        ("time", $"{arrival:mm\\:ss}")));
+                    _chatManager.DispatchServerMessage(player,
+                        Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}")));
                 }
             }
 
             // We raise this event directed to the mob, but also broadcast it so game rules can do something now.
             PlayersJoinedRoundNormally++;
-            var aev = new PlayerSpawnCompleteEvent(mob, player, jobId, lateJoin, PlayersJoinedRoundNormally, station, character);
+            var aev = new PlayerSpawnCompleteEvent(mob,
+                player,
+                jobId,
+                lateJoin,
+                PlayersJoinedRoundNormally,
+                station,
+                character);
             RaiseLocalEvent(mob, aev, true);
         }
 
@@ -289,7 +316,10 @@ namespace Content.Server.GameTicking
         /// <param name="station">The station they're spawning on</param>
         /// <param name="jobId">An optional job for them to spawn as</param>
         /// <param name="silent">Whether or not the player should be greeted upon joining</param>
-        public void MakeJoinGame(ICommonSession player, EntityUid station, string? jobId = null, bool silent = false)
+        public void MakeJoinGame(ICommonSession player,
+            EntityUid station,
+            string? jobId = null,
+            bool silent = false)
         {
             if (!_playerGameStatuses.ContainsKey(player.UserId))
                 return;
@@ -335,23 +365,29 @@ namespace Content.Server.GameTicking
             _metaData.SetEntityName(ghost, name);
             _ghost.SetCanReturnToBody(ghost, false);
             _mind.TransferTo(mind.Value, ghost);
-            _adminLogger.Add(LogType.LateJoin, LogImpact.Low, $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
+            _adminLogger.Add(LogType.LateJoin,
+                LogImpact.Low,
+                $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
         }
 
         #region Mob Spawning Helpers
+
         private EntityUid SpawnObserverMob()
         {
             var coordinates = GetObserverSpawnPoint();
             return EntityManager.SpawnEntity(ObserverPrototypeName, coordinates);
         }
+
         #endregion
 
         #region Spawn Points
+
         public EntityCoordinates GetObserverSpawnPoint()
         {
             _possiblePositions.Clear();
 
-            foreach (var (point, transform) in EntityManager.EntityQuery<SpawnPointComponent, TransformComponent>(true))
+            foreach (var (point, transform) in EntityManager
+                         .EntityQuery<SpawnPointComponent, TransformComponent>(true))
             {
                 if (point.SpawnType != SpawnPointType.Observer)
                     continue;
@@ -367,8 +403,7 @@ namespace Content.Server.GameTicking
                 var query = AllEntityQuery<MapGridComponent>();
                 while (query.MoveNext(out var uid, out var grid))
                 {
-                    if (!metaQuery.TryGetComponent(uid, out var meta) ||
-                        meta.EntityPaused)
+                    if (!metaQuery.TryGetComponent(uid, out var meta) || meta.EntityPaused)
                     {
                         continue;
                     }
@@ -389,8 +424,7 @@ namespace Content.Server.GameTicking
                 {
                     var gridXform = Transform(gridUid);
 
-                    return new EntityCoordinates(gridUid,
-                        gridXform.InvWorldMatrix.Transform(toMap.Position));
+                    return new EntityCoordinates(gridUid, gridXform.InvWorldMatrix.Transform(toMap.Position));
                 }
 
                 return spawn;
@@ -406,8 +440,7 @@ namespace Content.Server.GameTicking
             {
                 var mapUid = _mapManager.GetMapEntityId(map);
 
-                if (!metaQuery.TryGetComponent(mapUid, out var meta) ||
-                    meta.EntityPaused)
+                if (!metaQuery.TryGetComponent(mapUid, out var meta) || meta.EntityPaused)
                 {
                     continue;
                 }
@@ -420,6 +453,7 @@ namespace Content.Server.GameTicking
             _sawmill.Warning("Found no observer spawn points!");
             return EntityCoordinates.Invalid;
         }
+
         #endregion
     }
 
@@ -437,7 +471,11 @@ namespace Content.Server.GameTicking
         public bool LateJoin { get; }
         public EntityUid Station { get; }
 
-        public PlayerBeforeSpawnEvent(ICommonSession player, HumanoidCharacterProfile profile, string? jobId, bool lateJoin, EntityUid station)
+        public PlayerBeforeSpawnEvent(ICommonSession player,
+            HumanoidCharacterProfile profile,
+            string? jobId,
+            bool lateJoin,
+            EntityUid station)
         {
             Player = player;
             Profile = profile;
@@ -465,7 +503,13 @@ namespace Content.Server.GameTicking
         // Ex. If this is the 27th person to join, this will be 27.
         public int JoinOrder { get; }
 
-        public PlayerSpawnCompleteEvent(EntityUid mob, ICommonSession player, string? jobId, bool lateJoin, int joinOrder, EntityUid station, HumanoidCharacterProfile profile)
+        public PlayerSpawnCompleteEvent(EntityUid mob,
+            ICommonSession player,
+            string? jobId,
+            bool lateJoin,
+            int joinOrder,
+            EntityUid station,
+            HumanoidCharacterProfile profile)
         {
             Mob = mob;
             Player = player;
diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
index 27a9edbad7..cbd981e99e 100644
--- a/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
+++ b/Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs
@@ -1,7 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Station.Components;
+using Content.Shared.Random.Helpers;
+using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -82,17 +85,23 @@ public abstract partial class GameRuleSystem<T> where T: IComponent
         targetCoords = EntityCoordinates.Invalid;
         targetGrid = EntityUid.Invalid;
 
-        var possibleTargets = station.Comp.Grids;
-        if (possibleTargets.Count == 0)
+        // Weight grid choice by tilecount
+        var weights = new Dictionary<Entity<MapGridComponent>, float>();
+        foreach (var possibleTarget in station.Comp.Grids)
+        {
+            if (!TryComp<MapGridComponent>(possibleTarget, out var comp))
+                continue;
+
+            weights.Add((possibleTarget, comp), _map.GetAllTiles(possibleTarget, comp).Count());
+        }
+
+        if (weights.Count == 0)
         {
             targetGrid = EntityUid.Invalid;
             return false;
         }
 
-        targetGrid = RobustRandom.Pick(possibleTargets);
-
-        if (!TryComp<MapGridComponent>(targetGrid, out var gridComp))
-            return false;
+        (targetGrid, var gridComp) = RobustRandom.Pick(weights);
 
         var found = false;
         var aabb = gridComp.LocalAABB;
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
index abb26a8c8b..ccd460a9cf 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
@@ -1,4 +1,5 @@
-using Content.Server.Mind.Commands;
+using Content.Server.Ghost.Roles.Raffles;
+using Content.Server.Mind.Commands;
 using Content.Shared.Roles;
 
 namespace Content.Server.Ghost.Roles.Components
@@ -87,5 +88,12 @@ namespace Content.Server.Ghost.Roles.Components
         [ViewVariables(VVAccess.ReadWrite)]
         [DataField("reregister")]
         public bool ReregisterOnGhost { get; set; } = true;
+
+        /// <summary>
+        /// If set, ghost role is raffled, otherwise it is first-come-first-serve.
+        /// </summary>
+        [DataField("raffle")]
+        [Access(typeof(GhostRoleSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends
+        public GhostRoleRaffleConfig? RaffleConfig { get; set; }
     }
 }
diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs
new file mode 100644
index 0000000000..ac518685e9
--- /dev/null
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleRaffleComponent.cs
@@ -0,0 +1,58 @@
+using Content.Server.Ghost.Roles.Raffles;
+using Robust.Shared.Player;
+
+namespace Content.Server.Ghost.Roles.Components;
+
+/// <summary>
+/// Indicates that a ghost role is currently being raffled, and stores data about the raffle in progress.
+/// Raffles start when the first player joins a raffle.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(GhostRoleSystem))]
+public sealed partial class GhostRoleRaffleComponent : Component
+{
+    /// <summary>
+    /// Identifier of the <see cref="GhostRoleComponent">Ghost Role</see> this raffle is for.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField]
+    public uint Identifier { get; set; }
+
+    /// <summary>
+    /// List of sessions that are currently in the raffle.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public HashSet<ICommonSession> CurrentMembers = [];
+
+    /// <summary>
+    /// List of sessions that are currently or were previously in the raffle.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public HashSet<ICommonSession> AllMembers = [];
+
+    /// <summary>
+    /// Time left in the raffle in seconds. This must be initialized to a positive value.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField]
+    public TimeSpan Countdown = TimeSpan.MaxValue;
+
+    /// <summary>
+    /// The cumulative time, i.e. how much time the raffle will take in total. Added to when the time is extended
+    /// by someone joining the raffle.
+    /// Must be set to the same value as <see cref="Countdown"/> on initialization.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField("cumulativeTime")]
+    public TimeSpan CumulativeTime = TimeSpan.MaxValue;
+
+    /// <inheritdoc cref="GhostRoleRaffleSettings.JoinExtendsDurationBy"/>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField("joinExtendsDurationBy")]
+    public TimeSpan JoinExtendsDurationBy { get; set; }
+
+    /// <inheritdoc cref="GhostRoleRaffleSettings.MaxDuration"/>
+    [ViewVariables(VVAccess.ReadOnly)]
+    [DataField("maxDuration")]
+    public TimeSpan MaxDuration { get; set; }
+}
diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
index e7495020c8..5b9d6ae1ad 100644
--- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -1,7 +1,10 @@
+using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.EUI;
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Ghost.Roles.Events;
+using Content.Server.Ghost.Roles.Raffles;
+using Content.Shared.Ghost.Roles.Raffles;
 using Content.Server.Ghost.Roles.UI;
 using Content.Server.Mind.Commands;
 using Content.Shared.Administration;
@@ -21,7 +24,9 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Server.Popups;
 using Content.Shared.Verbs;
@@ -41,12 +46,16 @@ namespace Content.Server.Ghost.Roles
         [Dependency] private readonly TransformSystem _transform = default!;
         [Dependency] private readonly SharedMindSystem _mindSystem = default!;
         [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
         [Dependency] private readonly PopupSystem _popupSystem = default!;
         [Dependency] private readonly IPrototypeManager _prototype = default!;
 
         private uint _nextRoleIdentifier;
         private bool _needsUpdateGhostRoleCount = true;
+
         private readonly Dictionary<uint, Entity<GhostRoleComponent>> _ghostRoles = new();
+        private readonly Dictionary<uint, Entity<GhostRoleRaffleComponent>> _ghostRoleRaffles = new();
+
         private readonly Dictionary<ICommonSession, GhostRolesEui> _openUis = new();
         private readonly Dictionary<ICommonSession, MakeGhostRoleEui> _openMakeGhostRoleUis = new();
 
@@ -63,10 +72,12 @@ namespace Content.Server.Ghost.Roles
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, MindRemovedMessage>(OnMindRemoved);
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, MobStateChangedEvent>(OnMobStateChanged);
             SubscribeLocalEvent<GhostRoleComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<GhostRoleComponent, ComponentStartup>(OnStartup);
-            SubscribeLocalEvent<GhostRoleComponent, ComponentShutdown>(OnShutdown);
+            SubscribeLocalEvent<GhostRoleComponent, ComponentStartup>(OnRoleStartup);
+            SubscribeLocalEvent<GhostRoleComponent, ComponentShutdown>(OnRoleShutdown);
             SubscribeLocalEvent<GhostRoleComponent, EntityPausedEvent>(OnPaused);
             SubscribeLocalEvent<GhostRoleComponent, EntityUnpausedEvent>(OnUnpaused);
+            SubscribeLocalEvent<GhostRoleRaffleComponent, ComponentInit>(OnRaffleInit);
+            SubscribeLocalEvent<GhostRoleRaffleComponent, ComponentShutdown>(OnRaffleShutdown);
             SubscribeLocalEvent<GhostRoleMobSpawnerComponent, TakeGhostRoleEvent>(OnSpawnerTakeRole);
             SubscribeLocalEvent<GhostTakeoverAvailableComponent, TakeGhostRoleEvent>(OnTakeoverTakeRole);
             SubscribeLocalEvent<GhostRoleMobSpawnerComponent, GetVerbsEvent<Verb>>(OnVerb);
@@ -165,17 +176,118 @@ namespace Content.Server.Ghost.Roles
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            if (_needsUpdateGhostRoleCount)
+
+            UpdateGhostRoleCount();
+            UpdateRaffles(frameTime);
+        }
+
+        /// <summary>
+        /// Handles sending count update for the ghost role button in ghost UI, if ghost role count changed.
+        /// </summary>
+        private void UpdateGhostRoleCount()
+        {
+            if (!_needsUpdateGhostRoleCount)
+                return;
+
+            _needsUpdateGhostRoleCount = false;
+            var response = new GhostUpdateGhostRoleCountEvent(GetGhostRoleCount());
+            foreach (var player in _playerManager.Sessions)
             {
-                _needsUpdateGhostRoleCount = false;
-                var response = new GhostUpdateGhostRoleCountEvent(GetGhostRolesInfo().Length);
-                foreach (var player in _playerManager.Sessions)
-                {
-                    RaiseNetworkEvent(response, player.Channel);
-                }
+                RaiseNetworkEvent(response, player.Channel);
             }
         }
 
+        /// <summary>
+        /// Handles ghost role raffle logic.
+        /// </summary>
+        private void UpdateRaffles(float frameTime)
+        {
+            var query = EntityQueryEnumerator<GhostRoleRaffleComponent, MetaDataComponent>();
+            while (query.MoveNext(out var entityUid, out var raffle, out var meta))
+            {
+                if (meta.EntityPaused)
+                    continue;
+
+                // if all participants leave/were removed from the raffle, the raffle is canceled.
+                if (raffle.CurrentMembers.Count == 0)
+                {
+                    RemoveRaffleAndUpdateEui(entityUid, raffle);
+                    continue;
+                }
+
+                raffle.Countdown = raffle.Countdown.Subtract(TimeSpan.FromSeconds(frameTime));
+                if (raffle.Countdown.Ticks > 0)
+                    continue;
+
+                // the raffle is over! find someone to take over the ghost role
+                if (!TryComp(entityUid, out GhostRoleComponent? ghostRole))
+                {
+                    Log.Warning($"Ghost role raffle finished on {entityUid} but {nameof(GhostRoleComponent)} is missing");
+                    RemoveRaffleAndUpdateEui(entityUid, raffle);
+                    continue;
+                }
+
+                if (ghostRole.RaffleConfig is null)
+                {
+                    Log.Warning($"Ghost role raffle finished on {entityUid} but RaffleConfig became null");
+                    RemoveRaffleAndUpdateEui(entityUid, raffle);
+                    continue;
+                }
+
+                var foundWinner = false;
+                var deciderPrototype = _prototype.Index(ghostRole.RaffleConfig.Decider);
+
+                // use the ghost role's chosen winner picker to find a winner
+                deciderPrototype.Decider.PickWinner(
+                    raffle.CurrentMembers.AsEnumerable(),
+                    session =>
+                    {
+                        var success = TryTakeover(session, raffle.Identifier);
+                        foundWinner |= success;
+                        return success;
+                    }
+                );
+
+                if (!foundWinner)
+                {
+                    Log.Warning($"Ghost role raffle for {entityUid} ({ghostRole.RoleName}) finished without " +
+                                $"{ghostRole.RaffleConfig?.Decider} finding a winner");
+                }
+
+                // raffle over
+                RemoveRaffleAndUpdateEui(entityUid, raffle);
+            }
+        }
+
+        private bool TryTakeover(ICommonSession player, uint identifier)
+        {
+            // TODO: the following two checks are kind of redundant since they should already be removed
+            //           from the raffle
+            // can't win if you are disconnected (although you shouldn't be a candidate anyway)
+            if (player.Status != SessionStatus.InGame)
+                return false;
+
+            // can't win if you are no longer a ghost (e.g. if you returned to your body)
+            if (player.AttachedEntity == null || !HasComp<GhostComponent>(player.AttachedEntity))
+                return false;
+
+            if (Takeover(player, identifier))
+            {
+                // takeover successful, we have a winner! remove the winner from other raffles they might be in
+                LeaveAllRaffles(player);
+                return true;
+            }
+
+            return false;
+        }
+
+        private void RemoveRaffleAndUpdateEui(EntityUid entityUid, GhostRoleRaffleComponent raffle)
+        {
+            _ghostRoleRaffles.Remove(raffle.Identifier);
+            RemComp(entityUid, raffle);
+            UpdateAllEui();
+        }
+
         private void PlayerStatusChanged(object? blah, SessionStatusEventArgs args)
         {
             if (args.NewStatus == SessionStatus.InGame)
@@ -183,6 +295,11 @@ namespace Content.Server.Ghost.Roles
                 var response = new GhostUpdateGhostRoleCountEvent(_ghostRoles.Count);
                 RaiseNetworkEvent(response, args.Session.Channel);
             }
+            else
+            {
+                // people who disconnect are removed from ghost role raffles
+                LeaveAllRaffles(args.Session);
+            }
         }
 
         public void RegisterGhostRole(Entity<GhostRoleComponent> role)
@@ -201,24 +318,170 @@ namespace Content.Server.Ghost.Roles
                 return;
 
             _ghostRoles.Remove(comp.Identifier);
+            if (TryComp(role.Owner, out GhostRoleRaffleComponent? raffle))
+            {
+                // if a raffle is still running, get rid of it
+                RemoveRaffleAndUpdateEui(role.Owner, raffle);
+            }
+            else
+            {
+                UpdateAllEui();
+            }
+        }
+
+        // probably fine to be init because it's never added during entity initialization, but much later
+        private void OnRaffleInit(Entity<GhostRoleRaffleComponent> ent, ref ComponentInit args)
+        {
+            if (!TryComp(ent, out GhostRoleComponent? ghostRole))
+            {
+                // can't have a raffle for a ghost role that doesn't exist
+                RemComp<GhostRoleRaffleComponent>(ent);
+                return;
+            }
+
+            var config = ghostRole.RaffleConfig;
+            if (config is null)
+                return; // should, realistically, never be reached but you never know
+
+            var settings = config.SettingsOverride
+                           ?? _prototype.Index<GhostRoleRaffleSettingsPrototype>(config.Settings).Settings;
+
+            if (settings.MaxDuration < settings.InitialDuration)
+            {
+                Log.Error($"Ghost role on {ent} has invalid raffle settings (max duration shorter than initial)");
+                ghostRole.RaffleConfig = null; // make it a non-raffle role so stuff isn't entirely broken
+                RemComp<GhostRoleRaffleComponent>(ent);
+                return;
+            }
+
+            var raffle = ent.Comp;
+            raffle.Identifier = ghostRole.Identifier;
+            raffle.Countdown = TimeSpan.FromSeconds(settings.InitialDuration);
+            raffle.CumulativeTime = TimeSpan.FromSeconds(settings.InitialDuration);
+            // we copy these settings into the component because they would be cumbersome to access otherwise
+            raffle.JoinExtendsDurationBy = TimeSpan.FromSeconds(settings.JoinExtendsDurationBy);
+            raffle.MaxDuration = TimeSpan.FromSeconds(settings.MaxDuration);
+        }
+
+        private void OnRaffleShutdown(Entity<GhostRoleRaffleComponent> ent, ref ComponentShutdown args)
+        {
+            _ghostRoleRaffles.Remove(ent.Comp.Identifier);
+        }
+
+        /// <summary>
+        /// Joins the given player onto a ghost role raffle, or creates it if it doesn't exist.
+        /// </summary>
+        /// <param name="player">The player.</param>
+        /// <param name="identifier">The ID that represents the ghost role or ghost role raffle.
+        /// (A raffle will have the same ID as the ghost role it's for.)</param>
+        private void JoinRaffle(ICommonSession player, uint identifier)
+        {
+            if (!_ghostRoles.TryGetValue(identifier, out var roleEnt))
+                return;
+
+            // get raffle or create a new one if it doesn't exist
+            var raffle = _ghostRoleRaffles.TryGetValue(identifier, out var raffleEnt)
+                ? raffleEnt.Comp
+                : EnsureComp<GhostRoleRaffleComponent>(roleEnt.Owner);
+
+            _ghostRoleRaffles.TryAdd(identifier, (roleEnt.Owner, raffle));
+
+            if (!raffle.CurrentMembers.Add(player))
+            {
+                Log.Warning($"{player.Name} tried to join raffle for ghost role {identifier} but they are already in the raffle");
+                return;
+            }
+
+            // if this is the first time the player joins this raffle, and the player wasn't the starter of the raffle:
+            // extend the countdown, but only if doing so will not make the raffle take longer than the maximum
+            // duration
+            if (raffle.AllMembers.Add(player) && raffle.AllMembers.Count > 1
+                && raffle.CumulativeTime.Add(raffle.JoinExtendsDurationBy) <= raffle.MaxDuration)
+            {
+                    raffle.Countdown += raffle.JoinExtendsDurationBy;
+                    raffle.CumulativeTime += raffle.JoinExtendsDurationBy;
+            }
+
             UpdateAllEui();
         }
 
-        public void Takeover(ICommonSession player, uint identifier)
+        /// <summary>
+        /// Makes the given player leave the raffle corresponding to the given ID.
+        /// </summary>
+        public void LeaveRaffle(ICommonSession player, uint identifier)
+        {
+            if (!_ghostRoleRaffles.TryGetValue(identifier, out var raffleEnt))
+                return;
+
+            if (raffleEnt.Comp.CurrentMembers.Remove(player))
+            {
+                UpdateAllEui();
+            }
+            else
+            {
+                Log.Warning($"{player.Name} tried to leave raffle for ghost role {identifier} but they are not in the raffle");
+            }
+
+            // (raffle ending because all players left is handled in update())
+        }
+
+        /// <summary>
+        /// Makes the given player leave all ghost role raffles.
+        /// </summary>
+        public void LeaveAllRaffles(ICommonSession player)
+        {
+            var shouldUpdateEui = false;
+
+            foreach (var raffleEnt in _ghostRoleRaffles.Values)
+            {
+                shouldUpdateEui |= raffleEnt.Comp.CurrentMembers.Remove(player);
+            }
+
+            if (shouldUpdateEui)
+                UpdateAllEui();
+        }
+
+        /// <summary>
+        /// Request a ghost role. If it's a raffled role starts or joins a raffle, otherwise the player immediately
+        /// takes over the ghost role if possible.
+        /// </summary>
+        /// <param name="player">The player.</param>
+        /// <param name="identifier">ID of the ghost role.</param>
+        public void Request(ICommonSession player, uint identifier)
+        {
+            if (!_ghostRoles.TryGetValue(identifier, out var roleEnt))
+                return;
+
+            if (roleEnt.Comp.RaffleConfig is not null)
+            {
+                JoinRaffle(player, identifier);
+            }
+            else
+            {
+                Takeover(player, identifier);
+            }
+        }
+
+        /// <summary>
+        /// Attempts having the player take over the ghost role with the corresponding ID. Does not start a raffle.
+        /// </summary>
+        /// <returns>True if takeover was successful, otherwise false.</returns>
+        public bool Takeover(ICommonSession player, uint identifier)
         {
             if (!_ghostRoles.TryGetValue(identifier, out var role))
-                return;
+                return false;
 
             var ev = new TakeGhostRoleEvent(player);
             RaiseLocalEvent(role, ref ev);
 
             if (!ev.TookRole)
-                return;
+                return false;
 
             if (player.AttachedEntity != null)
                 _adminLogger.Add(LogType.GhostRoleTaken, LogImpact.Low, $"{player:player} took the {role.Comp.RoleName:roleName} ghost role {ToPrettyString(player.AttachedEntity.Value):entity}");
 
             CloseEui(player);
+            return true;
         }
 
         public void Follow(ICommonSession player, uint identifier)
@@ -247,7 +510,22 @@ namespace Content.Server.Ghost.Roles
             _mindSystem.TransferTo(newMind, mob);
         }
 
-        public GhostRoleInfo[] GetGhostRolesInfo()
+        /// <summary>
+        /// Returns the number of available ghost roles.
+        /// </summary>
+        public int GetGhostRoleCount()
+        {
+            var metaQuery = GetEntityQuery<MetaDataComponent>();
+            return _ghostRoles.Count(pair => metaQuery.GetComponent(pair.Value.Owner).EntityPaused == false);
+        }
+
+        /// <summary>
+        /// Returns information about all available ghost roles.
+        /// </summary>
+        /// <param name="player">
+        /// If not null, the <see cref="GhostRoleInfo"/>s will show if the given player is in a raffle.
+        /// </param>
+        public GhostRoleInfo[] GetGhostRolesInfo(ICommonSession? player)
         {
             var roles = new List<GhostRoleInfo>();
             var metaQuery = GetEntityQuery<MetaDataComponent>();
@@ -257,7 +535,40 @@ namespace Content.Server.Ghost.Roles
                 if (metaQuery.GetComponent(uid).EntityPaused)
                     continue;
 
-                roles.Add(new GhostRoleInfo { Identifier = id, Name = role.RoleName, Description = role.RoleDescription, Rules = role.RoleRules, Requirements = role.Requirements });
+
+                var kind = GhostRoleKind.FirstComeFirstServe;
+                GhostRoleRaffleComponent? raffle = null;
+
+                if (role.RaffleConfig is not null)
+                {
+                    kind = GhostRoleKind.RaffleReady;
+
+                    if (_ghostRoleRaffles.TryGetValue(id, out var raffleEnt))
+                    {
+                        kind = GhostRoleKind.RaffleInProgress;
+                        raffle = raffleEnt.Comp;
+
+                        if (player is not null && raffle.CurrentMembers.Contains(player))
+                            kind = GhostRoleKind.RaffleJoined;
+                    }
+                }
+
+                var rafflePlayerCount = (uint?) raffle?.CurrentMembers.Count ?? 0;
+                var raffleEndTime = raffle is not null
+                    ? _timing.CurTime.Add(raffle.Countdown)
+                    : TimeSpan.MinValue;
+
+                roles.Add(new GhostRoleInfo
+                {
+                    Identifier = id,
+                    Name = role.RoleName,
+                    Description = role.RoleDescription,
+                    Rules = role.RoleRules,
+                    Requirements = role.Requirements,
+                    Kind = kind,
+                    RafflePlayerCount = rafflePlayerCount,
+                    RaffleEndTime = raffleEndTime
+                });
             }
 
             return roles.ToArray();
@@ -272,6 +583,10 @@ namespace Content.Server.Ghost.Roles
             if (HasComp<GhostComponent>(message.Entity))
                 return;
 
+            // The player is not a ghost (anymore), so they should not be in any raffles. Remove them.
+            // This ensures player doesn't win a raffle after returning to their (revived) body and ends up being
+            // forced into a ghost role.
+            LeaveAllRaffles(message.Player);
             CloseEui(message.Player);
         }
 
@@ -306,6 +621,7 @@ namespace Content.Server.Ghost.Roles
 
             _openUis.Clear();
             _ghostRoles.Clear();
+            _ghostRoleRaffles.Clear();
             _nextRoleIdentifier = 0;
         }
 
@@ -331,12 +647,12 @@ namespace Content.Server.Ghost.Roles
                 RemCompDeferred<GhostRoleComponent>(ent);
         }
 
-        private void OnStartup(Entity<GhostRoleComponent> ent, ref ComponentStartup args)
+        private void OnRoleStartup(Entity<GhostRoleComponent> ent, ref ComponentStartup args)
         {
             RegisterGhostRole(ent);
         }
 
-        private void OnShutdown(Entity<GhostRoleComponent> role, ref ComponentShutdown args)
+        private void OnRoleShutdown(Entity<GhostRoleComponent> role, ref ComponentShutdown args)
         {
             UnregisterGhostRole(role);
         }
diff --git a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
new file mode 100644
index 0000000000..5f5eabdad4
--- /dev/null
+++ b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs
@@ -0,0 +1,127 @@
+using System.Linq;
+using Content.Server.Administration;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Ghost.Roles.Raffles;
+using Content.Shared.Administration;
+using Content.Shared.Ghost.Roles.Raffles;
+using Content.Shared.Mind.Components;
+using Robust.Shared.Console;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Ghost.Roles
+{
+    [AdminCommand(AdminFlags.Admin)]
+    public sealed class MakeRaffledGhostRoleCommand : IConsoleCommand
+    {
+        [Dependency] private readonly IPrototypeManager _protoManager = default!;
+        [Dependency] private readonly IEntityManager _entManager = default!;
+
+        public string Command => "makeghostroleraffled";
+        public string Description => "Turns an entity into a raffled ghost role.";
+        public string Help => $"Usage: {Command} <entity uid> <name> <description> (<settings prototype> | <initial duration> <extend by> <max duration>) [<rules>]\n" +
+                              $"Durations are in seconds.";
+
+        public void Execute(IConsoleShell shell, string argStr, string[] args)
+        {
+            if (args.Length is < 4 or > 7)
+            {
+                shell.WriteLine($"Invalid amount of arguments.\n{Help}");
+                return;
+            }
+
+            if (!NetEntity.TryParse(args[0], out var uidNet) || !_entManager.TryGetEntity(uidNet, out var uid))
+            {
+                shell.WriteLine($"{args[0]} is not a valid entity uid.");
+                return;
+            }
+
+            if (!_entManager.TryGetComponent(uid, out MetaDataComponent? metaData))
+            {
+                shell.WriteLine($"No entity found with uid {uid}");
+                return;
+            }
+
+            if (_entManager.TryGetComponent(uid, out MindContainerComponent? mind) &&
+                mind.HasMind)
+            {
+                shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a mind.");
+                return;
+            }
+
+            if (_entManager.TryGetComponent(uid, out GhostRoleComponent? ghostRole))
+            {
+                shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a {nameof(GhostRoleComponent)}");
+                return;
+            }
+
+            if (_entManager.HasComponent<GhostTakeoverAvailableComponent>(uid))
+            {
+                shell.WriteLine($"Entity {metaData.EntityName} with id {uid} already has a {nameof(GhostTakeoverAvailableComponent)}");
+                return;
+            }
+
+            var name = args[1];
+            var description = args[2];
+
+            // if the rules are specified then use those, otherwise use the default
+            var rules = args.Length switch
+            {
+                5 => args[4],
+                7 => args[6],
+                _ => Loc.GetString("ghost-role-component-default-rules"),
+            };
+
+            // is it an invocation with a prototype ID and optional rules?
+            var isProto = args.Length is 4 or 5;
+            GhostRoleRaffleSettings settings;
+
+            if (isProto)
+            {
+                if (!_protoManager.TryIndex<GhostRoleRaffleSettingsPrototype>(args[4], out var proto))
+                {
+                    var validProtos = string.Join(", ",
+                        _protoManager.EnumeratePrototypes<GhostRoleRaffleSettingsPrototype>().Select(p => p.ID)
+                    );
+
+                    shell.WriteLine($"{args[4]} is not a valid raffle settings prototype. Valid options: {validProtos}");
+                    return;
+                }
+
+                settings = proto.Settings;
+            }
+            else
+            {
+                if (!uint.TryParse(args[3], out var initial)
+                    || !uint.TryParse(args[4], out var extends)
+                    || !uint.TryParse(args[5], out var max)
+                    || initial == 0 || max == 0)
+                {
+                    shell.WriteLine($"The raffle initial/extends/max settings must be positive numbers.");
+                    return;
+                }
+
+                if (initial > max)
+                {
+                    shell.WriteLine("The initial duration must be smaller than or equal to the maximum duration.");
+                    return;
+                }
+
+                settings = new GhostRoleRaffleSettings()
+                {
+                    InitialDuration = initial,
+                    JoinExtendsDurationBy = extends,
+                    MaxDuration = max
+                };
+            }
+
+            ghostRole = _entManager.AddComponent<GhostRoleComponent>(uid.Value);
+            _entManager.AddComponent<GhostTakeoverAvailableComponent>(uid.Value);
+            ghostRole.RoleName = name;
+            ghostRole.RoleDescription = description;
+            ghostRole.RoleRules = rules;
+            ghostRole.RaffleConfig = new GhostRoleRaffleConfig(settings);
+
+            shell.WriteLine($"Made entity {metaData.EntityName} a raffled ghost role.");
+        }
+    }
+}
diff --git a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs
new file mode 100644
index 0000000000..052704df25
--- /dev/null
+++ b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleConfig.cs
@@ -0,0 +1,35 @@
+using Content.Shared.Ghost.Roles.Raffles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Raffle configuration.
+/// </summary>
+[DataDefinition]
+public sealed partial class GhostRoleRaffleConfig
+{
+    public GhostRoleRaffleConfig(GhostRoleRaffleSettings settings)
+    {
+        SettingsOverride = settings;
+    }
+
+    /// <summary>
+    /// Specifies the raffle settings to use.
+    /// </summary>
+    [DataField("settings", required: true)]
+    public ProtoId<GhostRoleRaffleSettingsPrototype> Settings { get; set; } = "default";
+
+    /// <summary>
+    /// If not null, the settings from <see cref="Settings"/> are ignored and these settings are used instead.
+    /// Intended for allowing admins to set custom raffle settings for admeme ghost roles.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadOnly)]
+    public GhostRoleRaffleSettings? SettingsOverride { get; set; }
+
+    /// <summary>
+    /// Sets which <see cref="IGhostRoleRaffleDecider"/> is used.
+    /// </summary>
+    [DataField("decider")]
+    public ProtoId<GhostRoleRaffleDeciderPrototype> Decider { get; set; } = "default";
+}
diff --git a/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs
new file mode 100644
index 0000000000..b2ebf6ca5f
--- /dev/null
+++ b/Content.Server/Ghost/Roles/Raffles/GhostRoleRaffleDeciderPrototype.cs
@@ -0,0 +1,20 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Allows getting a <see cref="IGhostRoleRaffleDecider"/> as prototype.
+/// </summary>
+[Prototype("ghostRoleRaffleDecider")]
+public sealed class GhostRoleRaffleDeciderPrototype : IPrototype
+{
+    /// <inheritdoc />
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The <see cref="IGhostRoleRaffleDecider"/> instance that chooses the winner of a raffle.
+    /// </summary>
+    [DataField("decider", required: true)]
+    public IGhostRoleRaffleDecider Decider { get; private set; } = new RngGhostRoleRaffleDecider();
+}
diff --git a/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs b/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs
new file mode 100644
index 0000000000..bdd2bf046d
--- /dev/null
+++ b/Content.Server/Ghost/Roles/Raffles/IGhostRoleRaffleDecider.cs
@@ -0,0 +1,28 @@
+using Robust.Shared.Player;
+
+namespace Content.Server.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Chooses a winner of a ghost role raffle.
+/// </summary>
+[ImplicitDataDefinitionForInheritors]
+public partial interface IGhostRoleRaffleDecider
+{
+    /// <summary>
+    /// Chooses a winner of a ghost role raffle draw from the given pool of candidates.
+    /// </summary>
+    /// <param name="candidates">The players in the session at the time of drawing.</param>
+    /// <param name="tryTakeover">
+    /// Call this with the chosen winner as argument.
+    /// <ul><li>If <c>true</c> is returned, your winner was able to take over the ghost role, and the drawing is complete.
+    /// <b>Do not call <see cref="tryTakeover"/> again after true is returned.</b></li>
+    /// <li>If <c>false</c> is returned, your winner was not able to take over the ghost role,
+    /// and you must choose another winner, and call <see cref="tryTakeover"/> with the new winner as argument.</li>
+    /// </ul>
+    ///
+    /// If <see cref="tryTakeover"/> is not called, or only returns false, the raffle will end without a winner.
+    /// Do not call <see cref="tryTakeover"/> with the same player several times.
+    /// </param>
+    void PickWinner(IEnumerable<ICommonSession> candidates, Func<ICommonSession, bool> tryTakeover);
+}
+
diff --git a/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs b/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs
new file mode 100644
index 0000000000..b91d359935
--- /dev/null
+++ b/Content.Server/Ghost/Roles/Raffles/RngGhostRoleRaffleDecider.cs
@@ -0,0 +1,27 @@
+using System.Linq;
+using JetBrains.Annotations;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+
+namespace Content.Server.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Chooses the winner of a ghost role raffle entirely randomly, without any weighting.
+/// </summary>
+[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
+public sealed partial class RngGhostRoleRaffleDecider : IGhostRoleRaffleDecider
+{
+    public void PickWinner(IEnumerable<ICommonSession> candidates, Func<ICommonSession, bool> tryTakeover)
+    {
+        var random = IoCManager.Resolve<IRobustRandom>();
+
+        var choices = candidates.ToList();
+        random.Shuffle(choices); // shuffle the list so we can pick a lucky winner!
+
+        foreach (var candidate in choices)
+        {
+            if (tryTakeover(candidate))
+                return;
+        }
+    }
+}
diff --git a/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
index 627231db9e..fc73fc3454 100644
--- a/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
+++ b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
@@ -6,9 +6,16 @@ namespace Content.Server.Ghost.Roles.UI
 {
     public sealed class GhostRolesEui : BaseEui
     {
+        [Dependency] private readonly GhostRoleSystem _ghostRoleSystem;
+
+        public GhostRolesEui()
+        {
+            _ghostRoleSystem = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<GhostRoleSystem>();
+        }
+
         public override GhostRolesEuiState GetNewState()
         {
-            return new(EntitySystem.Get<GhostRoleSystem>().GetGhostRolesInfo());
+            return new(_ghostRoleSystem.GetGhostRolesInfo(Player));
         }
 
         public override void HandleMessage(EuiMessageBase msg)
@@ -17,11 +24,14 @@ namespace Content.Server.Ghost.Roles.UI
 
             switch (msg)
             {
-                case GhostRoleTakeoverRequestMessage req:
-                    EntitySystem.Get<GhostRoleSystem>().Takeover(Player, req.Identifier);
+                case RequestGhostRoleMessage req:
+                    _ghostRoleSystem.Request(Player, req.Identifier);
                     break;
-                case GhostRoleFollowRequestMessage req:
-                    EntitySystem.Get<GhostRoleSystem>().Follow(Player, req.Identifier);
+                case FollowGhostRoleMessage req:
+                    _ghostRoleSystem.Follow(Player, req.Identifier);
+                    break;
+                case LeaveGhostRoleRaffleMessage req:
+                    _ghostRoleSystem.LeaveRaffle(Player, req.Identifier);
                     break;
             }
         }
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 2b3b810fba..7448a9b84d 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -14,6 +14,7 @@ using Content.Shared.Database;
 using Content.Shared.Emag.Components;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
+using Content.Shared.ReagentSpeed;
 using Content.Shared.Research.Components;
 using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
@@ -35,6 +36,7 @@ namespace Content.Server.Lathe
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly UserInterfaceSystem _uiSys = default!;
         [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+        [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
         [Dependency] private readonly StackSystem _stack = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
 
@@ -186,9 +188,11 @@ namespace Content.Server.Lathe
             var recipe = component.Queue.First();
             component.Queue.RemoveAt(0);
 
+            var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime);
+
             var lathe = EnsureComp<LatheProducingComponent>(uid);
             lathe.StartTime = _timing.CurTime;
-            lathe.ProductionLength = recipe.CompleteTime * component.TimeMultiplier;
+            lathe.ProductionLength = time * component.TimeMultiplier;
             component.CurrentRecipe = recipe;
 
             var ev = new LatheStartPrintingEvent(recipe);
diff --git a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
index fe3b844ae3..58647d8874 100644
--- a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
@@ -35,7 +35,7 @@ public sealed partial class GunAmmoPrecondition : HTNPrecondition
         else
             percent = ammoEv.Count / (float) ammoEv.Capacity;
 
-        percent = Math.Clamp(percent, 0f, 1f);
+        percent = System.Math.Clamp(percent, 0f, 1f);
 
         if (MaxPercent < percent)
             return false;
diff --git a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
new file mode 100644
index 0000000000..c12663901c
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
@@ -0,0 +1,12 @@
+namespace Content.Server.NPC.HTN.Preconditions;
+
+public sealed partial class KeyNotExistsPrecondition : HTNPrecondition
+{
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        return !blackboard.ContainsKey(Key);
+    }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
new file mode 100644
index 0000000000..8c7920e8be
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
@@ -0,0 +1,23 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+/// <summary>
+/// Checks for the presence of data in the blackboard and makes a comparison with the specified boolean
+/// </summary>
+public sealed partial class KeyBoolEqualsPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    [DataField(required: true)]
+    public bool Value;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        if (!blackboard.TryGetValue<bool>(Key, out var value, _entManager))
+            return false;
+
+        return Value == value;
+    }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
new file mode 100644
index 0000000000..802fdaf2b9
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
@@ -0,0 +1,18 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatEqualsPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    [DataField(required: true)]
+    public float Value;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        return blackboard.TryGetValue<float>(Key, out var value, _entManager) &&
+               MathHelper.CloseTo(value, value);
+    }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
new file mode 100644
index 0000000000..3a9ac36698
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
@@ -0,0 +1,17 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatGreaterPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    [DataField(required: true)]
+    public float Value;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        return blackboard.TryGetValue<float>(Key, out var value, _entManager) && value > Value;
+    }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
new file mode 100644
index 0000000000..5cd51d7a7c
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
@@ -0,0 +1,17 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatLessPrecondition : HTNPrecondition
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    [DataField(required: true)]
+    public float Value;
+
+    public override bool IsMet(NPCBlackboard blackboard)
+    {
+        return blackboard.TryGetValue<float>(Key, out var value, _entManager) && value < Value;
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
new file mode 100644
index 0000000000..00404517c9
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
@@ -0,0 +1,33 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+/// <summary>
+/// Gets the key, and adds the value to that float
+/// </summary>
+public sealed partial class AddFloatOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Amount;
+
+    public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
+        CancellationToken cancelToken)
+    {
+        if (!blackboard.TryGetValue<float>(TargetKey, out var value, _entManager))
+            return (false, null);
+
+        return (
+            true,
+            new Dictionary<string, object>
+            {
+                { TargetKey, value + Amount }
+            }
+        );
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
new file mode 100644
index 0000000000..a40b96798d
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
@@ -0,0 +1,28 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+/// <summary>
+/// Just sets a blackboard key to a bool
+/// </summary>
+public sealed partial class SetBoolOperator : HTNOperator
+{
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool Value;
+
+    public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
+        CancellationToken cancelToken)
+    {
+        return (
+            true,
+            new Dictionary<string, object>
+            {
+                { TargetKey, Value }
+            }
+        );
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
similarity index 52%
rename from Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs
rename to Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
index 7a460592cb..76842b431f 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
@@ -1,24 +1,28 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
 
 /// <summary>
 /// Just sets a blackboard key to a float
 /// </summary>
 public sealed partial class SetFloatOperator : HTNOperator
 {
-    [DataField("targetKey", required: true)] public string TargetKey = string.Empty;
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("amount")]
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float Amount;
 
     public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
         CancellationToken cancelToken)
     {
-        return (true, new Dictionary<string, object>()
-        {
-            {TargetKey, Amount},
-        });
+        return (
+            true,
+            new Dictionary<string, object>
+            {
+                { TargetKey, Amount }
+            }
+        );
     }
 }
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
new file mode 100644
index 0000000000..999756f1f7
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Robust.Shared.Random;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+/// <summary>
+/// Sets a random float from MinAmount to MaxAmount to blackboard
+/// </summary>
+public sealed partial class SetRandomFloatOperator : HTNOperator
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    [DataField(required: true)]
+    public string TargetKey = string.Empty;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float MaxAmount = 1f;
+
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float MinAmount = 0f;
+
+    public override async Task<(bool Valid, Dictionary<string, object>? Effects)> Plan(NPCBlackboard blackboard,
+        CancellationToken cancelToken)
+    {
+        return (
+            true,
+            new Dictionary<string, object>
+            {
+                { TargetKey, _random.NextFloat(MinAmount, MaxAmount) }
+            }
+        );
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
new file mode 100644
index 0000000000..57cc2e91e4
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
@@ -0,0 +1,28 @@
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+
+public sealed partial class PlaySoundOperator : HTNOperator
+{
+    private AudioSystem _audio = default!;
+
+    [DataField(required: true)]
+    public SoundSpecifier? Sound;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+
+        _audio = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>();
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        var uid = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+
+        _audio.PlayPvs(Sound, uid);
+
+        return base.Update(blackboard, frameTime);
+    }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
new file mode 100644
index 0000000000..d1c7d61915
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -0,0 +1,36 @@
+using Content.Server.Chat.Systems;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+
+public sealed partial class SayKeyOperator : HTNOperator
+{
+    [Dependency] private readonly IEntityManager _entManager = default!;
+
+    private ChatSystem _chat = default!;
+
+    [DataField(required: true)]
+    public string Key = string.Empty;
+
+    /// <summary>
+    /// Whether to hide message from chat window and logs.
+    /// </summary>
+    [DataField]
+    public bool Hidden;
+
+    public override void Initialize(IEntitySystemManager sysManager)
+    {
+        base.Initialize(sysManager);
+        _chat = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<ChatSystem>();
+    }
+
+    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+    {
+        if (!blackboard.TryGetValue<object>(Key, out var value, _entManager))
+            return HTNOperatorStatus.Failed;
+
+        var speaker = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
+        _chat.TrySendInGameICMessage(speaker, value.ToString() ?? "Oh no...", InGameICChatType.Speak, hideChat: Hidden, hideLog: Hidden);
+
+        return base.Update(blackboard, frameTime);
+    }
+}
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index 83cf9b9cb2..0543518dcc 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -973,7 +973,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
     /// <summary>
     /// Creates a simple planet setup for a map.
     /// </summary>
-    public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate, int? seed = null, MetaDataComponent? metadata = null)
+    public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate, int? seed = null, MetaDataComponent? metadata = null, Color? mapLight = null)
     {
         if (!Resolve(mapUid, ref metadata))
             return;
@@ -998,7 +998,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
         // Lava: #A34931
 
         var light = EnsureComp<MapLightComponent>(mapUid);
-        light.AmbientLightColor = Color.FromHex("#D8B059");
+        light.AmbientLightColor = mapLight ?? Color.FromHex("#D8B059");
         Dirty(mapUid, light, metadata);
 
         var moles = new float[Atmospherics.AdjustedNumberOfGases];
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index 4d2b01f763..c638c2f240 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -309,7 +309,7 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager
         var data = new PlayTimeData();
         _playTimeData.Add(session, data);
 
-        var playTimes = await _db.GetPlayTimes(session.UserId);
+        var playTimes = await _db.GetPlayTimes(session.UserId, cancel);
         cancel.ThrowIfCancellationRequested();
 
         foreach (var timer in playTimes)
diff --git a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index 1808592ef5..63c267f154 100644
--- a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -12,6 +12,7 @@ namespace Content.Server.Preferences.Managers
         void Init();
 
         Task LoadData(ICommonSession session, CancellationToken cancel);
+        void FinishLoad(ICommonSession session);
         void OnClientDisconnected(ICommonSession session);
 
         bool TryGetCachedPreferences(NetUserId userId, [NotNullWhen(true)] out PlayerPreferences? playerPreferences);
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index a1eb8aad82..7a80757435 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -13,6 +13,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 
 namespace Content.Server.Preferences.Managers
@@ -27,6 +28,7 @@ namespace Content.Server.Preferences.Managers
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IServerDbManager _db = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IDependencyCollection _dependencies = default!;
         [Dependency] private readonly IPrototypeManager _protos = default!;
 
         // Cache player prefs on the server so we don't need as much async hell related to them.
@@ -101,9 +103,8 @@ namespace Content.Server.Preferences.Managers
 
             var curPrefs = prefsData.Prefs!;
             var session = _playerManager.GetSessionById(userId);
-            var collection = IoCManager.Instance!;
 
-            profile.EnsureValid(session, collection);
+            profile.EnsureValid(session, _dependencies);
 
             var profiles = new Dictionary<int, ICharacterProfile>(curPrefs.Characters)
             {
@@ -196,21 +197,32 @@ namespace Content.Server.Preferences.Managers
 
                 async Task LoadPrefs()
                 {
-                    var prefs = await GetOrCreatePreferencesAsync(session.UserId);
+                    var prefs = await GetOrCreatePreferencesAsync(session.UserId, cancel);
                     prefsData.Prefs = prefs;
-                    prefsData.PrefsLoaded = true;
-
-                    var msg = new MsgPreferencesAndSettings();
-                    msg.Preferences = prefs;
-                    msg.Settings = new GameSettings
-                    {
-                        MaxCharacterSlots = MaxCharacterSlots
-                    };
-                    _netManager.ServerSendMessage(msg, session.Channel);
                 }
             }
         }
 
+        public void FinishLoad(ICommonSession session)
+        {
+            // This is a separate step from the actual database load.
+            // Sanitizing preferences requires play time info due to loadouts.
+            // And play time info is loaded concurrently from the DB with preferences.
+            var prefsData = _cachedPlayerPrefs[session.UserId];
+            DebugTools.Assert(prefsData.Prefs != null);
+            prefsData.Prefs = SanitizePreferences(session, prefsData.Prefs, _dependencies);
+
+            prefsData.PrefsLoaded = true;
+
+            var msg = new MsgPreferencesAndSettings();
+            msg.Preferences = prefsData.Prefs;
+            msg.Settings = new GameSettings
+            {
+                MaxCharacterSlots = MaxCharacterSlots
+            };
+            _netManager.ServerSendMessage(msg, session.Channel);
+        }
+
         public void OnClientDisconnected(ICommonSession session)
         {
             _cachedPlayerPrefs.Remove(session.UserId);
@@ -270,18 +282,15 @@ namespace Content.Server.Preferences.Managers
             return null;
         }
 
-        private async Task<PlayerPreferences> GetOrCreatePreferencesAsync(NetUserId userId)
+        private async Task<PlayerPreferences> GetOrCreatePreferencesAsync(NetUserId userId, CancellationToken cancel)
         {
-            var prefs = await _db.GetPlayerPreferencesAsync(userId);
+            var prefs = await _db.GetPlayerPreferencesAsync(userId, cancel);
             if (prefs is null)
             {
-                return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random());
+                return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random(), cancel);
             }
 
-            var session = _playerManager.GetSessionById(userId);
-            var collection = IoCManager.Instance!;
-
-            return SanitizePreferences(session, prefs, collection);
+            return prefs;
         }
 
         private PlayerPreferences SanitizePreferences(ICommonSession session, PlayerPreferences prefs, IDependencyCollection collection)
diff --git a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
index 6a58c209cf..ff3c8176fd 100644
--- a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
+++ b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
@@ -40,14 +40,21 @@ public sealed partial class SalvageExpeditionComponent : SharedSalvageExpedition
     /// <summary>
     /// Countdown audio stream.
     /// </summary>
+    [DataField, AutoNetworkedField]
     public EntityUid? Stream = null;
 
     /// <summary>
     /// Sound that plays when the mission end is imminent.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite), DataField("sound")]
-    public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Misc/tension_session.ogg")
+    [ViewVariables(VVAccess.ReadWrite), DataField]
+    public SoundSpecifier Sound = new SoundCollectionSpecifier("ExpeditionEnd")
     {
         Params = AudioParams.Default.WithVolume(-5),
     };
+
+    /// <summary>
+    /// Song selected on MapInit so we can predict the audio countdown properly.
+    /// </summary>
+    [DataField]
+    public SoundPathSpecifier SelectedSong;
 }
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 4d5d569dab..923880169d 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -4,7 +4,9 @@ using Content.Server.Salvage.Expeditions;
 using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.CCVar;
 using Content.Shared.Examine;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Salvage.Expeditions;
+using Robust.Shared.Audio;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameStates;
@@ -32,6 +34,7 @@ public sealed partial class SalvageSystem
         SubscribeLocalEvent<SalvageExpeditionConsoleComponent, EntParentChangedMessage>(OnSalvageConsoleParent);
         SubscribeLocalEvent<SalvageExpeditionConsoleComponent, ClaimSalvageMessage>(OnSalvageClaimMessage);
 
+        SubscribeLocalEvent<SalvageExpeditionComponent, MapInitEvent>(OnExpeditionMapInit);
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentShutdown>(OnExpeditionShutdown);
         SubscribeLocalEvent<SalvageExpeditionComponent, ComponentGetState>(OnExpeditionGetState);
 
@@ -64,6 +67,12 @@ public sealed partial class SalvageSystem
         _cooldown = obj;
     }
 
+    private void OnExpeditionMapInit(EntityUid uid, SalvageExpeditionComponent component, MapInitEvent args)
+    {
+        var selectedFile = _audio.GetSound(component.Sound);
+        component.SelectedSong = new SoundPathSpecifier(selectedFile, component.Sound.Params);
+    }
+
     private void OnExpeditionShutdown(EntityUid uid, SalvageExpeditionComponent component, ComponentShutdown args)
     {
         component.Stream = _audio.Stop(component.Stream);
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 8a1498cbe9..e6e29eb577 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -144,6 +144,7 @@ public sealed partial class SalvageSystem
         while (query.MoveNext(out var uid, out var comp))
         {
             var remaining = comp.EndTime - _timing.CurTime;
+            var audioLength = _audio.GetAudioLength(comp.SelectedSong.Path.ToString());
 
             if (comp.Stage < ExpeditionStage.FinalCountdown && remaining < TimeSpan.FromSeconds(45))
             {
@@ -151,13 +152,14 @@ public sealed partial class SalvageSystem
                 Dirty(uid, comp);
                 Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-seconds", ("duration", TimeSpan.FromSeconds(45).Seconds)));
             }
-            else if (comp.Stage < ExpeditionStage.MusicCountdown && remaining < TimeSpan.FromMinutes(2))
+            else if (comp.Stream == null && remaining < audioLength)
             {
-                // TODO: Some way to play audio attached to a map for players.
-                comp.Stream = _audio.PlayGlobal(comp.Sound, Filter.BroadcastMap(Comp<MapComponent>(uid).MapId), true).Value.Entity;
+                var audio = _audio.PlayPvs(comp.Sound, uid).Value;
+                comp.Stream = audio.Entity;
+                _audio.SetMapAudio(audio);
                 comp.Stage = ExpeditionStage.MusicCountdown;
                 Dirty(uid, comp);
-                Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", TimeSpan.FromMinutes(2).Minutes)));
+                Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", audioLength.Minutes)));
             }
             else if (comp.Stage < ExpeditionStage.Countdown && remaining < TimeSpan.FromMinutes(4))
             {
diff --git a/Content.Server/Shuttles/Components/DockingSignalControlComponent.cs b/Content.Server/Shuttles/Components/DockingSignalControlComponent.cs
new file mode 100644
index 0000000000..4361265080
--- /dev/null
+++ b/Content.Server/Shuttles/Components/DockingSignalControlComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.DeviceLinking;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Shuttles.Components;
+
+[RegisterComponent]
+public sealed partial class DockingSignalControlComponent : Component
+{
+    /// <summary>
+    /// Output port that is high while docked.
+    /// </summary>
+    [DataField]
+    public ProtoId<SourcePortPrototype> DockStatusSignalPort = "DockStatus";
+}
diff --git a/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs
new file mode 100644
index 0000000000..34cade7f1c
--- /dev/null
+++ b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.DeviceLinking.Systems;
+using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Events;
+
+namespace Content.Server.Shuttles.Systems;
+
+public sealed class DockingSignalControlSystem : EntitySystem
+{
+    [Dependency] private readonly DeviceLinkSystem _deviceLinkSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DockingSignalControlComponent, DockEvent>(OnDocked);
+        SubscribeLocalEvent<DockingSignalControlComponent, UndockEvent>(OnUndocked);
+    }
+
+    private void OnDocked(Entity<DockingSignalControlComponent> ent, ref DockEvent args)
+    {
+        _deviceLinkSystem.SendSignal(ent, ent.Comp.DockStatusSignalPort, signal: true);
+    }
+
+    private void OnUndocked(Entity<DockingSignalControlComponent> ent, ref UndockEvent args)
+    {
+        _deviceLinkSystem.SendSignal(ent, ent.Comp.DockStatusSignalPort, signal: false);
+    }
+}
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index be55cd9a62..74c42ccbc5 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -264,11 +264,6 @@ public sealed class ThrusterSystem : EntitySystem
             return;
         }
 
-        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
-        {
-            apcPower.NeedsPower = true;
-        }
-
         component.IsOn = true;
 
         if (!EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
@@ -371,11 +366,6 @@ public sealed class ThrusterSystem : EntitySystem
         if (!EntityManager.TryGetComponent(gridId, out ShuttleComponent? shuttleComponent))
             return;
 
-        if (TryComp<ApcPowerReceiverComponent>(uid, out var apcPower))
-        {
-            apcPower.NeedsPower = false;
-        }
-
         // Logger.DebugS("thruster", $"Disabled thruster {uid}");
 
         switch (component.Type)
diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
index 5637288732..f6d259c115 100644
--- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs
@@ -10,6 +10,10 @@ public sealed class FrenchAccentSystem : EntitySystem
 {
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
 
+    private static readonly Regex RegexTh = new(@"th", RegexOptions.IgnoreCase);
+    private static readonly Regex RegexStartH = new(@"(?<!\w)h", RegexOptions.IgnoreCase);
+    private static readonly Regex RegexSpacePunctuation = new(@"(?<=\w\w)[!?;:](?!\w)", RegexOptions.IgnoreCase);
+
     public override void Initialize()
     {
         base.Initialize();
@@ -23,17 +27,14 @@ public sealed class FrenchAccentSystem : EntitySystem
 
         msg = _replacement.ApplyReplacements(msg, "french");
 
-        // replaces th with dz 
-        msg = Regex.Replace(msg, @"th", "'z", RegexOptions.IgnoreCase);
+        // replaces th with dz
+        msg = RegexTh.Replace(msg, "'z");
 
         // removes the letter h from the start of words.
-        msg = Regex.Replace(msg, @"(?<!\w)[h]", "'", RegexOptions.IgnoreCase);
+        msg = RegexStartH.Replace(msg, "'");
 
         // spaces out ! ? : and ;.
-        msg = Regex.Replace(msg, @"(?<=\w\w)!(?!\w)", " !", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<=\w\w)[?](?!\w)", " ?", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<=\w\w)[;](?!\w)", " ;", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<=\w\w)[:](?!\w)", " :", RegexOptions.IgnoreCase);
+        msg = RegexSpacePunctuation.Replace(msg, " $&");
 
         return msg;
     }
diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
index 96e3620ecf..1508a8b2d4 100644
--- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
+++ b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs
@@ -5,6 +5,13 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class FrontalLispSystem : EntitySystem
 {
+    // @formatter:off
+    private static readonly Regex RegexUpperTh = new(@"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)");
+    private static readonly Regex RegexLowerTh = new(@"[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)");
+    private static readonly Regex RegexUpperEcks = new(@"[E]+[Xx]+[Cc]*|[X]+");
+    private static readonly Regex RegexLowerEcks = new(@"[e]+[x]+[c]*|[x]+");
+    // @formatter:on
+
     public override void Initialize()
     {
         base.Initialize();
@@ -16,11 +23,11 @@ public sealed class FrontalLispSystem : EntitySystem
         var message = args.Message;
 
         // handles ts, sc(i|e|y), c(i|e|y), ps, st(io(u|n)), ch(i|e), z, s
-        message = Regex.Replace(message, @"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)", "TH");
-        message = Regex.Replace(message, @"[t]+[s]+|[s]+[c]+(?=[iey]+)|[c]+(?=[iey]+)|[p][s]+|([s]+[t]+|[t]+)(?=[i]+[o]+[u]*[n]*)|[c]+[h]+(?=[i]*[e]*)|[z]+|[s]+|[x]+(?=[e]+)", "th");
+        message = RegexUpperTh.Replace(message, "TH");
+        message = RegexLowerTh.Replace(message, "th");
         // handles ex(c), x
-        message = Regex.Replace(message, @"[E]+[Xx]+[Cc]*|[X]+", "EKTH");
-        message = Regex.Replace(message, @"[e]+[x]+[c]*|[x]+", "ekth");
+        message = RegexUpperEcks.Replace(message, "EKTH");
+        message = RegexLowerEcks.Replace(message, "ekth");
 
         args.Message = message;
     }
diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
index a7e21016a2..81a57cb848 100644
--- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs
@@ -5,6 +5,12 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class LizardAccentSystem : EntitySystem
 {
+    private static readonly Regex RegexLowerS = new("s+");
+    private static readonly Regex RegexUpperS = new("S+");
+    private static readonly Regex RegexInternalX = new(@"(\w)x");
+    private static readonly Regex RegexLowerEndX = new(@"\bx([\-|r|R]|\b)");
+    private static readonly Regex RegexUpperEndX = new(@"\bX([\-|r|R]|\b)");
+
     public override void Initialize()
     {
         base.Initialize();
@@ -16,15 +22,15 @@ public sealed class LizardAccentSystem : EntitySystem
         var message = args.Message;
 
         // hissss
-        message = Regex.Replace(message, "s+", "sss");
+        message = RegexLowerS.Replace(message, "sss");
         // hiSSS
-        message = Regex.Replace(message, "S+", "SSS");
+        message = RegexUpperS.Replace(message, "SSS");
         // ekssit
-        message = Regex.Replace(message, @"(\w)x", "$1kss");
+        message = RegexInternalX.Replace(message, "$1kss");
         // ecks
-        message = Regex.Replace(message, @"\bx([\-|r|R]|\b)", "ecks$1");
+        message = RegexLowerEndX.Replace(message, "ecks$1");
         // eckS
-        message = Regex.Replace(message, @"\bX([\-|r|R]|\b)", "ECKS$1");
+        message = RegexUpperEndX.Replace(message, "ECKS$1");
 
         args.Message = message;
     }
diff --git a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
index d1a6a049d5..0e9b0a34ef 100644
--- a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Content.Server.Speech.Components;
@@ -8,30 +7,17 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class MobsterAccentSystem : EntitySystem
 {
+    private static readonly Regex RegexIng = new(@"(?<=\w\w)(in)g(?!\w)", RegexOptions.IgnoreCase);
+    private static readonly Regex RegexLowerOr = new(@"(?<=\w)o[Rr](?=\w)");
+    private static readonly Regex RegexUpperOr = new(@"(?<=\w)O[Rr](?=\w)");
+    private static readonly Regex RegexLowerAr = new(@"(?<=\w)a[Rr](?=\w)");
+    private static readonly Regex RegexUpperAr = new(@"(?<=\w)A[Rr](?=\w)");
+    private static readonly Regex RegexFirstWord = new(@"^(\S+)");
+    private static readonly Regex RegexLastWord = new(@"(\S+)$");
+
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
 
-    private static readonly Dictionary<string, string> DirectReplacements = new()
-    {
-        { "let me", "lemme" },
-        { "should", "oughta" },
-        { "the", "da" },
-        { "them", "dem" },
-        { "attack", "whack" },
-        { "kill", "whack" },
-        { "murder", "whack" },
-        { "dead", "sleepin' with da fishies"},
-        { "hey", "ey'o" },
-        { "hi", "ey'o"},
-        { "hello", "ey'o"},
-        { "rules", "roolz" },
-        { "you", "yous" },
-        { "have to", "gotta" },
-        { "going to", "boutta" },
-        { "about to", "boutta" },
-        { "here", "'ere" }
-    };
-
     public override void Initialize()
     {
         base.Initialize();
@@ -51,20 +37,20 @@ public sealed class MobsterAccentSystem : EntitySystem
         // thinking -> thinkin'
         // king -> king
         //Uses captures groups to make sure the captialization of IN is kept
-        msg = Regex.Replace(msg, @"(?<=\w\w)(in)g(?!\w)", "$1'", RegexOptions.IgnoreCase);
+        msg = RegexIng.Replace(msg, "$1'");
 
         // or -> uh and ar -> ah in the middle of words (fuhget, tahget)
-        msg = Regex.Replace(msg, @"(?<=\w)o[Rr](?=\w)", "uh");
-        msg = Regex.Replace(msg, @"(?<=\w)O[Rr](?=\w)", "UH");
-        msg = Regex.Replace(msg, @"(?<=\w)a[Rr](?=\w)", "ah");
-        msg = Regex.Replace(msg, @"(?<=\w)A[Rr](?=\w)", "AH");
+        msg = RegexLowerOr.Replace(msg, "uh");
+        msg = RegexUpperOr.Replace(msg, "UH");
+        msg = RegexLowerAr.Replace(msg, "ah");
+        msg = RegexUpperAr.Replace(msg, "AH");
 
         // Prefix
         if (_random.Prob(0.15f))
         {
             //Checks if the first word of the sentence is all caps
             //So the prefix can be allcapped and to not resanitize the captial
-            var firstWordAllCaps = !Regex.Match(msg, @"^(\S+)").Value.Any(char.IsLower);
+            var firstWordAllCaps = !RegexFirstWord.Match(msg).Value.Any(char.IsLower);
             var pick = _random.Next(1, 2);
 
             // Reverse sanitize capital
@@ -84,7 +70,7 @@ public sealed class MobsterAccentSystem : EntitySystem
         {
             //Checks if the last word of the sentence is all caps
             //So the suffix can be allcapped
-            var lastWordAllCaps = !Regex.Match(msg, @"(\S+)$").Value.Any(char.IsLower);
+            var lastWordAllCaps = !RegexLastWord.Match(msg).Value.Any(char.IsLower);
             var suffix = "";
             if (component.IsBoss)
             {
@@ -94,7 +80,7 @@ public sealed class MobsterAccentSystem : EntitySystem
             else
             {
                 var pick = _random.Next(1, 3);
-                suffix = Loc.GetString($"accent-mobster-suffix-minion-{pick}");                
+                suffix = Loc.GetString($"accent-mobster-suffix-minion-{pick}");
             }
             if (lastWordAllCaps)
                 suffix = suffix.ToUpper();
diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
index 3de4651b4a..84b79d4ce9 100644
--- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs
@@ -5,6 +5,9 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class MothAccentSystem : EntitySystem
 {
+    private static readonly Regex RegexLowerBuzz = new Regex("z{1,3}");
+    private static readonly Regex RegexUpperBuzz = new Regex("Z{1,3}");
+
     public override void Initialize()
     {
         base.Initialize();
@@ -16,10 +19,10 @@ public sealed class MothAccentSystem : EntitySystem
         var message = args.Message;
 
         // buzzz
-        message = Regex.Replace(message, "z{1,3}", "zzz");
+        message = RegexLowerBuzz.Replace(message, "zzz");
         // buZZZ
-        message = Regex.Replace(message, "Z{1,3}", "ZZZ");
-        
+        message = RegexUpperBuzz.Replace(message, "ZZZ");
+
         args.Message = message;
     }
 }
diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
index 10437c235d..ae8fe522b9 100644
--- a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs
@@ -7,6 +7,8 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed partial class ParrotAccentSystem : EntitySystem
 {
+    private static readonly Regex WordCleanupRegex = new Regex("[^A-Za-z0-9 -]");
+
     [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
@@ -27,7 +29,7 @@ public sealed partial class ParrotAccentSystem : EntitySystem
         if (_random.Prob(entity.Comp.LongestWordRepeatChance))
         {
             // Don't count non-alphanumeric characters as parts of words
-            var cleaned = Regex.Replace(message, "[^A-Za-z0-9 -]", string.Empty);
+            var cleaned = WordCleanupRegex.Replace(message, string.Empty);
             // Split on whitespace and favor words towards the end of the message
             var words = cleaned.Split(null).Reverse();
             // Find longest word
diff --git a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
index 9f5f8080b9..84298cbf01 100644
--- a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs
@@ -7,6 +7,8 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class PirateAccentSystem : EntitySystem
 {
+    private static readonly Regex FirstWordAllCapsRegex = new(@"^(\S+)");
+
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
 
@@ -26,7 +28,7 @@ public sealed class PirateAccentSystem : EntitySystem
             return msg;
         //Checks if the first word of the sentence is all caps
         //So the prefix can be allcapped and to not resanitize the captial
-        var firstWordAllCaps = !Regex.Match(msg, @"^(\S+)").Value.Any(char.IsLower);
+        var firstWordAllCaps = !FirstWordAllCapsRegex.Match(msg).Value.Any(char.IsLower);
 
         var pick = _random.Pick(component.PirateWords);
         var pirateWord = Loc.GetString(pick);
diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
index 37b267bec2..8a61c0ea50 100644
--- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs
@@ -7,6 +7,8 @@ namespace Content.Server.Speech.EntitySystems
 {
     public sealed class ScrambledAccentSystem : EntitySystem
     {
+        private static readonly Regex RegexLoneI = new(@"(?<=\ )i(?=[\ \.\?]|$)");
+
         [Dependency] private readonly IRobustRandom _random = default!;
 
         public override void Initialize()
@@ -34,7 +36,7 @@ namespace Content.Server.Speech.EntitySystems
             msg = msg[0].ToString().ToUpper() + msg.Remove(0, 1);
 
             // Capitalize lone i's
-            msg = Regex.Replace(msg, @"(?<=\ )i(?=[\ \.\?]|$)", "I");
+            msg = RegexLoneI.Replace(msg, "I");
             return msg;
         }
 
diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
index 4d401367cc..b9260eb844 100644
--- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs
@@ -5,8 +5,12 @@ namespace Content.Server.Speech.EntitySystems;
 
 public sealed class SouthernAccentSystem : EntitySystem
 {
+    private static readonly Regex RegexIng = new(@"ing\b");
+    private static readonly Regex RegexAnd = new(@"\band\b");
+    private static readonly Regex RegexDve = new("d've");
+
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
-    
+
     public override void Initialize()
     {
         base.Initialize();
@@ -20,9 +24,9 @@ public sealed class SouthernAccentSystem : EntitySystem
         message = _replacement.ApplyReplacements(message, "southern");
 
         //They shoulda started runnin' an' hidin' from me!
-        message = Regex.Replace(message, @"ing\b", "in'");
-        message = Regex.Replace(message, @"\band\b", "an'");
-        message = Regex.Replace(message, "d've", "da");
+        message = RegexIng.Replace(message, "in'");
+        message = RegexAnd.Replace(message, "an'");
+        message = RegexDve.Replace(message, "da");
         args.Message = message;
     }
 };
diff --git a/Content.Server/Station/Components/StationBiomeComponent.cs b/Content.Server/Station/Components/StationBiomeComponent.cs
index 38800579a9..0eb64aaff8 100644
--- a/Content.Server/Station/Components/StationBiomeComponent.cs
+++ b/Content.Server/Station/Components/StationBiomeComponent.cs
@@ -16,4 +16,7 @@ public sealed partial class StationBiomeComponent : Component
     // If null, its random
     [DataField]
     public int? Seed = null;
+
+    [DataField]
+    public Color MapLightColor = Color.Black;
 }
diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs
index 821745fc4d..8c80806ccf 100644
--- a/Content.Server/Station/Systems/StationBiomeSystem.cs
+++ b/Content.Server/Station/Systems/StationBiomeSystem.cs
@@ -30,6 +30,6 @@ public sealed partial class StationBiomeSystem : EntitySystem
         var mapId = Transform(station.Value).MapID;
         var mapUid = _mapManager.GetMapEntityId(mapId);
 
-        _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed);
+        _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
     }
 }
diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
index efa9cc096d..7e32f546be 100644
--- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
+++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Administration;
+using Content.Server.GameTicking;
 using Content.Server.GameTicking.Components;
 using Content.Server.GameTicking.Rules;
 using Content.Server.GameTicking.Rules.Components;
@@ -22,6 +23,9 @@ namespace Content.Server.StationEvents
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly EventManagerSystem _event = default!;
 
+        public const float MinEventTime = 60 * 3;
+        public const float MaxEventTime = 60 * 10;
+
         protected override void Ended(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule,
             GameRuleEndedEvent args)
         {
@@ -58,7 +62,7 @@ namespace Content.Server.StationEvents
         /// </summary>
         private void ResetTimer(BasicStationEventSchedulerComponent component)
         {
-            component.TimeUntilNextEvent = _random.Next(3 * 60, 10 * 60);
+            component.TimeUntilNextEvent = _random.NextFloat(MinEventTime, MaxEventTime);
         }
     }
 
@@ -66,6 +70,59 @@ namespace Content.Server.StationEvents
     public sealed class StationEventCommand : ToolshedCommand
     {
         private EventManagerSystem? _stationEvent;
+        private BasicStationEventSchedulerSystem? _basicScheduler;
+        private IRobustRandom? _random;
+
+        /// <summary>
+        ///     Estimates the expected number of times an event will run over the course of X rounds, taking into account weights and
+        ///     how many events are expected to run over a given timeframe for a given playercount by repeatedly simulating rounds.
+        ///     Effectively /100 (if you put 100 rounds) = probability an event will run per round.
+        /// </summary>
+        /// <remarks>
+        ///     This isn't perfect. Code path eventually goes into <see cref="EventManagerSystem.CanRun"/>, which requires
+        ///     state from <see cref="GameTicker"/>. As a result, you should probably just run this locally and not doing
+        ///     a real round (it won't pollute the state, but it will get contaminated by previously ran events in the actual round)
+        ///     and things like `MaxOccurrences` and `ReoccurrenceDelay` won't be respected.
+        ///
+        ///     I consider these to not be that relevant to the analysis here though (and I don't want most uses of them
+        ///     to even exist) so I think it's fine.
+        /// </remarks>
+        [CommandImplementation("simulate")]
+        public IEnumerable<(string, float)> Simulate([CommandArgument] int rounds, [CommandArgument] int playerCount, [CommandArgument] float roundEndMean, [CommandArgument] float roundEndStdDev)
+        {
+            _stationEvent ??= GetSys<EventManagerSystem>();
+            _basicScheduler ??= GetSys<BasicStationEventSchedulerSystem>();
+            _random ??= IoCManager.Resolve<IRobustRandom>();
+
+            var occurrences = new Dictionary<string, int>();
+
+            foreach (var ev in _stationEvent.AllEvents())
+            {
+                occurrences.Add(ev.Key.ID, 0);
+            }
+
+            for (var i = 0; i < rounds; i++)
+            {
+                var curTime = TimeSpan.Zero;
+                var randomEndTime = _random.NextGaussian(roundEndMean, roundEndStdDev) * 60; // *60 = minutes to seconds
+                if (randomEndTime <= 0)
+                    continue;
+
+                while (curTime.TotalSeconds < randomEndTime)
+                {
+                    // sim an event
+                    curTime += TimeSpan.FromSeconds(_random.NextFloat(BasicStationEventSchedulerSystem.MinEventTime, BasicStationEventSchedulerSystem.MaxEventTime));
+                    var available = _stationEvent.AvailableEvents(false, playerCount, curTime);
+                    var ev = _stationEvent.FindEvent(available);
+                    if (ev == null)
+                        continue;
+
+                    occurrences[ev] += 1;
+                }
+            }
+
+            return occurrences.Select(p => (p.Key, (float) p.Value)).OrderByDescending(p => p.Item2);
+        }
 
         [CommandImplementation("lsprob")]
         public IEnumerable<(string, float)> LsProb()
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index 1a26417b05..f2fdb8ff5a 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.StationEvents.Components;
 using Content.Shared.CCVar;
@@ -15,6 +16,7 @@ public sealed class EventManagerSystem : EntitySystem
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
+    [Dependency] private readonly IChatManager _chat = default!;
     [Dependency] public readonly GameTicker GameTicker = default!;
 
     public bool EventsEnabled { get; private set; }
@@ -43,6 +45,7 @@ public sealed class EventManagerSystem : EntitySystem
 
         var ent = GameTicker.AddGameRule(randomEvent);
         var str = Loc.GetString("station-event-system-run-event",("eventName", ToPrettyString(ent)));
+        _chat.SendAdminAlert(str);
         Log.Info(str);
         return str;
     }
@@ -61,7 +64,7 @@ public sealed class EventManagerSystem : EntitySystem
     /// Pick a random event from the available events at this time, also considering their weightings.
     /// </summary>
     /// <returns></returns>
-    private string? FindEvent(Dictionary<EntityPrototype, StationEventComponent> availableEvents)
+    public string? FindEvent(Dictionary<EntityPrototype, StationEventComponent> availableEvents)
     {
         if (availableEvents.Count == 0)
         {
@@ -95,16 +98,20 @@ public sealed class EventManagerSystem : EntitySystem
     /// <summary>
     /// Gets the events that have met their player count, time-until start, etc.
     /// </summary>
-    /// <param name="ignoreEarliestStart"></param>
+    /// <param name="playerCountOverride">Override for player count, if using this to simulate events rather than in an actual round.</param>
+    /// <param name="currentTimeOverride">Override for round time, if using this to simulate events rather than in an actual round.</param>
     /// <returns></returns>
-    private Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(bool ignoreEarliestStart = false)
+    public Dictionary<EntityPrototype, StationEventComponent> AvailableEvents(
+        bool ignoreEarliestStart = false,
+        int? playerCountOverride = null,
+        TimeSpan? currentTimeOverride = null)
     {
-        var playerCount = _playerManager.PlayerCount;
+        var playerCount = playerCountOverride ?? _playerManager.PlayerCount;
 
         // playerCount does a lock so we'll just keep the variable here
-        var currentTime = !ignoreEarliestStart
+        var currentTime = currentTimeOverride ?? (!ignoreEarliestStart
             ? GameTicker.RoundDuration()
-            : TimeSpan.Zero;
+            : TimeSpan.Zero);
 
         var result = new Dictionary<EntityPrototype, StationEventComponent>();
 
@@ -112,7 +119,6 @@ public sealed class EventManagerSystem : EntitySystem
         {
             if (CanRun(proto, stationEvent, playerCount, currentTime))
             {
-                Log.Debug($"Adding event {proto.ID} to possibilities");
                 result.Add(proto, stationEvent);
             }
         }
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index b917dd692d..b989b8d4b6 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -52,7 +52,8 @@ namespace Content.Shared.Alert
         SuitPower,
         BorgHealth,
         BorgCrit,
-        BorgDead
+        BorgDead,
+        Deflecting
     }
 
 }
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index e74c146380..fdb2f550f9 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -11,10 +11,13 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Text;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
+using Robust.Shared.Map;
+using Robust.Shared.Network;
 using Dependency = Robust.Shared.IoC.DependencyAttribute;
 
 namespace Content.Shared.Chemistry.EntitySystems;
@@ -58,6 +61,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     [Dependency] protected readonly SharedHandsSystem Hands = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
     [Dependency] protected readonly MetaDataSystem MetaData = default!;
+    [Dependency] protected readonly INetManager NetManager = default!;
 
     public override void Initialize()
     {
@@ -66,13 +70,18 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         InitializeRelays();
 
         SubscribeLocalEvent<SolutionComponent, ComponentInit>(OnComponentInit);
-        SubscribeLocalEvent<SolutionComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<SolutionComponent, ComponentShutdown>(OnComponentShutdown);
-
-        SubscribeLocalEvent<SolutionContainerManagerComponent, ComponentInit>(OnComponentInit);
-
+        SubscribeLocalEvent<SolutionComponent, ComponentStartup>(OnSolutionStartup);
+        SubscribeLocalEvent<SolutionComponent, ComponentShutdown>(OnSolutionShutdown);
+        SubscribeLocalEvent<SolutionContainerManagerComponent, ComponentInit>(OnContainerManagerInit);
         SubscribeLocalEvent<ExaminableSolutionComponent, ExaminedEvent>(OnExamineSolution);
         SubscribeLocalEvent<ExaminableSolutionComponent, GetVerbsEvent<ExamineVerb>>(OnSolutionExaminableVerb);
+        SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnMapInit);
+
+        if (NetManager.IsServer)
+        {
+            SubscribeLocalEvent<SolutionContainerManagerComponent, ComponentShutdown>(OnContainerManagerShutdown);
+            SubscribeLocalEvent<ContainedSolutionComponent, ComponentShutdown>(OnContainedSolutionShutdown);
+        }
     }
 
 
@@ -121,8 +130,14 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <param name="name">The name of the solution entity to fetch.</param>
     /// <param name="entity">Returns the solution entity that was fetched.</param>
     /// <param name="solution">Returns the solution state of the solution entity that was fetched.</param>
+    /// /// <param name="errorOnMissing">Should we print an error if the solution specified by name is missing</param>
     /// <returns></returns>
-    public bool TryGetSolution(Entity<SolutionContainerManagerComponent?> container, string? name, [NotNullWhen(true)] out Entity<SolutionComponent>? entity, [NotNullWhen(true)] out Solution? solution)
+    public bool TryGetSolution(
+        Entity<SolutionContainerManagerComponent?> container,
+        string? name,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? entity,
+        [NotNullWhen(true)] out Solution? solution,
+        bool errorOnMissing = false)
     {
         if (!TryGetSolution(container, name, out entity))
         {
@@ -135,7 +150,11 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     }
 
     /// <inheritdoc cref="TryGetSolution"/>
-    public bool TryGetSolution(Entity<SolutionContainerManagerComponent?> container, string? name, [NotNullWhen(true)] out Entity<SolutionComponent>? entity)
+    public bool TryGetSolution(
+        Entity<SolutionContainerManagerComponent?> container,
+        string? name,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? entity,
+        bool errorOnMissing = false)
     {
         if (TryComp(container, out BlockSolutionAccessComponent? blocker))
         {
@@ -155,12 +174,18 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         else
         {
             entity = null;
+            if (!errorOnMissing)
+                return false;
+            Log.Error($"{ToPrettyString(container)} does not have a solution with ID: {name}");
             return false;
         }
 
         if (!TryComp(uid, out SolutionComponent? comp))
         {
             entity = null;
+            if (!errorOnMissing)
+                return false;
+            Log.Error($"{ToPrettyString(container)} does not have a solution with ID: {name}");
             return false;
         }
 
@@ -171,13 +196,18 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     /// <summary>
     /// Version of TryGetSolution that doesn't take or return an entity.
     /// Used for prototypes and with old code parity.
-    public bool TryGetSolution(SolutionContainerManagerComponent container, string name, [NotNullWhen(true)] out Solution? solution)
+    public bool TryGetSolution(SolutionContainerManagerComponent container,
+        string name,
+        [NotNullWhen(true)] out Solution? solution,
+        bool errorOnMissing = false)
     {
         solution = null;
-        if (container.Solutions == null)
+        if (container.Solutions != null)
+            return container.Solutions.TryGetValue(name, out solution);
+        if (!errorOnMissing)
             return false;
-
-        return container.Solutions.TryGetValue(name, out solution);
+        Log.Error($"{container} does not have a solution with ID: {name}");
+        return false;
     }
 
     public IEnumerable<(string? Name, Entity<SolutionComponent> Solution)> EnumerateSolutions(Entity<SolutionContainerManagerComponent?> container, bool includeSelf = true)
@@ -703,17 +733,17 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         entity.Comp.Solution.ValidateSolution();
     }
 
-    private void OnComponentStartup(Entity<SolutionComponent> entity, ref ComponentStartup args)
+    private void OnSolutionStartup(Entity<SolutionComponent> entity, ref ComponentStartup args)
     {
         UpdateChemicals(entity);
     }
 
-    private void OnComponentShutdown(Entity<SolutionComponent> entity, ref ComponentShutdown args)
+    private void OnSolutionShutdown(Entity<SolutionComponent> entity, ref ComponentShutdown args)
     {
         RemoveAllSolution(entity);
     }
 
-    private void OnComponentInit(Entity<SolutionContainerManagerComponent> entity, ref ComponentInit args)
+    private void OnContainerManagerInit(Entity<SolutionContainerManagerComponent> entity, ref ComponentInit args)
     {
         if (entity.Comp.Containers is not { Count: > 0 } containers)
             return;
@@ -733,7 +763,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
             return;
         }
 
-        if (!CanSeeHiddenSolution(entity,args.Examiner))
+        if (!CanSeeHiddenSolution(entity, args.Examiner))
             return;
 
         var primaryReagent = solution.GetPrimaryReagentId();
@@ -832,7 +862,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
             return;
         }
 
-        if (!CanSeeHiddenSolution(entity,args.User))
+        if (!CanSeeHiddenSolution(entity, args.User))
             return;
 
         var target = args.Target;
@@ -881,6 +911,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
                 , ("amount", quantity)));
         }
 
+        msg.PushNewline();
+        msg.AddMarkup(Loc.GetString("scannable-solution-temperature", ("temperature", Math.Round(solution.Temperature))));
+
         return msg;
     }
 
@@ -901,5 +934,273 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         return true;
     }
 
+    private void OnMapInit(Entity<SolutionContainerManagerComponent> entity, ref MapInitEvent args)
+    {
+        EnsureAllSolutions(entity);
+    }
+
+    private void OnContainerManagerShutdown(Entity<SolutionContainerManagerComponent> entity, ref ComponentShutdown args)
+    {
+        foreach (var name in entity.Comp.Containers)
+        {
+            if (ContainerSystem.TryGetContainer(entity, $"solution@{name}", out var solutionContainer))
+                ContainerSystem.ShutdownContainer(solutionContainer);
+        }
+        entity.Comp.Containers.Clear();
+    }
+
+    private void OnContainedSolutionShutdown(Entity<ContainedSolutionComponent> entity, ref ComponentShutdown args)
+    {
+        if (TryComp(entity.Comp.Container, out SolutionContainerManagerComponent? container))
+        {
+            container.Containers.Remove(entity.Comp.ContainerName);
+            Dirty(entity.Comp.Container, container);
+        }
+
+        if (ContainerSystem.TryGetContainer(entity, $"solution@{entity.Comp.ContainerName}", out var solutionContainer))
+            ContainerSystem.ShutdownContainer(solutionContainer);
+    }
+
     #endregion Event Handlers
+
+    public bool EnsureSolution(
+        Entity<MetaDataComponent?> entity,
+        string name,
+        [NotNullWhen(true)]out Solution? solution,
+        FixedPoint2 maxVol = default)
+    {
+        return EnsureSolution(entity, name, maxVol, null, out _, out solution);
+    }
+
+    public bool EnsureSolution(
+        Entity<MetaDataComponent?> entity,
+        string name,
+        out bool existed,
+        [NotNullWhen(true)]out Solution? solution,
+        FixedPoint2 maxVol = default)
+    {
+        return EnsureSolution(entity, name, maxVol, null, out existed, out solution);
+    }
+
+    public bool EnsureSolution(
+        Entity<MetaDataComponent?> entity,
+        string name,
+        FixedPoint2 maxVol,
+        Solution? prototype,
+        out bool existed,
+        [NotNullWhen(true)] out Solution? solution)
+    {
+        solution = null;
+        existed = false;
+
+        var (uid, meta) = entity;
+        if (!Resolve(uid, ref meta))
+            throw new InvalidOperationException("Attempted to ensure solution on invalid entity.");
+        var manager = EnsureComp<SolutionContainerManagerComponent>(uid);
+        if (meta.EntityLifeStage >= EntityLifeStage.MapInitialized)
+        {
+            EnsureSolutionEntity((uid, manager), name, out existed,
+                out var solEnt, maxVol, prototype);
+            solution = solEnt!.Value.Comp.Solution;
+            return true;
+        }
+        solution = EnsureSolutionPrototype((uid, manager), name, maxVol, prototype, out existed);
+        return true;
+    }
+
+    public void EnsureAllSolutions(Entity<SolutionContainerManagerComponent> entity)
+    {
+        if (NetManager.IsClient)
+            return;
+
+        if (entity.Comp.Solutions is not { } prototypes)
+            return;
+
+        foreach (var (name, prototype) in prototypes)
+        {
+            EnsureSolutionEntity((entity.Owner, entity.Comp), name, out _, out _, prototype.MaxVolume, prototype);
+        }
+
+        entity.Comp.Solutions = null;
+        Dirty(entity);
+    }
+
+    public bool EnsureSolutionEntity(
+        Entity<SolutionContainerManagerComponent?> entity,
+        string name,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solutionEntity,
+        FixedPoint2 maxVol = default) =>
+        EnsureSolutionEntity(entity, name, out _, out solutionEntity, maxVol);
+
+    public bool EnsureSolutionEntity(
+        Entity<SolutionContainerManagerComponent?> entity,
+        string name,
+        out bool existed,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solutionEntity,
+        FixedPoint2 maxVol = default,
+        Solution? prototype = null
+        )
+    {
+        existed = true;
+        solutionEntity = null;
+
+        var (uid, container) = entity;
+
+        var solutionSlot = ContainerSystem.EnsureContainer<ContainerSlot>(uid, $"solution@{name}", out existed);
+        if (!Resolve(uid, ref container, logMissing: false))
+        {
+            existed = false;
+            container = AddComp<SolutionContainerManagerComponent>(uid);
+            container.Containers.Add(name);
+            if (NetManager.IsClient)
+                return false;
+        }
+        else if (!existed)
+        {
+            container.Containers.Add(name);
+            Dirty(uid, container);
+        }
+
+        var needsInit = false;
+        SolutionComponent solutionComp;
+        if (solutionSlot.ContainedEntity is not { } solutionId)
+        {
+            if (NetManager.IsClient)
+                return false;
+            prototype ??= new() { MaxVolume = maxVol };
+            prototype.Name = name;
+            (solutionId, solutionComp, _) = SpawnSolutionUninitialized(solutionSlot, name, maxVol, prototype);
+            existed = false;
+            needsInit = true;
+            Dirty(uid, container);
+        }
+        else
+        {
+            solutionComp = Comp<SolutionComponent>(solutionId);
+            DebugTools.Assert(TryComp(solutionId, out ContainedSolutionComponent? relation) && relation.Container == uid && relation.ContainerName == name);
+            DebugTools.Assert(solutionComp.Solution.Name == name);
+
+            var solution = solutionComp.Solution;
+            solution.MaxVolume = FixedPoint2.Max(solution.MaxVolume, maxVol);
+
+            // Depending on MapInitEvent order some systems can ensure solution empty solutions and conflict with the prototype solutions.
+            // We want the reagents from the prototype to exist even if something else already created the solution.
+            if (prototype is { Volume.Value: > 0 })
+                solution.AddSolution(prototype, PrototypeManager);
+
+            Dirty(solutionId, solutionComp);
+        }
+
+        if (needsInit)
+            EntityManager.InitializeAndStartEntity(solutionId, Transform(solutionId).MapID);
+        solutionEntity = (solutionId, solutionComp);
+        return true;
+    }
+
+    private Solution EnsureSolutionPrototype(Entity<SolutionContainerManagerComponent?> entity, string name, FixedPoint2 maxVol, Solution? prototype, out bool existed)
+    {
+        existed = true;
+
+        var (uid, container) = entity;
+        if (!Resolve(uid, ref container, logMissing: false))
+        {
+            container = AddComp<SolutionContainerManagerComponent>(uid);
+            existed = false;
+        }
+
+        if (container.Solutions is null)
+            container.Solutions = new(SolutionContainerManagerComponent.DefaultCapacity);
+
+        if (!container.Solutions.TryGetValue(name, out var solution))
+        {
+            solution = prototype ?? new() { Name = name, MaxVolume = maxVol };
+            container.Solutions.Add(name, solution);
+            existed = false;
+        }
+        else
+            solution.MaxVolume = FixedPoint2.Max(solution.MaxVolume, maxVol);
+
+        Dirty(uid, container);
+        return solution;
+    }
+    
+    private Entity<SolutionComponent, ContainedSolutionComponent> SpawnSolutionUninitialized(ContainerSlot container, string name, FixedPoint2 maxVol, Solution prototype)
+    {
+        var coords = new EntityCoordinates(container.Owner, Vector2.Zero);
+        var uid = EntityManager.CreateEntityUninitialized(null, coords, null);
+
+        var solution = new SolutionComponent() { Solution = prototype };
+        AddComp(uid, solution);
+
+        var relation = new ContainedSolutionComponent() { Container = container.Owner, ContainerName = name };
+        AddComp(uid, relation);
+
+        MetaData.SetEntityName(uid, $"solution - {name}");
+        ContainerSystem.Insert(uid, container, force: true);
+
+        return (uid, solution, relation);
+    }
+
+    public void AdjustDissolvedReagent(
+        Entity<SolutionComponent> dissolvedSolution,
+        FixedPoint2 volume,
+        ReagentId reagent,
+        float concentrationChange)
+    {
+        if (concentrationChange == 0)
+            return;
+        var dissolvedSol = dissolvedSolution.Comp.Solution;
+        var amtChange =
+            GetReagentQuantityFromConcentration(dissolvedSolution, volume, MathF.Abs(concentrationChange));
+        if (concentrationChange > 0)
+        {
+            dissolvedSol.AddReagent(reagent, amtChange);
+        }
+        else
+        {
+            dissolvedSol.RemoveReagent(reagent,amtChange);
+        }
+        UpdateChemicals(dissolvedSolution);
+    }
+
+    public FixedPoint2 GetReagentQuantityFromConcentration(Entity<SolutionComponent> dissolvedSolution,
+        FixedPoint2 volume,float concentration)
+    {
+        var dissolvedSol = dissolvedSolution.Comp.Solution;
+        if (volume == 0
+            || dissolvedSol.Volume == 0)
+            return 0;
+        return concentration * volume;
+    }
+
+    public float GetReagentConcentration(Entity<SolutionComponent> dissolvedSolution,
+        FixedPoint2 volume, ReagentId dissolvedReagent)
+    {
+        var dissolvedSol = dissolvedSolution.Comp.Solution;
+        if (volume == 0
+            || dissolvedSol.Volume == 0
+            || !dissolvedSol.TryGetReagentQuantity(dissolvedReagent, out var dissolvedVol))
+            return 0;
+        return (float)dissolvedVol / volume.Float();
+    }
+
+    public FixedPoint2 ClampReagentAmountByConcentration(
+        Entity<SolutionComponent> dissolvedSolution,
+        FixedPoint2 volume,
+        ReagentId dissolvedReagent,
+        FixedPoint2 dissolvedReagentAmount,
+        float maxConcentration = 1f)
+    {
+        var dissolvedSol = dissolvedSolution.Comp.Solution;
+        if (volume == 0
+            || dissolvedSol.Volume == 0
+            || !dissolvedSol.TryGetReagentQuantity(dissolvedReagent, out var dissolvedVol))
+            return 0;
+        volume *= maxConcentration;
+        dissolvedVol += dissolvedReagentAmount;
+        var overflow = volume - dissolvedVol;
+        if (overflow < 0)
+            dissolvedReagentAmount += overflow;
+        return dissolvedReagentAmount;
+    }
 }
diff --git a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
index 8fbb931ca9..b7457538eb 100644
--- a/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
@@ -12,6 +12,21 @@ namespace Content.Shared.Ghost.Roles
         public string Description { get; set; }
         public string Rules { get; set; }
         public HashSet<JobRequirement>? Requirements { get; set; }
+
+        /// <inheritdoc cref="GhostRoleKind"/>
+        public GhostRoleKind Kind { get; set; }
+
+        /// <summary>
+        /// if <see cref="Kind"/> is <see cref="GhostRoleKind.RaffleInProgress"/>, specifies how many players are currently
+        /// in the raffle for this role.
+        /// </summary>
+        public uint RafflePlayerCount { get; set; }
+
+        /// <summary>
+        /// if <see cref="Kind"/> is <see cref="GhostRoleKind.RaffleInProgress"/>, specifies when raffle finishes.
+        /// </summary>
+        public TimeSpan RaffleEndTime { get; set; }
+
     }
 
     [NetSerializable, Serializable]
@@ -26,24 +41,62 @@ namespace Content.Shared.Ghost.Roles
     }
 
     [NetSerializable, Serializable]
-    public sealed class GhostRoleTakeoverRequestMessage : EuiMessageBase
+    public sealed class RequestGhostRoleMessage : EuiMessageBase
     {
         public uint Identifier { get; }
 
-        public GhostRoleTakeoverRequestMessage(uint identifier)
+        public RequestGhostRoleMessage(uint identifier)
         {
             Identifier = identifier;
         }
     }
 
     [NetSerializable, Serializable]
-    public sealed class GhostRoleFollowRequestMessage : EuiMessageBase
+    public sealed class FollowGhostRoleMessage : EuiMessageBase
     {
         public uint Identifier { get; }
 
-        public GhostRoleFollowRequestMessage(uint identifier)
+        public FollowGhostRoleMessage(uint identifier)
         {
             Identifier = identifier;
         }
     }
+
+    [NetSerializable, Serializable]
+    public sealed class LeaveGhostRoleRaffleMessage : EuiMessageBase
+    {
+        public uint Identifier { get; }
+
+        public LeaveGhostRoleRaffleMessage(uint identifier)
+        {
+            Identifier = identifier;
+        }
+    }
+
+    /// <summary>
+    /// Determines whether a ghost role is a raffle role, and if it is, whether it's running.
+    /// </summary>
+    [NetSerializable, Serializable]
+    public enum GhostRoleKind
+    {
+        /// <summary>
+        /// Role is not a raffle role and can be taken immediately.
+        /// </summary>
+        FirstComeFirstServe,
+
+        /// <summary>
+        /// Role is a raffle role, but raffle hasn't started yet.
+        /// </summary>
+        RaffleReady,
+
+        /// <summary>
+        ///  Role is raffle role and currently being raffled, but player hasn't joined raffle.
+        /// </summary>
+        RaffleInProgress,
+
+        /// <summary>
+        /// Role is raffle role and currently being raffled, and player joined raffle.
+        /// </summary>
+        RaffleJoined
+    }
 }
diff --git a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs
new file mode 100644
index 0000000000..a7aa757b72
--- /dev/null
+++ b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettings.cs
@@ -0,0 +1,30 @@
+namespace Content.Server.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Defines settings for a ghost role raffle.
+/// </summary>
+[DataDefinition]
+public sealed partial class GhostRoleRaffleSettings
+{
+    /// <summary>
+    /// The initial duration of a raffle in seconds. This is the countdown timer's value when the raffle starts.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public uint InitialDuration { get; set; }
+
+    /// <summary>
+    /// When the raffle is joined by a player, the countdown timer is extended by this value in seconds.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public uint JoinExtendsDurationBy { get; set; }
+
+    /// <summary>
+    /// The maximum duration in seconds for the ghost role raffle. A raffle cannot run for longer than this
+    /// duration, even if extended by joiners. Must be greater than or equal to <see cref="InitialDuration"/>.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)]
+    [DataField(required: true)]
+    public uint MaxDuration { get; set; }
+}
diff --git a/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs
new file mode 100644
index 0000000000..f1447a0e09
--- /dev/null
+++ b/Content.Shared/Ghost/Roles/Raffles/GhostRoleRaffleSettingsPrototype.cs
@@ -0,0 +1,22 @@
+using Content.Server.Ghost.Roles.Raffles;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Ghost.Roles.Raffles;
+
+/// <summary>
+/// Allows specifying the settings for a ghost role raffle as a prototype.
+/// </summary>
+[Prototype("ghostRoleRaffleSettings")]
+public sealed class GhostRoleRaffleSettingsPrototype : IPrototype
+{
+    /// <inheritdoc />
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
+    /// <summary>
+    /// The settings for a ghost role raffle.
+    /// </summary>
+    /// <seealso cref="GhostRoleRaffleSettings"/>
+    [DataField(required: true)]
+    public GhostRoleRaffleSettings Settings { get; private set; } = new();
+}
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 3c265d5a02..81b2fee569 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -13,6 +13,7 @@ using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Pulling.Events;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Pulling.Events;
+using Content.Shared.Standing;
 using Content.Shared.Throwing;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
@@ -62,6 +63,7 @@ public sealed class PullingSystem : EntitySystem
         SubscribeLocalEvent<PullerComponent, EntityUnpausedEvent>(OnPullerUnpaused);
         SubscribeLocalEvent<PullerComponent, VirtualItemDeletedEvent>(OnVirtualItemDeleted);
         SubscribeLocalEvent<PullerComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
+        SubscribeLocalEvent<PullerComponent, DropHandItemsEvent>(OnDropHandItems);
 
         CommandBinds.Builder
             .Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
@@ -69,6 +71,17 @@ public sealed class PullingSystem : EntitySystem
             .Register<PullingSystem>();
     }
 
+    private void OnDropHandItems(EntityUid uid, PullerComponent pullerComp, DropHandItemsEvent args)
+    {
+        if (pullerComp.Pulling == null || pullerComp.NeedsHands)
+            return;
+
+        if (!TryComp(pullerComp.Pulling, out PullableComponent? pullableComp))
+            return;
+
+        TryStopPull(pullerComp.Pulling.Value, pullableComp, uid);
+    }
+
     private void OnPullerContainerInsert(Entity<PullerComponent> ent, ref EntGotInsertedIntoContainerMessage args)
     {
         if (ent.Comp.Pulling == null) return;
diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index dcdc9d61d9..20e57e9421 100644
--- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -57,7 +57,8 @@ namespace Content.Shared.Random.Helpers
             throw new InvalidOperationException($"Invalid weighted pick for {prototype.ID}!");
         }
 
-        public static string Pick(this IRobustRandom random, Dictionary<string, float> weights)
+        public static T Pick<T>(this IRobustRandom random, Dictionary<T, float> weights)
+            where T: notnull
         {
             var sum = weights.Values.Sum();
             var accumulated = 0f;
@@ -74,7 +75,7 @@ namespace Content.Shared.Random.Helpers
                 }
             }
 
-            throw new InvalidOperationException($"Invalid weighted pick");
+            throw new InvalidOperationException("Invalid weighted pick");
         }
 
         public static (string reagent, FixedPoint2 quantity) Pick(this WeightedRandomFillSolutionPrototype prototype, IRobustRandom? random = null)
diff --git a/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs b/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs
new file mode 100644
index 0000000000..d233cad2a0
--- /dev/null
+++ b/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.ReagentSpeed;
+
+/// <summary>
+/// Makes a device work faster by consuming reagents on each use.
+/// Other systems must use <see cref="ReagentSpeedSystem.ApplySpeed"/> for this to do anything.
+/// </summary>
+[RegisterComponent, Access(typeof(ReagentSpeedSystem))]
+public sealed partial class ReagentSpeedComponent : Component
+{
+    /// <summary>
+    /// Solution that will be checked.
+    /// Anything that isn't in <c>Modifiers</c> is left alone.
+    /// </summary>
+    [DataField(required: true)]
+    public string Solution = string.Empty;
+
+    /// <summary>
+    /// How much reagent from the solution to use up for each use.
+    /// This is per-modifier-reagent and not shared between them.
+    /// </summary>
+    [DataField]
+    public FixedPoint2 Cost = 5;
+
+    /// <summary>
+    /// Reagents and how much they modify speed at full purity.
+    /// Small number means faster large number means slower.
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<ProtoId<ReagentPrototype>, float> Modifiers = new();
+}
diff --git a/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs
new file mode 100644
index 0000000000..8561c7b12a
--- /dev/null
+++ b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Shared.ReagentSpeed;
+
+public sealed class ReagentSpeedSystem : EntitySystem
+{
+    [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+
+    /// <summary>
+    /// Consumes reagents and modifies the duration.
+    /// This can be production time firing delay etc.
+    /// </summary>
+    public TimeSpan ApplySpeed(Entity<ReagentSpeedComponent?> ent, TimeSpan time)
+    {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return time;
+
+        if (!_solution.TryGetSolution(ent.Owner, ent.Comp.Solution, out _, out var solution))
+            return time;
+
+        foreach (var (reagent, fullModifier) in ent.Comp.Modifiers)
+        {
+            var used = solution.RemoveReagent(reagent, ent.Comp.Cost);
+            var efficiency = (used / ent.Comp.Cost).Float();
+            // scale the speed modifier so microdosing has less effect
+            var reduction = (1f - fullModifier) * efficiency;
+            var modifier = 1f - reduction;
+            time *= modifier;
+        }
+
+        return time;
+    }
+}
diff --git a/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
new file mode 100644
index 0000000000..112339efd7
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+/// <summary>
+/// Lets you shoot a gun using an action.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(ActionGunSystem))]
+public sealed partial class ActionGunComponent : Component
+{
+    /// <summary>
+    /// Action to create, must use <see cref="ActionGunShootEvent"/>.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId Action = string.Empty;
+
+    [DataField]
+    public EntityUid? ActionEntity;
+
+    /// <summary>
+    /// Prototype of gun entity to spawn.
+    /// Deleted when this component is removed.
+    /// </summary>
+    [DataField(required: true)]
+    public EntProtoId GunProto = string.Empty;
+
+    [DataField]
+    public EntityUid? Gun;
+}
+
+/// <summary>
+/// Action event for <see cref="ActionGunComponent"/> to shoot at a position.
+/// </summary>
+public sealed partial class ActionGunShootEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
new file mode 100644
index 0000000000..f3dfe8a2a0
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Systems;
+
+public sealed class ActionGunSystem : EntitySystem
+{
+    [Dependency] private readonly SharedActionsSystem _actions = default!;
+    [Dependency] private readonly SharedGunSystem _gun = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<ActionGunComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<ActionGunComponent, ComponentShutdown>(OnShutdown);
+        SubscribeLocalEvent<ActionGunComponent, ActionGunShootEvent>(OnShoot);
+    }
+
+    private void OnMapInit(Entity<ActionGunComponent> ent, ref MapInitEvent args)
+    {
+        if (string.IsNullOrEmpty(ent.Comp.Action))
+            return;
+
+        _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action);
+        ent.Comp.Gun = Spawn(ent.Comp.GunProto);
+    }
+
+    private void OnShutdown(Entity<ActionGunComponent> ent, ref ComponentShutdown args)
+    {
+        if (ent.Comp.Gun is {} gun)
+            QueueDel(gun);
+    }
+
+    private void OnShoot(Entity<ActionGunComponent> ent, ref ActionGunShootEvent args)
+    {
+        if (TryComp<GunComponent>(ent.Comp.Gun, out var gun))
+            _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target);
+    }
+}
+
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 8e7b8975d9..5d8432ac77 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -21,17 +21,42 @@ public sealed partial class ReflectComponent : Component
     [ViewVariables(VVAccess.ReadWrite), DataField("reflects")]
     public ReflectType Reflects = ReflectType.Energy | ReflectType.NonEnergy;
 
-    /// <summary>
-    /// Probability for a projectile to be reflected.
-    /// </summary>
-    [DataField("reflectProb"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
-    public float ReflectProb = 0.25f;
-
     [DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
     public Angle Spread = Angle.FromDegrees(45);
 
     [DataField("soundOnReflect")]
     public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
+
+    /// <summary>
+    /// Is the deflection an innate power or something actively maintained? If true, this component grants a flat
+    /// deflection chance rather than a chance that degrades when moving/weightless/stunned/etc.
+    /// </summary>
+    [DataField]
+    public bool Innate = false;
+
+    /// <summary>
+    /// Maximum probability for a projectile to be reflected.
+    /// </summary>
+    [DataField("reflectProb"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+    public float ReflectProb = 0.25f;
+
+    /// <summary>
+    /// The maximum velocity a wielder can move at before losing effectiveness.
+    /// </summary>
+    [DataField]
+    public float VelocityBeforeNotMaxProb = 2.5f; // Walking speed for a human. Suitable for a weightless deflector like an e-sword.
+
+    /// <summary>
+    /// The velocity a wielder has to be moving at to use the minimum effectiveness value.
+    /// </summary>
+    [DataField]
+    public float VelocityBeforeMinProb = 4.5f; // Sprinting speed for a human. Suitable for a weightless deflector like an e-sword.
+
+    /// <summary>
+    /// Minimum probability for a projectile to be reflected.
+    /// </summary>
+    [DataField]
+    public float MinReflectProb = 0.1f;
 }
 
 [Flags]
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 014b3cfe1f..36dbedb4cb 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -1,17 +1,20 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Numerics;
 using Content.Shared.Administration.Logs;
+using Content.Shared.Alert;
 using Content.Shared.Audio;
+using Content.Shared.Damage.Components;
 using Content.Shared.Database;
+using Content.Shared.Gravity;
 using Content.Shared.Hands;
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Item.ItemToggle.Components;
 using Content.Shared.Popups;
 using Content.Shared.Projectiles;
+using Content.Shared.Standing;
 using Content.Shared.Weapons.Ranged.Components;
 using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
@@ -35,6 +38,9 @@ public sealed class ReflectSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly InventorySystem _inventorySystem = default!;
+    [Dependency] private readonly SharedGravitySystem _gravity = default!;
+    [Dependency] private readonly StandingStateSystem _standing = default!;
+    [Dependency] private readonly AlertsSystem _alerts = default!;
 
     public override void Initialize()
     {
@@ -91,15 +97,20 @@ public sealed class ReflectSystem : EntitySystem
 
     private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
     {
-        if (!Resolve(reflector, ref reflect, false) ||
+        // Do we have the components needed to try a reflect at all?
+        if (
+            !Resolve(reflector, ref reflect, false) ||
             !reflect.Enabled ||
             !TryComp<ReflectiveComponent>(projectile, out var reflective) ||
             (reflect.Reflects & reflective.Reflective) == 0x0 ||
-            !_random.Prob(reflect.ReflectProb) ||
-            !TryComp<PhysicsComponent>(projectile, out var physics))
-        {
+            !TryComp<PhysicsComponent>(projectile, out var physics) ||
+            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
+            _standing.IsDown(reflector)
+        )
+            return false;
+
+        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
             return false;
-        }
 
         var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
         var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
@@ -137,6 +148,34 @@ public sealed class ReflectSystem : EntitySystem
         return true;
     }
 
+    private float CalcReflectChance(EntityUid reflector, ReflectComponent reflect)
+    {
+        /*
+         *  The rules of deflection are as follows:
+         *  If you innately reflect things via magic, biology etc., you always have a full chance.
+         *  If you are standing up and standing still, you're prepared to deflect and have full chance.
+         *  If you have velocity, your deflection chance depends on your velocity, clamped.
+         *  If you are floating, your chance is the minimum value possible.
+         *  You cannot deflect if you are knocked down or stunned.
+         */
+
+        if (reflect.Innate)
+            return reflect.ReflectProb;
+
+        if (_gravity.IsWeightless(reflector))
+            return reflect.MinReflectProb;
+
+        if (!TryComp<PhysicsComponent>(reflector, out var reflectorPhysics))
+            return reflect.ReflectProb;
+
+        return MathHelper.Lerp(
+            reflect.MinReflectProb,
+            reflect.ReflectProb,
+            // Inverse progression between velocities fed in as progression between probabilities. We go high -> low so the output here needs to be _inverted_.
+            1 - Math.Clamp((reflectorPhysics.LinearVelocity.Length() - reflect.VelocityBeforeNotMaxProb) / (reflect.VelocityBeforeMinProb - reflect.VelocityBeforeNotMaxProb), 0, 1)
+        );
+    }
+
     private void OnReflectHitscan(EntityUid uid, ReflectComponent component, ref HitScanReflectAttemptEvent args)
     {
         if (args.Reflected ||
@@ -162,7 +201,14 @@ public sealed class ReflectSystem : EntitySystem
     {
         if (!TryComp<ReflectComponent>(reflector, out var reflect) ||
             !reflect.Enabled ||
-            !_random.Prob(reflect.ReflectProb))
+            TryComp<StaminaComponent>(reflector, out var staminaComponent) && staminaComponent.Critical ||
+            _standing.IsDown(reflector))
+        {
+            newDirection = null;
+            return false;
+        }
+
+        if (!_random.Prob(CalcReflectChance(reflector, reflect)))
         {
             newDirection = null;
             return false;
@@ -191,6 +237,9 @@ public sealed class ReflectSystem : EntitySystem
             return;
 
         EnsureComp<ReflectUserComponent>(args.Equipee);
+
+        if (component.Enabled)
+            EnableAlert(args.Equipee);
     }
 
     private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args)
@@ -204,6 +253,9 @@ public sealed class ReflectSystem : EntitySystem
             return;
 
         EnsureComp<ReflectUserComponent>(args.User);
+
+        if (component.Enabled)
+            EnableAlert(args.User);
     }
 
     private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component, GotUnequippedHandEvent args)
@@ -215,6 +267,11 @@ public sealed class ReflectSystem : EntitySystem
     {
         comp.Enabled = args.Activated;
         Dirty(uid, comp);
+
+        if (comp.Enabled)
+            EnableAlert(uid);
+        else
+            DisableAlert(uid);
     }
 
     /// <summary>
@@ -228,9 +285,22 @@ public sealed class ReflectSystem : EntitySystem
                 continue;
 
             EnsureComp<ReflectUserComponent>(user);
+            EnableAlert(user);
+
             return;
         }
 
         RemCompDeferred<ReflectUserComponent>(user);
+        DisableAlert(user);
+    }
+
+    private void EnableAlert(EntityUid alertee)
+    {
+        _alerts.ShowAlert(alertee, AlertType.Deflecting);
+    }
+
+    private void DisableAlert(EntityUid alertee)
+    {
+        _alerts.ClearAlert(alertee, AlertType.Deflecting);
     }
 }
diff --git a/Resources/Audio/Expedition/attributions.yml b/Resources/Audio/Expedition/attributions.yml
new file mode 100644
index 0000000000..8bafcc6f11
--- /dev/null
+++ b/Resources/Audio/Expedition/attributions.yml
@@ -0,0 +1,9 @@
+- files: ["tension_session.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Created by qwertyquerty"
+  source: "https://www.youtube.com/@qwertyquerty"
+
+- files: ["deadline.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Bolgarich"
+  source: "https://www.youtube.com/watch?v=q7_NFEeeEac"
diff --git a/Resources/Audio/Expedition/deadline.ogg b/Resources/Audio/Expedition/deadline.ogg
new file mode 100644
index 0000000000..131016d891
Binary files /dev/null and b/Resources/Audio/Expedition/deadline.ogg differ
diff --git a/Resources/Audio/Misc/tension_session.ogg b/Resources/Audio/Expedition/tension_session.ogg
similarity index 100%
rename from Resources/Audio/Misc/tension_session.ogg
rename to Resources/Audio/Expedition/tension_session.ogg
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3c9d0efaa1..87acc64faf 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,237 +1,4 @@
 Entries:
-- author: MACMAN2003
-  changes:
-  - message: You can now make LED light tubes and LED light bulbs at an autolathe.
-    type: Add
-  id: 6028
-  time: '2024-02-26T22:58:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25616
-- author: botanySupremist
-  changes:
-  - message: Fixed a few small typos in ghost role information.
-    type: Fix
-  id: 6029
-  time: '2024-02-26T22:58:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25613
-- author: Whisper
-  changes:
-  - message: Juice that makes you Weh can be found in; anomalies, Artifacts, random
-      puddles.
-    type: Add
-  id: 6030
-  time: '2024-02-26T22:59:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25611
-- author: Hanzdegloker
-  changes:
-  - message: ERT medic PDA now has a health analyzer built in.
-    type: Tweak
-  id: 6031
-  time: '2024-02-26T23:00:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25606
-- author: Ilya246
-  changes:
-  - message: Macrobomb implant price reduced 20->13 TC.
-    type: Tweak
-  id: 6032
-  time: '2024-02-26T23:04:26.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25585
-- author: QuietlyWhisper
-  changes:
-  - message: Handcuff and handcuff replacements are faster to escape. You can allow
-      your teammates to uncuff themselves!
-    type: Tweak
-  id: 6033
-  time: '2024-02-26T23:05:16.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25601
-- author: PoorMansDreams
-  changes:
-  - message: New lobby art (of horror)
-    type: Add
-  id: 6034
-  time: '2024-02-26T23:06:09.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25455
-- author: TheShuEd
-  changes:
-  - message: Carpets can now be printed at the uniform printer.
-    type: Add
-  - message: Carpets can be collected from the floor and buthered into fabric.
-    type: Add
-  - message: New white and cyan carpets.
-    type: Add
-  - message: Carpets can now be placed on wooden tables to get beautiful new tables
-      with tablecloths.
-    type: Add
-  id: 6035
-  time: '2024-02-26T23:11:20.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25562
-- author: SlamBamActionman
-  changes:
-  - message: Added new noses for humans and dwarves.
-    type: Add
-  id: 6036
-  time: '2024-02-26T23:15:04.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25557
-- author: MACMAN2003
-  changes:
-  - message: Added a NanoTrasen balloon toy.
-    type: Add
-  id: 6037
-  time: '2024-02-26T23:15:53.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25543
-- author: TheShuEd
-  changes:
-  - message: Added a new T2 industrial technology "Space Scanning"! It includes a
-      mass scanner console board, a Borg GPS module, and a new handheld mass scanner.
-    type: Add
-  - message: GPS borg module now have handheld mass scanner.
-    type: Add
-  id: 6038
-  time: '2024-02-26T23:19:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25526
-- author: Sphiral
-  changes:
-  - message: NT has finally perfected methods for infusing Plasma/Uranium into Glass!
-      Windoors now have such varients! And Uranium Slim Windows exist!
-    type: Add
-  id: 6039
-  time: '2024-02-26T23:25:44.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25501
-- author: Whisper
-  changes:
-  - message: Bleed wounds will no longer heal so fast they do not need to be treated.
-      Please see the medical guidebook.
-    type: Tweak
-  - message: Decreased passive bleed wound clotting by 60% (now 0.33u per 3 seconds).
-    type: Tweak
-  - message: Decreased all bloodloss damage (as a result of bleeding) by 50%.
-    type: Tweak
-  - message: Health analyzers will report if your patient is bleeding.
-    type: Add
-  id: 6040
-  time: '2024-02-26T23:26:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25434
-- author: Velcroboy
-  changes:
-  - message: Tweaked wallmounted objects can not be interacted with through thindows
-      or windoors.
-    type: Tweak
-  - message: Fixed NanoMed vendor not being accessible from all directions.
-    type: Fix
-  id: 6041
-  time: '2024-02-26T23:28:55.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25451
-- author: Lank
-  changes:
-  - message: Diona can no longer split or reform to cure themselves of a zombie infection.
-    type: Fix
-  id: 6042
-  time: '2024-02-26T23:31:37.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25404
-- author: Zadeon
-  changes:
-  - message: Added salt as a new type of ore that can be mined from asteroids. Salt
-      can be ground up for its base components.
-    type: Add
-  id: 6043
-  time: '2024-02-26T23:34:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25324
-- author: juliangiebel
-  changes:
-  - message: The mass media consoles UI got overhauled
-    type: Tweak
-  - message: Added PDA notifications in chat for new news articles. They can be turned
-      off in the news reader program and are only visible to you.
-    type: Add
-  id: 6044
-  time: '2024-02-27T01:38:00.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/19610
-- author: rosieposieeee
-  changes:
-  - message: Added lockable wall buttons and decorative frames for differentiating
-      wall buttons.
-    type: Add
-  id: 6045
-  time: '2024-02-27T07:57:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25631
-- author: metalgearsloth
-  changes:
-  - message: Fix chat bubbles.
-    type: Fix
-  id: 6046
-  time: '2024-02-27T13:01:24.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25643
-- author: rosieposieeee
-  changes:
-  - message: Added grey stalagmites and made all stalagmites weaker and more fun to
-      break.
-    type: Add
-  id: 6047
-  time: '2024-02-27T19:24:17.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25646
-- author: metalgearsloth
-  changes:
-  - message: Made NPC movement less janky.
-    type: Fix
-  id: 6048
-  time: '2024-02-28T06:41:15.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25666
-- author: musicmanvr
-  changes:
-  - message: Added the Syndicate decoy bundle, a creative way to trick your foes.
-    type: Add
-  - message: Snap pops have been added to the toy crate.
-    type: Add
-  - message: Syndicate Commanders now have a trench whistle, Avanti!
-    type: Add
-  id: 6049
-  time: '2024-02-28T21:53:46.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25333
-- author: Whisper
-  changes:
-  - message: Iron and copper no longer grant infinite blood!
-    type: Fix
-  id: 6050
-  time: '2024-02-28T21:56:22.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25678
-- author: Cojoke-dot
-  changes:
-  - message: E-sword now lights plasma fires
-    type: Tweak
-  id: 6051
-  time: '2024-02-28T21:59:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25665
-- author: lzk228
-  changes:
-  - message: Engineering structures orders in cargo now supplied via flatpacks (e.g.
-      tesla & singulo generators, other stuff for them).
-    type: Tweak
-  - message: Thrusters and gyroscopes now supplied in crates via flatpacks.
-    type: Tweak
-  id: 6052
-  time: '2024-02-28T22:02:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25647
-- author: c4llv07e
-  changes:
-  - message: Cryo won't remove you from the new body if you chose a new ghost role
-      before cryo deleted your old body.
-    type: Fix
-  id: 6053
-  time: '2024-02-28T22:09:02.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/24991
-- author: Nairodian
-  changes:
-  - message: You can now remove the rust from reinforced walls with a welder.
-    type: Fix
-  id: 6054
-  time: '2024-02-29T00:44:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25690
-- author: Ubaser
-  changes:
-  - message: Eris UI theme has been removed.
-    type: Remove
-  id: 6055
-  time: '2024-02-29T05:53:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/25673
 - author: Rainfey
   changes:
   - message: Disallow multiple antag roles per player
@@ -3874,3 +3641,213 @@
   id: 6527
   time: '2024-05-04T11:11:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/27618
+- author: Tyzemol
+  changes:
+  - message: Fixed NPCs being able to see and attack you hiding in closed lockers
+      and crates
+    type: Fix
+  id: 6528
+  time: '2024-05-04T19:57:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27677
+- author: Blackern5000
+  changes:
+  - message: Security belts can now hold more items that security commonly uses.
+    type: Tweak
+  id: 6529
+  time: '2024-05-04T20:00:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27674
+- author: Blackern5000
+  changes:
+  - message: Floodlights now use medium power cells instead of small ones.
+    type: Tweak
+  id: 6530
+  time: '2024-05-04T20:06:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27672
+- author: lzk228
+  changes:
+  - message: Grey whistle added to arcade machine prizes.
+    type: Add
+  id: 6531
+  time: '2024-05-05T14:42:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27676
+- author: Killerqu00
+  changes:
+  - message: Welding masks can now be put on utility belts.
+    type: Tweak
+  id: 6532
+  time: '2024-05-05T23:30:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27694
+- author: Dutch-VanDerLinde
+  changes:
+  - message: Chemical analysis goggles now show the scanned solution's temperature.
+    type: Tweak
+  id: 6533
+  time: '2024-05-05T23:32:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27693
+- author: Allen
+  changes:
+  - message: Added new icons for the emote wheel
+    type: Add
+  id: 6534
+  time: '2024-05-06T01:12:30.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27541
+- author: DogZeroX
+  changes:
+  - message: 'Added a new salvage song: Deadline by Bolgarich'
+    type: Add
+  id: 6535
+  time: '2024-05-06T03:51:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27707
+- author: '0x6273'
+  changes:
+  - message: Shuttle docks now have a "dock status" device link port
+    type: Add
+  id: 6536
+  time: '2024-05-06T03:59:01.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27646
+- author: DogZeroX
+  changes:
+  - message: 'Added new lobby art: Just a week away by Fern'
+    type: Add
+  id: 6537
+  time: '2024-05-06T08:17:35.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27717
+- author: mirrorcult
+  changes:
+  - message: Event weights have been tweaked across the board, and some events removed
+      (such as false alarm) to hopefully allow for a more interesting and varied slate
+      of random occurrences per round.
+    type: Add
+  id: 6538
+  time: '2024-05-06T10:10:12.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27721
+- author: mirrorcult
+  changes:
+  - message: Tile weighting for many events and variation rules (messes, dragons,
+      revenants, kudzu, gasleak, rods, etc) has been fixed. They will now no longer
+      spawn disproportionately often on smaller grids.
+    type: Add
+  id: 6539
+  time: '2024-05-06T11:25:11.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27724
+- author: Blackern5000
+  changes:
+  - message: Burn damage is now half as effective at cauterizing wounds as it was
+      previously
+    type: Tweak
+  id: 6540
+  time: '2024-05-06T20:19:57.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27726
+- author: Blackern5000
+  changes:
+  - message: Active lights now deal significantly less burn damage when touched.
+    type: Tweak
+  id: 6541
+  time: '2024-05-06T20:20:19.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27728
+- author: pissdemon
+  changes:
+  - message: Special ghost roles are now raffled, instead of being given out to the
+      first player requesting them.
+    type: Add
+  id: 6542
+  time: '2024-05-07T01:48:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26629
+- author: mirrorcult
+  changes:
+  - message: Less ratkings should spawn during the mouse migration event now
+    type: Tweak
+  id: 6543
+  time: '2024-05-07T03:23:50.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27760
+- author: PJB3005
+  changes:
+  - message: Fixed preferences not loading sometimes if you had a loadout item with
+      playtime requirement selected in a character profile.
+    type: Fix
+  id: 6544
+  time: '2024-05-07T04:21:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27742
+- author: lzk228
+  changes:
+  - message: Morgue now can be anchored and unanchored.
+    type: Tweak
+  - message: Changed morgue's collision layer, so items now can go through it.
+    type: Tweak
+  id: 6545
+  time: '2024-05-07T07:26:33.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27750
+- author: mirrorcult
+  changes:
+  - message: Events that run now get logged to admin alert chat
+    type: Tweak
+  id: 6546
+  time: '2024-05-07T15:13:29.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27761
+- author: cooldolphin
+  changes:
+  - message: Cigarettes in the loadout menu.
+    type: Add
+  id: 6547
+  time: '2024-05-07T15:55:03.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27292
+- author: FairlySadPanda
+  changes:
+  - message: Weapons that deflect shots, like the e-sword, now are most effective
+      at doing so when standing still, with moving or sprinting making the deflection
+      chance worse.
+    type: Tweak
+  id: 6548
+  time: '2024-05-07T18:14:59.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27219
+- author: deltanedas
+  changes:
+  - message: Lathes can now be sped up by using Space Lube.
+    type: Tweak
+  id: 6549
+  time: '2024-05-07T18:20:44.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25515
+- author: OnsenCapy
+  changes:
+  - message: Combat gloves now have their own unique sprite.
+    type: Tweak
+  - message: Combat gloves now have heat resistance to match their fireproof description.
+    type: Tweak
+  id: 6550
+  time: '2024-05-08T00:19:55.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27373
+- author: deltanedas
+  changes:
+  - message: Dragons can now breathe fire.
+    type: Add
+  id: 6551
+  time: '2024-05-08T00:25:41.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26746
+- author: Cojoke-dot
+  changes:
+  - message: You can now shoot over racks
+    type: Tweak
+  id: 6552
+  time: '2024-05-08T06:46:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27797
+- author: ShadowCommander
+  changes:
+  - message: Lizards now stop tail pulling when they are downed.
+    type: Fix
+  id: 6553
+  time: '2024-05-08T06:49:28.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27796
+- author: Plykiya
+  changes:
+  - message: Re-added supplybots.
+    type: Add
+  id: 6554
+  time: '2024-05-08T07:30:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27769
+- author: Hobbitmax
+  changes:
+  - message: Replaced Syndicate Jaws Of Life with a Pyjama bundle on the Train map.
+    type: Tweak
+  id: 6555
+  time: '2024-05-08T07:30:53.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/27734
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
index e212aa149e..00d89d6d0d 100644
--- a/Resources/Credits/GitHub.txt
+++ b/Resources/Credits/GitHub.txt
@@ -1 +1 @@
-0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUmAndXGabriel08X, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DmitriyMX, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, Kadeo64, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Vordenburg, vulppine, wafehling, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
+0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, DuskyJay, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Froffy025, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, Jark255, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, K-Dynamic, Kadeo64, KaiShibaa, kalane15, kalanosh, Keer-Sar, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, Subversionary, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 319809da40..24bc60cbf1 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -107,3 +107,6 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
 
 alerts-revenant-corporeal-name = Corporeal
 alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
+
+alerts-deflecting-name = Deflecting
+alerts-deflecting-desc = You have a chance to deflect incoming projectiles. Standing still or moving slowly will increase this chance.
diff --git a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
index 8dbbaf3edd..51a049aab1 100644
--- a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl
@@ -3,3 +3,4 @@ scannable-solution-verb-message = Examine the chemical composition.
 scannable-solution-main-text = It contains the following chemicals:
 scannable-solution-empty-container = It contains no chemicals.
 scannable-solution-chemical = - {$amount}u [color={$color}]{$type}[/color]
+scannable-solution-temperature = Solution temperature: {$temperature}K
\ No newline at end of file
diff --git a/Resources/Locale/en-US/commands/toolshed-commands.ftl b/Resources/Locale/en-US/commands/toolshed-commands.ftl
index 04f6aa08fa..e2536f6781 100644
--- a/Resources/Locale/en-US/commands/toolshed-commands.ftl
+++ b/Resources/Locale/en-US/commands/toolshed-commands.ftl
@@ -80,3 +80,5 @@ command-description-mind-control =
     Assumes control of an entity with the given player.
 command-description-addaccesslog =
     Adds an access log to this entity. Do note that this bypasses the log's default limit and pause check.
+command-description-stationevent-simulate =
+    Simulates N number of rounds in which events will occur and prints the occurrences of every event after.
diff --git a/Resources/Locale/en-US/ghost/ghost-gui.ftl b/Resources/Locale/en-US/ghost/ghost-gui.ftl
index 40cd06743e..cd6c2f0270 100644
--- a/Resources/Locale/en-US/ghost/ghost-gui.ftl
+++ b/Resources/Locale/en-US/ghost/ghost-gui.ftl
@@ -13,6 +13,17 @@ ghost-target-window-current-button = Warp: {$name}
 ghost-target-window-warp-to-most-followed = Warp to Most Followed
 
 ghost-roles-window-title = Ghost Roles
+ghost-roles-window-join-raffle-button = Join raffle
+ghost-roles-window-raffle-in-progress-button =
+    Join raffle ({$time} left, { $players ->
+         [one] {$players} player
+        *[other] {$players} players
+    })
+ghost-roles-window-leave-raffle-button =
+    Leave raffle ({$time} left, { $players ->
+         [one] {$players} player
+        *[other] {$players} players
+    })
 ghost-roles-window-request-role-button = Request
 ghost-roles-window-request-role-button-timer = Request ({$time}s)
 ghost-roles-window-follow-role-button = Follow
diff --git a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
index c685cc8fb7..1d879fcee9 100644
--- a/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
+++ b/Resources/Locale/en-US/machine-linking/transmitter_ports.ftl
@@ -19,6 +19,9 @@ signal-port-description-right = This port is invoked whenever the lever is moved
 signal-port-name-doorstatus = Door status
 signal-port-description-doorstatus = This port is invoked with HIGH when the door opens and LOW when the door finishes closing.
 
+signal-port-name-dockstatus = Dock status
+signal-port-description-dockstatus = This port is invoked with HIGH when docked and LOW when undocked.
+
 signal-port-name-middle = Middle
 signal-port-description-middle = This port is invoked whenever the lever is moved to the neutral position.
 
diff --git a/Resources/Locale/en-US/speech/speech-liar.ftl b/Resources/Locale/en-US/speech/speech-liar.ftl
index 1cd0a778b1..4f157d2e23 100644
--- a/Resources/Locale/en-US/speech/speech-liar.ftl
+++ b/Resources/Locale/en-US/speech/speech-liar.ftl
@@ -34,9 +34,6 @@ liar-word-replacement-11 = isnt
 liar-word-12 = will
 liar-word-replacement-12 = wont
 
-liar-word-12 = not
-liar-word-replacement-12 = ""
-
 liar-word-13 = dont
 liar-word-replacement-13 = ""
 
@@ -128,5 +125,8 @@ liar-word-replacement-41 = bad
 liar-word-42 = bad
 liar-word-replacement-42 = good
 
-liar-word-42 = want
-liar-word-replacement-42 = "don't want"
+liar-word-43 = want
+liar-word-replacement-43 = "don't want"
+
+liar-word-44 = not
+liar-word-replacement-44 = ""
diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml
index a2f42f3ab7..f83c5019f7 100644
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
@@ -69,6 +69,7 @@ entities:
       name: map 1000
     - type: Transform
     - type: Map
+      mapPaused: True
     - type: PhysicsMap
     - type: GridTree
     - type: MovedGrids
@@ -519,251 +520,251 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            478: -2,-124
-            479: 0,-124
-            480: 1,-124
+            470: -2,-124
+            471: 0,-124
+            472: 1,-124
         - node:
             color: '#FFFFFFFF'
             id: Bot
           decals:
-            477: -1,-124
-            846: 6,-280
+            469: -1,-124
+            838: 6,-280
         - node:
             color: '#FFFFFFFF'
             id: BotGreyscale
           decals:
-            1203: 1,-279
-            1204: 1,-280
-            1205: 2,-279
-            1206: 3,-279
-            1207: 3,-280
-            1302: 2,-280
-            1360: -1,-341
-            1361: -1,-340
-            1362: -1,-339
-            1363: -1,-338
-            1366: -2,-341
-            1367: -2,-340
-            1368: -2,-339
-            1369: -2,-338
+            1195: 1,-279
+            1196: 1,-280
+            1197: 2,-279
+            1198: 3,-279
+            1199: 3,-280
+            1294: 2,-280
+            1352: -1,-341
+            1353: -1,-340
+            1354: -1,-339
+            1355: -1,-338
+            1358: -2,-341
+            1359: -2,-340
+            1360: -2,-339
+            1361: -2,-338
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
           decals:
-            845: 6,-281
-            1444: 3,-256
-            1445: 4,-256
-            1446: 5,-256
-            1448: 6,-258
-            1449: 5,-258
-            1450: 4,-258
-            1451: 3,-258
+            837: 6,-281
+            1436: 3,-256
+            1437: 4,-256
+            1438: 5,-256
+            1439: 6,-258
+            1440: 5,-258
+            1441: 4,-258
+            1442: 3,-258
         - node:
             color: '#FFFFFFFF'
             id: BotLeftGreyscale
           decals:
-            1364: -1,-342
+            1356: -1,-342
         - node:
             color: '#FFFFFFFF'
             id: BotRight
           decals:
-            844: 6,-279
+            836: 6,-279
         - node:
             color: '#FFFFFFFF'
             id: BotRightGreyscale
           decals:
-            1365: -1,-337
+            1357: -1,-337
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNe
           decals:
-            119: 6,-38
-            120: 6,-45
-            288: -2,-7
+            115: 6,-38
+            116: 6,-45
+            280: -2,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerNw
           decals:
-            115: -6,-33
-            116: -6,-31
-            289: -3,-7
+            111: -6,-33
+            112: -6,-31
+            281: -3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSe
           decals:
-            121: 6,-43
-            287: -2,-7
+            117: 6,-43
+            279: -2,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkInnerSw
           decals:
-            113: -6,-29
-            114: -6,-31
-            290: -3,-7
+            109: -6,-29
+            110: -6,-31
+            282: -3,-7
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineE
           decals:
-            122: 6,-44
-            123: 6,-37
+            118: 6,-44
+            119: 6,-37
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
           decals:
-            277: -4,-8
-            278: -4,-8
-            279: -3,-8
-            280: -2,-8
-            281: -1,-8
-            284: -4,-7
-            285: -4,-7
-            286: -1,-7
-            486: 2,-139
-            487: 3,-139
-            488: 4,-139
-            489: 5,-139
-            490: 6,-139
-            491: 3,-138
-            492: 4,-138
-            493: 5,-138
+            269: -4,-8
+            270: -4,-8
+            271: -3,-8
+            272: -2,-8
+            273: -1,-8
+            276: -4,-7
+            277: -4,-7
+            278: -1,-7
+            478: 2,-139
+            479: 3,-139
+            480: 4,-139
+            481: 5,-139
+            482: 6,-139
+            483: 3,-138
+            484: 4,-138
+            485: 5,-138
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineS
           decals:
-            273: -4,-6
-            274: -2,-6
-            275: -3,-6
-            276: -1,-6
-            282: -4,-7
-            283: -1,-7
-            481: 3,-140
-            482: 2,-140
-            483: 4,-140
-            484: 5,-140
-            485: 6,-140
+            265: -4,-6
+            266: -2,-6
+            267: -3,-6
+            268: -1,-6
+            274: -4,-7
+            275: -1,-7
+            473: 3,-140
+            474: 2,-140
+            475: 4,-140
+            476: 5,-140
+            477: 6,-140
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineW
           decals:
-            117: -6,-30
-            118: -6,-32
+            113: -6,-30
+            114: -6,-32
         - node:
             color: '#639137FF'
             id: BrickTileSteelCornerNe
           decals:
-            350: 1,-87
+            342: 1,-87
         - node:
             color: '#639137FF'
             id: BrickTileSteelCornerSw
           decals:
-            353: 0,-88
-            354: 0,-88
+            345: 0,-88
+            346: 0,-88
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndE
           decals:
-            494: 5,-144
+            486: 5,-144
         - node:
             color: '#639137FF'
             id: BrickTileSteelEndN
           decals:
-            365: 3,-86
+            357: 3,-86
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndN
           decals:
-            499: 4,-143
+            491: 4,-143
         - node:
             color: '#639137FF'
             id: BrickTileSteelEndS
           decals:
-            351: 1,-89
-            366: 3,-92
+            343: 1,-89
+            358: 3,-92
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndS
           decals:
-            496: 4,-146
+            488: 4,-146
         - node:
             color: '#639137FF'
             id: BrickTileSteelEndW
           decals:
-            352: -1,-87
+            344: -1,-87
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelEndW
           decals:
-            495: 3,-144
+            487: 3,-144
         - node:
             color: '#639137FF'
             id: BrickTileSteelInnerNe
           decals:
-            359: -1,-88
-            360: 0,-89
-            361: 0,-88
+            351: -1,-88
+            352: 0,-89
+            353: 0,-88
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNe
           decals:
-            503: 4,-144
+            495: 4,-144
         - node:
             color: '#639137FF'
             id: BrickTileSteelInnerNw
           decals:
-            362: 1,-88
+            354: 1,-88
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerNw
           decals:
-            502: 4,-144
+            494: 4,-144
         - node:
             color: '#639137FF'
             id: BrickTileSteelInnerSe
           decals:
-            364: 0,-87
+            356: 0,-87
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSe
           decals:
-            500: 4,-144
+            492: 4,-144
         - node:
             color: '#639137FF'
             id: BrickTileSteelInnerSw
           decals:
-            357: 1,-88
-            358: 0,-87
-            363: 1,-87
+            349: 1,-88
+            350: 0,-87
+            355: 1,-87
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            501: 4,-144
+            493: 4,-144
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileSteelInnerSw
           decals:
-            1464: 7,-255
+            1455: 7,-255
         - node:
             color: '#639137FF'
             id: BrickTileSteelLineE
           decals:
-            356: 1,-88
-            372: 3,-87
-            373: 3,-88
-            374: 3,-89
-            375: 3,-90
-            376: 3,-91
+            348: 1,-88
+            364: 3,-87
+            365: 3,-88
+            366: 3,-89
+            367: 3,-90
+            368: 3,-91
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineE
           decals:
-            498: 4,-145
+            490: 4,-145
         - node:
             color: '#639137FF'
             id: BrickTileSteelLineN
           decals:
-            355: 0,-87
+            347: 0,-87
         - node:
             color: '#96DAFFFF'
             id: BrickTileSteelLineN
@@ -774,564 +775,564 @@ entities:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineS
           decals:
-            1461: 6,-255
-            1462: 5,-255
-            1463: 4,-255
+            1452: 6,-255
+            1453: 5,-255
+            1454: 4,-255
         - node:
             color: '#639137FF'
             id: BrickTileSteelLineW
           decals:
-            367: 3,-91
-            368: 3,-90
-            369: 3,-89
-            370: 3,-88
-            371: 3,-87
+            359: 3,-91
+            360: 3,-90
+            361: 3,-89
+            362: 3,-88
+            363: 3,-87
         - node:
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            497: 4,-145
+            489: 4,-145
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: BrickTileSteelLineW
           decals:
-            1458: 7,-258
-            1459: 7,-257
-            1460: 7,-256
+            1449: 7,-258
+            1450: 7,-257
+            1451: 7,-256
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteBox
           decals:
-            1432: 19,-298
+            1424: 19,-298
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteBox
           decals:
-            1437: 25,-298
+            1429: 25,-298
         - node:
             color: '#646464FF'
             id: BrickTileWhiteBox
           decals:
-            394: 4,-89
+            386: 4,-89
         - node:
             color: '#9FED5896'
             id: BrickTileWhiteBox
           decals:
-            1438: 24,-300
+            1430: 24,-300
         - node:
             color: '#A4610696'
             id: BrickTileWhiteBox
           decals:
-            1435: 20,-300
+            1427: 20,-300
         - node:
             color: '#D381C996'
             id: BrickTileWhiteBox
           decals:
-            1436: 24,-298
+            1428: 24,-298
         - node:
             color: '#D4D4D496'
             id: BrickTileWhiteBox
           decals:
-            1439: 25,-300
+            1431: 25,-300
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteBox
           decals:
-            1433: 20,-298
+            1425: 20,-298
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteBox
           decals:
-            1434: 19,-300
+            1426: 19,-300
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNe
           decals:
-            1425: 3,-197
+            1417: 3,-197
         - node:
             color: '#639137FF'
             id: BrickTileWhiteCornerNe
           decals:
-            312: -6,-85
-            327: 1,-85
-            328: 2,-86
+            304: -6,-85
+            319: 1,-85
+            320: 2,-86
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteCornerNe
           decals:
-            446: 3,-96
+            438: 3,-96
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteCornerNe
           decals:
-            378: 4,-85
-            379: 5,-86
+            370: 4,-85
+            371: 5,-86
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNw
           decals:
-            1424: -1,-197
+            1416: -1,-197
         - node:
             color: '#639137FF'
             id: BrickTileWhiteCornerNw
           decals:
-            297: -9,-90
-            323: -2,-85
+            289: -9,-90
+            315: -2,-85
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteCornerNw
           decals:
-            411: 5,-93
-            447: 2,-96
+            403: 5,-93
+            439: 2,-96
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSe
           decals:
-            1431: 3,-200
+            1423: 3,-200
         - node:
             color: '#639137FF'
             id: BrickTileWhiteCornerSe
           decals:
-            313: -6,-89
-            334: 2,-92
+            305: -6,-89
+            326: 2,-92
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteCornerSe
           decals:
-            448: 3,-98
+            440: 3,-98
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteCornerSe
           decals:
-            380: 5,-92
-            381: 4,-93
+            372: 5,-92
+            373: 4,-93
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSw
           decals:
-            1430: -1,-200
+            1422: -1,-200
         - node:
             color: '#639137FF'
             id: BrickTileWhiteCornerSw
           decals:
-            300: -9,-84
-            339: -1,-90
-            340: -2,-89
+            292: -9,-84
+            331: -1,-90
+            332: -2,-89
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteCornerSw
           decals:
-            402: 5,-85
-            449: 2,-98
+            394: 5,-85
+            441: 2,-98
         - node:
             color: '#646464FF'
             id: BrickTileWhiteEndN
           decals:
-            389: 4,-87
-            393: 4,-90
+            381: 4,-87
+            385: 4,-90
         - node:
             color: '#646464FF'
             id: BrickTileWhiteEndS
           decals:
-            390: 4,-91
-            391: 4,-88
-            392: 4,-88
+            382: 4,-91
+            383: 4,-88
+            384: 4,-88
         - node:
             color: '#334E6DFF'
             id: BrickTileWhiteInnerNe
           decals:
-            270: -1,2
+            262: -1,2
         - node:
             color: '#639137FF'
             id: BrickTileWhiteInnerNe
           decals:
-            320: -7,-85
+            312: -7,-85
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteInnerNe
           decals:
-            450: 3,-97
-            458: 3,-98
-            459: 2,-98
+            442: 3,-97
+            450: 3,-98
+            451: 2,-98
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteInnerNe
           decals:
-            383: 4,-86
+            375: 4,-86
         - node:
             color: '#334E6DFF'
             id: BrickTileWhiteInnerNw
           decals:
-            271: 1,2
+            263: 1,2
         - node:
             color: '#639137FF'
             id: BrickTileWhiteInnerNw
           decals:
-            319: -9,-85
-            349: 0,-92
+            311: -9,-85
+            341: 0,-92
         - node:
             color: '#646464FF'
             id: BrickTileWhiteInnerNw
           decals:
-            397: 5,-90
+            389: 5,-90
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteInnerNw
           decals:
-            410: 6,-93
-            412: 5,-94
-            451: 2,-97
-            460: 3,-98
+            402: 6,-93
+            404: 5,-94
+            443: 2,-97
+            452: 3,-98
         - node:
             color: '#639137FF'
             id: BrickTileWhiteInnerSe
           decals:
-            322: -7,-89
-            337: 1,-92
-            338: 1,-92
+            314: -7,-89
+            329: 1,-92
+            330: 1,-92
         - node:
             color: '#A0A0A0FF'
             id: BrickTileWhiteInnerSe
           decals:
+            445: 3,-97
+            449: 2,-96
+        - node:
+            color: '#B3B3B3FF'
+            id: BrickTileWhiteInnerSe
+          decals:
+            374: 4,-92
+        - node:
+            color: '#639137FF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            310: -9,-89
+            336: -1,-89
+            337: 0,-90
+            340: 0,-92
+        - node:
+            color: '#646464FF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            388: 5,-88
+        - node:
+            color: '#A0A0A0FF'
+            id: BrickTileWhiteInnerSw
+          decals:
+            392: 5,-84
+            393: 5,-84
+            406: 6,-85
+            444: 2,-97
+            448: 3,-96
+        - node:
+            color: '#334E6DFF'
+            id: BrickTileWhiteLineE
+          decals:
+            261: -1,3
+        - node:
+            color: '#639137FF'
+            id: BrickTileWhiteLineE
+          decals:
+            303: -6,-86
+            306: -6,-88
+            307: -6,-87
+            321: 2,-87
+            322: 2,-88
+            323: 2,-89
+            324: 2,-90
+            325: 2,-91
+        - node:
+            color: '#A0A0A0FF'
+            id: BrickTileWhiteLineE
+          decals:
+            446: 2,-97
             453: 3,-97
-            457: 2,-96
         - node:
             color: '#B3B3B3FF'
-            id: BrickTileWhiteInnerSe
+            id: BrickTileWhiteLineE
           decals:
-            382: 4,-92
+            376: 5,-87
+            377: 5,-88
+            378: 5,-89
+            379: 5,-90
+            380: 5,-91
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineN
+          decals:
+            1418: 1,-197
+            1419: 0,-197
         - node:
             color: '#639137FF'
-            id: BrickTileWhiteInnerSw
+            id: BrickTileWhiteLineN
           decals:
-            318: -9,-89
-            344: -1,-89
-            345: 0,-90
-            348: 0,-92
-        - node:
-            color: '#646464FF'
-            id: BrickTileWhiteInnerSw
-          decals:
-            396: 5,-88
+            283: -10,-89
+            284: -9,-89
+            285: -8,-89
+            290: -8,-90
+            291: -7,-90
+            308: -10,-85
+            316: -1,-85
+            317: -1,-85
+            318: 0,-85
+            327: 1,-93
+            328: 0,-93
         - node:
             color: '#A0A0A0FF'
-            id: BrickTileWhiteInnerSw
+            id: BrickTileWhiteLineN
           decals:
-            400: 5,-84
-            401: 5,-84
-            414: 6,-85
-            452: 2,-97
-            456: 3,-96
+            405: 4,-94
+        - node:
+            color: '#B3B3B3FF'
+            id: BrickTileWhiteLineN
+          decals:
+            369: 3,-85
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineS
+          decals:
+            1420: 0,-200
+            1421: 1,-200
+        - node:
+            color: '#639137FF'
+            id: BrickTileWhiteLineS
+          decals:
+            286: -8,-85
+            287: -9,-85
+            288: -10,-85
+            293: -8,-84
+            294: -7,-84
+            309: -10,-89
+        - node:
+            color: '#A0A0A0FF'
+            id: BrickTileWhiteLineS
+          decals:
+            390: 3,-84
+            391: 4,-84
         - node:
             color: '#334E6DFF'
-            id: BrickTileWhiteLineE
+            id: BrickTileWhiteLineW
           decals:
-            269: -1,3
+            264: 1,3
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineW
+          decals:
+            1415: -1,-198
         - node:
             color: '#639137FF'
-            id: BrickTileWhiteLineE
+            id: BrickTileWhiteLineW
           decals:
-            311: -6,-86
-            314: -6,-88
-            315: -6,-87
-            329: 2,-87
-            330: 2,-88
-            331: 2,-89
-            332: 2,-90
-            333: 2,-91
+            295: -7,-87
+            296: -7,-88
+            313: -7,-86
+            333: -2,-88
+            334: -2,-87
+            335: -2,-86
+            338: 0,-91
+            339: 0,-91
+        - node:
+            color: '#646464FF'
+            id: BrickTileWhiteLineW
+          decals:
+            387: 5,-89
         - node:
             color: '#A0A0A0FF'
-            id: BrickTileWhiteLineE
+            id: BrickTileWhiteLineW
           decals:
+            395: 6,-86
+            396: 6,-87
+            397: 6,-89
+            398: 6,-88
+            399: 6,-90
+            400: 6,-91
+            401: 6,-92
+            447: 3,-97
             454: 2,-97
-            461: 3,-97
-        - node:
-            color: '#B3B3B3FF'
-            id: BrickTileWhiteLineE
-          decals:
-            384: 5,-87
-            385: 5,-88
-            386: 5,-89
-            387: 5,-90
-            388: 5,-91
-        - node:
-            color: '#52B4E996'
-            id: BrickTileWhiteLineN
-          decals:
-            1426: 1,-197
-            1427: 0,-197
-        - node:
-            color: '#639137FF'
-            id: BrickTileWhiteLineN
-          decals:
-            291: -10,-89
-            292: -9,-89
-            293: -8,-89
-            298: -8,-90
-            299: -7,-90
-            316: -10,-85
-            324: -1,-85
-            325: -1,-85
-            326: 0,-85
-            335: 1,-93
-            336: 0,-93
-        - node:
-            color: '#A0A0A0FF'
-            id: BrickTileWhiteLineN
-          decals:
-            413: 4,-94
-        - node:
-            color: '#B3B3B3FF'
-            id: BrickTileWhiteLineN
-          decals:
-            377: 3,-85
-        - node:
-            color: '#52B4E996'
-            id: BrickTileWhiteLineS
-          decals:
-            1428: 0,-200
-            1429: 1,-200
-        - node:
-            color: '#639137FF'
-            id: BrickTileWhiteLineS
-          decals:
-            294: -8,-85
-            295: -9,-85
-            296: -10,-85
-            301: -8,-84
-            302: -7,-84
-            317: -10,-89
-        - node:
-            color: '#A0A0A0FF'
-            id: BrickTileWhiteLineS
-          decals:
-            398: 3,-84
-            399: 4,-84
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteLineW
-          decals:
-            272: 1,3
-        - node:
-            color: '#52B4E996'
-            id: BrickTileWhiteLineW
-          decals:
-            1423: -1,-198
-        - node:
-            color: '#639137FF'
-            id: BrickTileWhiteLineW
-          decals:
-            303: -7,-87
-            304: -7,-88
-            321: -7,-86
-            341: -2,-88
-            342: -2,-87
-            343: -2,-86
-            346: 0,-91
-            347: 0,-91
-        - node:
-            color: '#646464FF'
-            id: BrickTileWhiteLineW
-          decals:
-            395: 5,-89
-        - node:
-            color: '#A0A0A0FF'
-            id: BrickTileWhiteLineW
-          decals:
-            403: 6,-86
-            404: 6,-87
-            405: 6,-89
-            406: 6,-88
-            407: 6,-90
-            408: 6,-91
-            409: 6,-92
-            455: 3,-97
-            462: 2,-97
         - node:
             color: '#FFFFFFFF'
             id: BushAOne
           decals:
-            1042: 1,-389
-            1043: 4,-387
-            1044: 1,-386
-            1315: 9,-203
+            1034: 1,-389
+            1035: 4,-387
+            1036: 1,-386
+            1307: 9,-203
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
           decals:
-            174: 1.4194474,-40.90987
-            1316: 9,-206
+            166: 1.4194474,-40.90987
+            1308: 9,-206
         - node:
             color: '#FFFFFFFF'
             id: BushCOne
           decals:
-            173: 2.5288224,-40.980873
-            1172: -3,-375
-            1173: 3,-375
+            165: 2.5288224,-40.980873
+            1164: -3,-375
+            1165: 3,-375
         - node:
             color: '#FFFFFFFF'
             id: BushCThree
           decals:
-            1317: 9,-205
+            1309: 9,-205
         - node:
             color: '#FFFFFFFF'
             id: BushCTwo
           decals:
-            172: 2.1381974,-41.52775
+            164: 2.1381974,-41.52775
         - node:
             color: '#FFFFFFFF'
             id: Busha2
           decals:
-            1310: 11,-198
-            1313: 10,-201
-            1314: 11,-201
+            1302: 11,-198
+            1305: 10,-201
+            1306: 11,-201
         - node:
             color: '#FFFFFFFF'
             id: Busha3
           decals:
-            181: 4.2948465,-41.901707
+            173: 4.2948465,-41.901707
         - node:
             color: '#FFFFFFFF'
             id: Bushb1
           decals:
-            1038: -1,-387
-            1168: 1,-373
-            1169: 0,-374
-            1318: 9,-195
-            1319: 9,-204
+            1030: -1,-387
+            1160: 1,-373
+            1161: 0,-374
+            1310: 9,-195
+            1311: 9,-204
         - node:
             color: '#FFFFFFFF'
             id: Bushb3
           decals:
-            175: 1.2944474,-41.75362
-            1039: -3,-387
-            1040: 6,-384
-            1041: -5,-384
-            1170: -2,-374
+            167: 1.2944474,-41.75362
+            1031: -3,-387
+            1032: 6,-384
+            1033: -5,-384
+            1162: -2,-374
         - node:
             color: '#FFFFFFFF'
             id: Bushc2
           decals:
-            1309: 10,-198
-            1311: 10,-199
+            1301: 10,-198
+            1303: 10,-199
         - node:
             color: '#FFFFFFFF'
             id: Bushc3
           decals:
-            1171: 3,-374
-            1312: 9,-200
-            1320: 7,-202
+            1163: 3,-374
+            1304: 9,-200
+            1312: 7,-202
         - node:
             color: '#52B4E996'
             id: CheckerNWSE
           decals:
-            1384: -5,-167
-            1385: -5,-166
-            1386: -4,-166
-            1387: -4,-167
-            1388: -3,-167
-            1389: -3,-166
-            1390: -2,-166
-            1391: -2,-167
-            1392: 3,-181
-            1393: 3,-180
-            1394: 3,-179
-            1395: 4,-179
-            1396: 4,-180
-            1397: 4,-181
-            1398: 5,-181
-            1399: 5,-180
-            1400: 5,-179
-            1401: 5,-178
-            1402: 4,-178
-            1403: 2,-180
-            1404: 2,-179
-            1405: -2,-171
-            1406: -2,-170
-            1407: -2,-169
-            1408: -1,-204
-            1409: -1,-203
-            1410: -1,-202
-            1411: 0,-202
-            1412: 0,-203
-            1413: 0,-204
-            1414: 1,-204
-            1415: 1,-203
-            1416: 1,-202
-            1417: 2,-202
-            1418: 2,-203
-            1419: 2,-204
-            1420: 3,-204
-            1421: 3,-203
-            1422: 3,-202
+            1376: -5,-167
+            1377: -5,-166
+            1378: -4,-166
+            1379: -4,-167
+            1380: -3,-167
+            1381: -3,-166
+            1382: -2,-166
+            1383: -2,-167
+            1384: 3,-181
+            1385: 3,-180
+            1386: 3,-179
+            1387: 4,-179
+            1388: 4,-180
+            1389: 4,-181
+            1390: 5,-181
+            1391: 5,-180
+            1392: 5,-179
+            1393: 5,-178
+            1394: 4,-178
+            1395: 2,-180
+            1396: 2,-179
+            1397: -2,-171
+            1398: -2,-170
+            1399: -2,-169
+            1400: -1,-204
+            1401: -1,-203
+            1402: -1,-202
+            1403: 0,-202
+            1404: 0,-203
+            1405: 0,-204
+            1406: 1,-204
+            1407: 1,-203
+            1408: 1,-202
+            1409: 2,-202
+            1410: 2,-203
+            1411: 2,-204
+            1412: 3,-204
+            1413: 3,-203
+            1414: 3,-202
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerNe
           decals:
-            795: -2,-284
+            787: -2,-284
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimCornerSe
           decals:
-            798: -2,-276
+            790: -2,-276
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerNe
           decals:
-            791: -3,-284
-            796: -2,-285
+            783: -3,-284
+            788: -2,-285
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimInnerSe
           decals:
-            792: -3,-276
-            797: -2,-275
+            784: -3,-276
+            789: -2,-275
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineE
           decals:
-            784: -3,-278
-            785: -3,-279
-            786: -3,-280
-            787: -3,-281
-            788: -3,-282
-            789: -3,-283
-            790: -3,-277
+            776: -3,-278
+            777: -3,-279
+            778: -3,-280
+            779: -3,-281
+            780: -3,-282
+            781: -3,-283
+            782: -3,-277
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineN
           decals:
-            793: -1,-285
-            794: 0,-285
+            785: -1,-285
+            786: 0,-285
         - node:
             color: '#FFFFFFFF'
             id: ConcreteTrimLineS
           decals:
-            799: -1,-275
-            800: 0,-275
-            801: 1,-275
-            802: 3,-275
-            803: 4,-275
-            804: 5,-275
-            805: 6,-275
-            806: 2,-275
+            791: -1,-275
+            792: 0,-275
+            793: 1,-275
+            794: 3,-275
+            795: 4,-275
+            796: 5,-275
+            797: 6,-275
+            798: 2,-275
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            1452: 3,-257
-            1453: 4,-257
-            1454: 6,-256
-            1455: 10,-253
+            1443: 3,-257
+            1444: 4,-257
+            1445: 6,-256
+            1446: 10,-253
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            1456: 5,-257
-            1457: 10,-254
+            1447: 5,-257
+            1448: 10,-254
         - node:
             color: '#FFFFFFFF'
             id: FlowersBRTwo
@@ -1341,8 +1342,8 @@ entities:
             color: '#FFFFFFFF'
             id: Flowersbr2
           decals:
-            187: 1.1507428,-40.14647
-            188: 0.83824277,-40.39647
+            179: 1.1507428,-40.14647
+            180: 0.83824277,-40.39647
         - node:
             color: '#FFFFFFFF'
             id: Flowerspv2
@@ -1357,422 +1358,422 @@ entities:
             color: '#FFFFFFFF'
             id: Flowersy4
           decals:
-            186: 4.197618,-40.474594
+            178: 4.197618,-40.474594
         - node:
             color: '#9FED58CF'
             id: FullTileOverlayGreyscale
           decals:
-            1342: -3,-195
-            1343: -3,-194
-            1344: -4,-194
-            1345: -5,-194
-            1346: -6,-194
-            1347: -7,-194
-            1348: -7,-195
+            1334: -3,-195
+            1335: -3,-194
+            1336: -4,-194
+            1337: -5,-194
+            1338: -6,-194
+            1339: -7,-194
+            1340: -7,-195
         - node:
             color: '#9FED58DD'
             id: FullTileOverlayGreyscale
           decals:
-            654: -3,-202
-            655: -3,-203
-            656: -3,-204
-            657: -3,-205
-            658: -3,-206
-            659: -3,-207
-            660: -3,-208
-            661: -3,-201
-            662: -3,-199
-            663: -3,-198
-            664: -3,-197
-            665: -3,-196
-            666: -7,-196
-            667: -7,-197
-            668: -7,-198
-            669: -7,-199
-            670: -6,-199
+            646: -3,-202
+            647: -3,-203
+            648: -3,-204
+            649: -3,-205
+            650: -3,-206
+            651: -3,-207
+            652: -3,-208
+            653: -3,-201
+            654: -3,-199
+            655: -3,-198
+            656: -3,-197
+            657: -3,-196
+            658: -7,-196
+            659: -7,-197
+            660: -7,-198
+            661: -7,-199
+            662: -6,-199
         - node:
             color: '#FFFFFFFF'
             id: Grassa1
           decals:
-            1045: -3,-384
-            1048: -5,-387
-            1303: 11,-196
+            1037: -3,-384
+            1040: -5,-387
+            1295: 11,-196
         - node:
             color: '#FFFFFFFF'
             id: Grassa2
           decals:
-            1034: -2,-388
-            1174: -1,-374
+            1026: -2,-388
+            1166: -1,-374
         - node:
             color: '#FFFFFFFF'
             id: Grassa3
           decals:
-            1037: -2,-387
-            1176: 1,-374
-            1177: 2,-374
-            1304: 10,-195
+            1029: -2,-387
+            1168: 1,-374
+            1169: 2,-374
+            1296: 10,-195
         - node:
             color: '#FFFFFFFF'
             id: Grassa4
           decals:
-            1322: 7,-195
+            1314: 7,-195
         - node:
             color: '#FFFFFFFF'
             id: Grassa5
           decals:
-            1178: -3,-374
-            1179: 2,-373
-            1305: 9,-194
+            1170: -3,-374
+            1171: 2,-373
+            1297: 9,-194
         - node:
             color: '#FFFFFFFF'
             id: Grassb1
           decals:
-            176: 3.0600724,-41.94112
-            1046: 4,-384
-            1321: 7,-196
+            168: 3.0600724,-41.94112
+            1038: 4,-384
+            1313: 7,-196
         - node:
             color: '#FFFFFFFF'
             id: Grassb2
           decals:
-            183: 4.2479715,-41.057957
-            189: 0.60386777,-40.880844
-            191: 1.6455414,-39.61602
-            1181: 4,-374
+            175: 4.2479715,-41.057957
+            181: 0.60386777,-40.880844
+            183: 1.6455414,-39.61602
+            1173: 4,-374
         - node:
             color: '#FFFFFFFF'
             id: Grassb3
           decals:
-            179: 0.47185308,-41.800495
-            1047: 5,-385
+            171: 0.47185308,-41.800495
+            1039: 5,-385
         - node:
             color: '#FFFFFFFF'
             id: Grassb4
           decals:
-            178: 3.40986,-41.34737
-            185: 3.945704,-39.753384
-            1306: 9,-191
-            1307: 9,-192
+            170: 3.40986,-41.34737
+            177: 3.945704,-39.753384
+            1298: 9,-191
+            1299: 9,-192
         - node:
             color: '#FFFFFFFF'
             id: Grassb5
           decals:
-            177: 2.3569474,-42.269245
-            180: 1.331228,-42.519245
-            184: 2.6073463,-40.20651
-            190: 3.1142914,-39.694145
-            1035: -2,-389
-            1036: -1,-388
-            1175: -1,-373
-            1180: -4,-374
-            1308: 11,-199
+            169: 2.3569474,-42.269245
+            172: 1.331228,-42.519245
+            176: 2.6073463,-40.20651
+            182: 3.1142914,-39.694145
+            1027: -2,-389
+            1028: -1,-388
+            1167: -1,-373
+            1172: -4,-374
+            1300: 11,-199
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimInnerNw
           decals:
-            762: -4,-278
-            769: 0,-274
+            754: -4,-278
+            761: 0,-274
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimInnerSw
           decals:
-            778: -1,-286
-            779: -4,-282
+            770: -1,-286
+            771: -4,-282
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineE
           decals:
-            1274: 17,-64
-            1275: 17,-63
-            1276: 17,-62
-            1277: 17,-61
+            1266: 17,-64
+            1267: 17,-63
+            1268: 17,-62
+            1269: 17,-61
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineN
           decals:
-            760: -6,-278
-            761: -5,-278
-            766: -2,-274
-            767: -3,-274
-            768: -1,-274
-            1278: 14,-60
-            1279: 15,-60
-            1280: 16,-60
-            1281: 13,-68
-            1282: 14,-68
-            1283: 15,-68
-            1284: 16,-68
-            1285: 17,-68
-            1291: 13,-78
-            1292: 14,-78
-            1293: 15,-78
-            1294: 16,-78
-            1295: 17,-78
+            752: -6,-278
+            753: -5,-278
+            758: -2,-274
+            759: -3,-274
+            760: -1,-274
+            1270: 14,-60
+            1271: 15,-60
+            1272: 16,-60
+            1273: 13,-68
+            1274: 14,-68
+            1275: 15,-68
+            1276: 16,-68
+            1277: 17,-68
+            1283: 13,-78
+            1284: 14,-78
+            1285: 15,-78
+            1286: 16,-78
+            1287: 17,-78
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineS
           decals:
-            780: -2,-286
-            781: -3,-286
-            782: -5,-282
-            783: -6,-282
-            1286: 13,-76
-            1287: 14,-76
-            1288: 15,-76
-            1289: 16,-76
-            1290: 17,-76
-            1296: 14,-86
-            1297: 15,-86
-            1298: 16,-86
-            1299: 13,-85
-            1300: 17,-85
+            772: -2,-286
+            773: -3,-286
+            774: -5,-282
+            775: -6,-282
+            1278: 13,-76
+            1279: 14,-76
+            1280: 15,-76
+            1281: 16,-76
+            1282: 17,-76
+            1288: 14,-86
+            1289: 15,-86
+            1290: 16,-86
+            1291: 13,-85
+            1292: 17,-85
         - node:
             color: '#FFFFFFFF'
             id: GrayConcreteTrimLineW
           decals:
-            763: -4,-277
-            764: -4,-276
-            765: -4,-275
-            770: 0,-273
-            771: 0,-272
-            772: 0,-271
-            773: -4,-285
-            774: -4,-284
-            775: -4,-283
-            776: -1,-288
-            777: -1,-287
-            1270: 13,-64
-            1271: 13,-63
-            1272: 13,-62
-            1273: 13,-61
+            755: -4,-277
+            756: -4,-276
+            757: -4,-275
+            762: 0,-273
+            763: 0,-272
+            764: 0,-271
+            765: -4,-285
+            766: -4,-284
+            767: -4,-283
+            768: -1,-288
+            769: -1,-287
+            1262: 13,-64
+            1263: 13,-63
+            1264: 13,-62
+            1265: 13,-61
         - node:
             color: '#999453FF'
             id: MiniTileDarkBox
           decals:
-            588: 5,-168
+            580: 5,-168
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkBox
           decals:
-            563: -7,-153
+            555: -7,-153
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineE
           decals:
-            732: 17,-154
-            733: 17,-153
-            734: 17,-152
-            735: 17,-148
-            736: 17,-147
-            737: 17,-146
-            738: 17,-145
-            739: 17,-144
-            740: 17,-141
-            741: 17,-140
-            756: 17,-160
-            757: 17,-161
-            758: 17,-164
-            759: 17,-165
-            1022: 0,-345
-            1023: 0,-346
-            1024: 0,-347
-            1028: 0,-344
-            1030: 2,-330
-            1031: 2,-331
-            1032: 2,-332
-            1033: 2,-333
+            724: 17,-154
+            725: 17,-153
+            726: 17,-152
+            727: 17,-148
+            728: 17,-147
+            729: 17,-146
+            730: 17,-145
+            731: 17,-144
+            732: 17,-141
+            733: 17,-140
+            748: 17,-160
+            749: 17,-161
+            750: 17,-164
+            751: 17,-165
+            1014: 0,-345
+            1015: 0,-346
+            1016: 0,-347
+            1020: 0,-344
+            1022: 2,-330
+            1023: 2,-331
+            1024: 2,-332
+            1025: 2,-333
         - node:
             color: '#DE3A3A96'
             id: MiniTileDarkLineN
           decals:
-            1182: -3,-371
-            1183: -4,-371
-            1184: -5,-371
-            1185: -6,-371
-            1186: -2,-371
-            1187: -1,-371
-            1188: 0,-371
-            1189: 1,-371
-            1190: 2,-371
-            1191: 3,-371
-            1192: 4,-371
-            1193: 5,-371
-            1194: 6,-371
+            1174: -3,-371
+            1175: -4,-371
+            1176: -5,-371
+            1177: -6,-371
+            1178: -2,-371
+            1179: -1,-371
+            1180: 0,-371
+            1181: 1,-371
+            1182: 2,-371
+            1183: 3,-371
+            1184: 4,-371
+            1185: 5,-371
+            1186: 6,-371
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineS
           decals:
-            1019: -5,-347
-            1020: -4,-347
-            1021: -3,-347
+            1011: -5,-347
+            1012: -4,-347
+            1013: -3,-347
         - node:
             color: '#FFFFFFFF'
             id: MiniTileDarkLineW
           decals:
-            742: 13,-141
-            743: 13,-139
-            744: 13,-144
-            745: 13,-147
-            746: 13,-148
-            747: 13,-149
-            748: 13,-150
-            749: 13,-151
-            750: 13,-152
-            751: 13,-153
-            752: 13,-154
-            753: 13,-160
-            754: 13,-161
-            755: 13,-162
-            1017: -6,-345
-            1018: -6,-346
-            1025: 0,-347
-            1026: 0,-346
-            1027: 0,-345
-            1029: 0,-344
+            734: 13,-141
+            735: 13,-139
+            736: 13,-144
+            737: 13,-147
+            738: 13,-148
+            739: 13,-149
+            740: 13,-150
+            741: 13,-151
+            742: 13,-152
+            743: 13,-153
+            744: 13,-154
+            745: 13,-160
+            746: 13,-161
+            747: 13,-162
+            1009: -6,-345
+            1010: -6,-346
+            1017: 0,-347
+            1018: 0,-346
+            1019: 0,-345
+            1021: 0,-344
         - node:
             color: '#D381C996'
             id: MiniTileSteelBox
           decals:
-            905: 2,-310
-            906: 2,-306
+            897: 2,-310
+            898: 2,-306
         - node:
             color: '#999453FF'
             id: MiniTileSteelCornerNe
           decals:
-            587: 6,-167
+            579: 6,-167
         - node:
             color: '#9FED58CF'
             id: MiniTileSteelCornerNe
           decals:
-            1349: -3,-194
+            1341: -3,-194
         - node:
             color: '#D381C996'
             id: MiniTileSteelCornerNe
           decals:
-            720: -3,-54
-            1219: -2,-311
+            712: -3,-54
+            1211: -2,-311
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelCornerNe
           decals:
-            1079: 2,-357
-            1085: 3,-360
-            1101: 4,-361
+            1071: 2,-357
+            1077: 3,-360
+            1093: 4,-361
         - node:
             color: '#EFB34196'
             id: MiniTileSteelCornerNe
           decals:
-            1248: 19,-246
+            1240: 19,-246
         - node:
             color: '#999453FF'
             id: MiniTileSteelCornerNw
           decals:
-            584: 4,-167
+            576: 4,-167
         - node:
             color: '#9FED58CF'
             id: MiniTileSteelCornerNw
           decals:
-            1350: -7,-194
+            1342: -7,-194
         - node:
             color: '#D381C996'
             id: MiniTileSteelCornerNw
           decals:
-            721: -6,-54
+            713: -6,-54
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelCornerNw
           decals:
-            1080: -2,-357
-            1086: -3,-360
-            1094: -7,-361
+            1072: -2,-357
+            1078: -3,-360
+            1086: -7,-361
         - node:
             color: '#EFB34196'
             id: MiniTileSteelCornerNw
           decals:
-            1236: 14,-251
-            1244: 15,-246
+            1228: 14,-251
+            1236: 15,-246
         - node:
             color: '#999453FF'
             id: MiniTileSteelCornerSe
           decals:
-            585: 6,-169
+            577: 6,-169
         - node:
             color: '#9FED58DB'
             id: MiniTileSteelCornerSe
           decals:
-            637: -3,-193
+            629: -3,-193
         - node:
             color: '#D381C996'
             id: MiniTileSteelCornerSe
           decals:
-            722: -3,-56
-            1220: -2,-307
+            714: -3,-56
+            1212: -2,-307
         - node:
             color: '#EFB34196'
             id: MiniTileSteelCornerSe
           decals:
-            1260: 19,-262
+            1252: 19,-262
         - node:
             color: '#999453FF'
             id: MiniTileSteelCornerSw
           decals:
-            586: 4,-169
+            578: 4,-169
         - node:
             color: '#9FED58DB'
             id: MiniTileSteelCornerSw
           decals:
-            636: -6,-193
+            628: -6,-193
         - node:
             color: '#D381C996'
             id: MiniTileSteelCornerSw
           decals:
-            723: -6,-56
+            715: -6,-56
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelCornerSw
           decals:
-            1095: -7,-362
+            1087: -7,-362
         - node:
             color: '#EFB34196'
             id: MiniTileSteelCornerSw
           decals:
-            1237: 14,-255
-            1258: 15,-262
+            1229: 14,-255
+            1250: 15,-262
         - node:
             color: '#D381C996'
             id: MiniTileSteelInnerNe
           decals:
-            924: 1,-307
-            925: 1,-320
-            1224: -8,-308
+            916: 1,-307
+            917: 1,-320
+            1216: -8,-308
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelInnerNe
           decals:
-            1088: 2,-360
-            1089: 3,-361
+            1080: 2,-360
+            1081: 3,-361
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerNe
           decals:
             101: -5,-32
-            169: 5,-46
+            161: 5,-46
         - node:
             color: '#D381C996'
             id: MiniTileSteelInnerNw
           decals:
-            922: 9,-307
-            1221: -1,-308
+            914: 9,-307
+            1213: -1,-308
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelInnerNw
           decals:
-            1087: -2,-360
-            1090: -3,-361
+            1079: -2,-360
+            1082: -3,-361
         - node:
             color: '#EFB34196'
             id: MiniTileSteelInnerNw
           decals:
-            1239: 15,-251
+            1231: 15,-251
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerNw
@@ -1782,208 +1783,208 @@ entities:
             color: '#D381C996'
             id: MiniTileSteelInnerSe
           decals:
-            904: 1,-309
-            923: 1,-298
-            1223: -8,-310
+            896: 1,-309
+            915: 1,-298
+            1215: -8,-310
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSe
           decals:
             103: -5,-29
-            155: 0,-33
+            149: 0,-33
         - node:
             color: '#D381C996'
             id: MiniTileSteelInnerSw
           decals:
-            929: 9,-309
-            1075: -1,-298
-            1222: -1,-310
+            921: 9,-309
+            1067: -1,-298
+            1214: -1,-310
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelInnerSw
           decals:
-            1137: -4,-362
+            1129: -4,-362
         - node:
             color: '#EFB34196'
             id: MiniTileSteelInnerSw
           decals:
-            1238: 15,-255
+            1230: 15,-255
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelInnerSw
           decals:
             104: 3,-29
-            156: -1,-33
+            150: -1,-33
         - node:
             color: '#5A64BC93'
             id: MiniTileSteelLineE
           decals:
-            1166: 7,-367
-            1167: 7,-368
+            1158: 7,-367
+            1159: 7,-368
         - node:
             color: '#5ABC5A93'
             id: MiniTileSteelLineE
           decals:
-            1154: -6,-367
-            1155: -6,-368
+            1146: -6,-367
+            1147: -6,-368
         - node:
             color: '#999453FF'
             id: MiniTileSteelLineE
           decals:
-            580: 6,-168
+            572: 6,-168
         - node:
             color: '#9FED58CF'
             id: MiniTileSteelLineE
           decals:
-            1352: -3,-195
+            1344: -3,-195
         - node:
             color: '#9FED58DB'
             id: MiniTileSteelLineE
           decals:
-            649: -5,-207
-            650: -5,-206
-            651: -5,-205
-            652: -5,-202
-            653: -5,-201
+            641: -5,-207
+            642: -5,-206
+            643: -5,-205
+            644: -5,-202
+            645: -5,-201
         - node:
             color: '#9FED58DD'
             id: MiniTileSteelLineE
           decals:
-            688: -3,-199
-            689: -3,-198
-            690: -3,-197
-            691: -3,-196
+            680: -3,-199
+            681: -3,-198
+            682: -3,-197
+            683: -3,-196
         - node:
             color: '#A45ABC93'
             id: MiniTileSteelLineE
           decals:
-            1158: -6,-364
-            1159: -6,-365
+            1150: -6,-364
+            1151: -6,-365
         - node:
             color: '#BCBC5A93'
             id: MiniTileSteelLineE
           decals:
-            1162: 7,-364
-            1163: 7,-365
+            1154: 7,-364
+            1155: 7,-365
         - node:
             color: '#D381C996'
             id: MiniTileSteelLineE
           decals:
-            729: -3,-55
-            890: 1,-316
-            891: 1,-317
-            892: 1,-318
-            893: 1,-319
-            894: 1,-312
-            895: 1,-311
-            903: 1,-310
-            914: 1,-306
-            915: 1,-305
-            916: 1,-304
-            917: 1,-303
-            918: 1,-302
-            919: 1,-301
-            920: 1,-300
-            921: 1,-299
+            721: -3,-55
+            882: 1,-316
+            883: 1,-317
+            884: 1,-318
+            885: 1,-319
+            886: 1,-312
+            887: 1,-311
+            895: 1,-310
+            906: 1,-306
+            907: 1,-305
+            908: 1,-304
+            909: 1,-303
+            910: 1,-302
+            911: 1,-301
+            912: 1,-300
+            913: 1,-299
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelLineE
           decals:
-            1076: 2,-359
-            1084: 2,-358
-            1102: 4,-362
-            1103: 4,-363
-            1104: 4,-364
-            1105: 4,-365
-            1106: 4,-366
-            1107: 4,-367
+            1068: 2,-359
+            1076: 2,-358
+            1094: 4,-362
+            1095: 4,-363
+            1096: 4,-364
+            1097: 4,-365
+            1098: 4,-366
+            1099: 4,-367
         - node:
             color: '#EFB34196'
             id: MiniTileSteelLineE
           decals:
-            1249: 19,-247
-            1250: 19,-248
-            1251: 19,-249
-            1252: 19,-250
-            1253: 19,-256
-            1254: 19,-257
-            1255: 19,-258
+            1241: 19,-247
+            1242: 19,-248
+            1243: 19,-249
+            1244: 19,-250
+            1245: 19,-256
+            1246: 19,-257
+            1247: 19,-258
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineE
           decals:
             99: -5,-31
             100: -5,-30
-            136: 5,-45
-            137: 5,-44
-            138: 5,-43
-            139: 5,-38
-            140: 5,-37
-            141: 0,-37
-            142: 0,-36
-            143: 0,-35
-            144: 0,-34
-            170: 5,-40
-            171: 5,-41
-            542: 0,-138
-            543: 0,-139
-            544: 0,-140
-            545: 0,-141
-            546: 0,-142
-            547: 0,-143
-            548: 0,-144
-            549: 0,-145
-            550: 0,-146
-            551: 0,-147
-            552: 1,-152
-            553: 1,-153
+            132: 5,-45
+            133: 5,-44
+            134: 5,-43
+            135: 5,-38
+            136: 5,-37
+            137: 0,-37
+            138: 0,-36
+            139: 0,-35
+            140: 0,-34
+            162: 5,-40
+            163: 5,-41
+            534: 0,-138
+            535: 0,-139
+            536: 0,-140
+            537: 0,-141
+            538: 0,-142
+            539: 0,-143
+            540: 0,-144
+            541: 0,-145
+            542: 0,-146
+            543: 0,-147
+            544: 1,-152
+            545: 1,-153
         - node:
             color: '#999453FF'
             id: MiniTileSteelLineN
           decals:
-            581: 5,-167
+            573: 5,-167
         - node:
             color: '#9FED58CF'
             id: MiniTileSteelLineN
           decals:
-            1353: -6,-194
-            1354: -5,-194
-            1355: -4,-194
+            1345: -6,-194
+            1346: -5,-194
+            1347: -4,-194
         - node:
             color: '#D381C996'
             id: MiniTileSteelLineN
           decals:
-            727: -5,-54
-            728: -4,-54
-            907: 2,-307
-            908: 3,-307
-            909: 4,-307
-            910: 5,-307
-            911: 6,-307
-            912: 7,-307
-            913: 8,-307
-            1214: -7,-308
-            1215: -6,-308
-            1216: -4,-308
-            1217: -3,-308
-            1218: -2,-308
+            719: -5,-54
+            720: -4,-54
+            899: 2,-307
+            900: 3,-307
+            901: 4,-307
+            902: 5,-307
+            903: 6,-307
+            904: 7,-307
+            905: 8,-307
+            1206: -7,-308
+            1207: -6,-308
+            1208: -4,-308
+            1209: -3,-308
+            1210: -2,-308
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelLineN
           decals:
-            1081: -1,-357
-            1082: 0,-357
-            1083: 1,-357
-            1091: -4,-361
-            1092: -5,-361
-            1093: -6,-361
+            1073: -1,-357
+            1074: 0,-357
+            1075: 1,-357
+            1083: -4,-361
+            1084: -5,-361
+            1085: -6,-361
         - node:
             color: '#EFB34196'
             id: MiniTileSteelLineN
           decals:
-            1245: 16,-246
-            1246: 17,-246
-            1247: 18,-246
+            1237: 16,-246
+            1238: 17,-246
+            1239: 18,-246
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineN
@@ -1994,60 +1995,60 @@ entities:
             94: 0,-32
             95: 1,-32
             96: 2,-32
-            159: 2,-28
-            160: 1,-28
-            161: 0,-28
-            162: -1,-28
-            163: -2,-28
-            164: -3,-28
-            165: -4,-28
-            166: -5,-28
-            167: -6,-28
-            168: 3,-28
+            151: 2,-28
+            152: 1,-28
+            153: 0,-28
+            154: -1,-28
+            155: -2,-28
+            156: -3,-28
+            157: -4,-28
+            158: -5,-28
+            159: -6,-28
+            160: 3,-28
         - node:
             color: '#999453FF'
             id: MiniTileSteelLineS
           decals:
-            582: 5,-169
+            574: 5,-169
         - node:
             color: '#9FED58DD'
             id: MiniTileSteelLineS
           decals:
-            679: -3,-199
-            680: -4,-199
-            681: -5,-199
-            682: -6,-199
-            683: -7,-199
+            671: -3,-199
+            672: -4,-199
+            673: -5,-199
+            674: -6,-199
+            675: -7,-199
         - node:
             color: '#D381C996'
             id: MiniTileSteelLineS
           decals:
-            725: -5,-56
-            726: -4,-56
-            896: 8,-309
-            897: 7,-309
-            898: 6,-309
-            899: 5,-309
-            900: 4,-309
-            901: 3,-309
-            902: 2,-309
-            1208: -2,-310
-            1209: -3,-310
-            1210: -4,-310
-            1211: -5,-310
-            1212: -6,-310
-            1213: -7,-310
+            717: -5,-56
+            718: -4,-56
+            888: 8,-309
+            889: 7,-309
+            890: 6,-309
+            891: 5,-309
+            892: 4,-309
+            893: 3,-309
+            894: 2,-309
+            1200: -2,-310
+            1201: -3,-310
+            1202: -4,-310
+            1203: -5,-310
+            1204: -6,-310
+            1205: -7,-310
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelLineS
           decals:
-            1096: -6,-362
-            1097: -5,-362
+            1088: -6,-362
+            1089: -5,-362
         - node:
             color: '#EFB34196'
             id: MiniTileSteelLineS
           decals:
-            1259: 16,-262
+            1251: 16,-262
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineS
@@ -2059,160 +2060,160 @@ entities:
             88: 0,-29
             89: 1,-29
             90: 2,-29
-            147: -2,-33
-            148: -3,-33
-            149: -4,-33
-            150: -5,-33
-            151: -6,-33
-            152: 1,-33
-            153: 2,-33
-            154: 3,-33
+            141: -2,-33
+            142: -3,-33
+            143: -4,-33
+            144: -5,-33
+            145: -6,-33
+            146: 1,-33
+            147: 2,-33
+            148: 3,-33
         - node:
             color: '#5A64BC93'
             id: MiniTileSteelLineW
           decals:
-            1164: 6,-367
-            1165: 6,-368
+            1156: 6,-367
+            1157: 6,-368
         - node:
             color: '#5ABC5A93'
             id: MiniTileSteelLineW
           decals:
-            1152: -7,-367
-            1153: -7,-368
+            1144: -7,-367
+            1145: -7,-368
         - node:
             color: '#999453FF'
             id: MiniTileSteelLineW
           decals:
-            583: 4,-168
+            575: 4,-168
         - node:
             color: '#9FED58CF'
             id: MiniTileSteelLineW
           decals:
-            1351: -7,-195
+            1343: -7,-195
         - node:
             color: '#9FED58DB'
             id: MiniTileSteelLineW
           decals:
-            643: -6,-207
-            644: -6,-206
-            645: -6,-205
-            646: -6,-203
-            647: -6,-202
-            648: -6,-201
+            635: -6,-207
+            636: -6,-206
+            637: -6,-205
+            638: -6,-203
+            639: -6,-202
+            640: -6,-201
         - node:
             color: '#9FED58DD'
             id: MiniTileSteelLineW
           decals:
-            671: -3,-201
-            672: -3,-202
-            673: -3,-203
-            674: -3,-204
-            675: -3,-205
-            676: -3,-206
-            677: -3,-207
-            678: -3,-208
-            684: -7,-199
-            685: -7,-198
-            686: -7,-197
-            687: -7,-196
+            663: -3,-201
+            664: -3,-202
+            665: -3,-203
+            666: -3,-204
+            667: -3,-205
+            668: -3,-206
+            669: -3,-207
+            670: -3,-208
+            676: -7,-199
+            677: -7,-198
+            678: -7,-197
+            679: -7,-196
         - node:
             color: '#A45ABC93'
             id: MiniTileSteelLineW
           decals:
-            1156: -7,-364
-            1157: -7,-365
+            1148: -7,-364
+            1149: -7,-365
         - node:
             color: '#BCBC5A93'
             id: MiniTileSteelLineW
           decals:
-            1160: 6,-364
-            1161: 6,-365
+            1152: 6,-364
+            1153: 6,-365
         - node:
             color: '#D381C996'
             id: MiniTileSteelLineW
           decals:
-            724: -6,-55
-            1056: -1,-299
-            1057: -1,-300
-            1058: -1,-301
-            1059: -1,-302
-            1060: -1,-304
-            1061: -1,-303
-            1062: -1,-305
-            1063: -1,-306
-            1064: -1,-307
-            1065: -1,-311
-            1066: -1,-312
-            1067: -1,-313
-            1068: -1,-314
-            1069: -1,-315
-            1070: -1,-316
-            1071: -1,-317
-            1072: -1,-318
-            1073: -1,-319
-            1074: -1,-320
+            716: -6,-55
+            1048: -1,-299
+            1049: -1,-300
+            1050: -1,-301
+            1051: -1,-302
+            1052: -1,-304
+            1053: -1,-303
+            1054: -1,-305
+            1055: -1,-306
+            1056: -1,-307
+            1057: -1,-311
+            1058: -1,-312
+            1059: -1,-313
+            1060: -1,-314
+            1061: -1,-315
+            1062: -1,-316
+            1063: -1,-317
+            1064: -1,-318
+            1065: -1,-319
+            1066: -1,-320
         - node:
             color: '#DE3A3A96'
             id: MiniTileSteelLineW
           decals:
-            1077: -2,-358
-            1078: -2,-359
-            1098: -4,-363
-            1099: -4,-364
-            1100: -4,-367
-            1150: -4,-365
-            1151: -4,-366
+            1069: -2,-358
+            1070: -2,-359
+            1090: -4,-363
+            1091: -4,-364
+            1092: -4,-367
+            1142: -4,-365
+            1143: -4,-366
         - node:
             color: '#EFB34196'
             id: MiniTileSteelLineW
           decals:
-            1230: 15,-258
-            1231: 15,-257
-            1232: 15,-256
-            1233: 14,-252
-            1234: 14,-253
-            1235: 14,-254
-            1240: 15,-250
-            1241: 15,-249
-            1242: 15,-248
-            1243: 15,-247
-            1256: 15,-260
-            1257: 15,-261
+            1222: 15,-258
+            1223: 15,-257
+            1224: 15,-256
+            1225: 14,-252
+            1226: 14,-253
+            1227: 14,-254
+            1232: 15,-250
+            1233: 15,-249
+            1234: 15,-248
+            1235: 15,-247
+            1248: 15,-260
+            1249: 15,-261
         - node:
             color: '#FFFFFFFF'
             id: MiniTileSteelLineW
           decals:
             97: 3,-30
             98: 3,-31
-            124: -1,-45
-            125: -1,-44
-            126: -1,-43
-            127: -1,-42
-            128: -1,-41
-            129: -1,-40
-            130: -1,-39
-            131: -1,-38
-            132: -1,-37
-            133: -1,-36
-            134: -1,-35
-            135: -1,-34
-            525: -1,-152
-            526: -1,-151
-            527: -1,-149
-            528: -1,-150
-            529: -1,-148
-            530: -1,-147
-            531: -1,-146
-            532: -1,-145
-            533: -1,-144
-            534: -1,-143
-            535: -1,-142
-            536: -1,-141
-            537: -1,-140
-            538: -1,-139
-            539: -1,-138
-            540: -1,-137
-            541: -1,-136
+            120: -1,-45
+            121: -1,-44
+            122: -1,-43
+            123: -1,-42
+            124: -1,-41
+            125: -1,-40
+            126: -1,-39
+            127: -1,-38
+            128: -1,-37
+            129: -1,-36
+            130: -1,-35
+            131: -1,-34
+            517: -1,-152
+            518: -1,-151
+            519: -1,-149
+            520: -1,-150
+            521: -1,-148
+            522: -1,-147
+            523: -1,-146
+            524: -1,-145
+            525: -1,-144
+            526: -1,-143
+            527: -1,-142
+            528: -1,-141
+            529: -1,-140
+            530: -1,-139
+            531: -1,-138
+            532: -1,-137
+            533: -1,-136
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteCornerNe
@@ -2220,97 +2221,97 @@ entities:
             34: 2,-2
             41: 6,-5
             70: -1,-10
-            871: 30,-307
-            1356: 2,-15
+            863: 30,-307
+            1348: 2,-15
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerNe
           decals:
-            620: 8,-172
+            612: 8,-172
         - node:
             color: '#79150096'
             id: MiniTileWhiteCornerNe
           decals:
-            1054: 0,-63
+            1046: 0,-63
         - node:
             color: '#999453FF'
             id: MiniTileWhiteCornerNe
           decals:
-            579: 7,-166
+            571: 7,-166
         - node:
             color: '#9FED58CF'
             id: MiniTileWhiteCornerNe
           decals:
-            1336: -4,-195
+            1328: -4,-195
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerNe
           decals:
-            860: 6,-285
+            852: 6,-285
         - node:
             color: '#D381C996'
             id: MiniTileWhiteCornerNe
           decals:
-            939: -3,-300
-            950: 4,-300
-            954: 7,-302
-            971: 7,-311
-            977: 8,-316
-            998: -3,-312
+            931: -3,-300
+            942: 4,-300
+            946: 7,-302
+            963: 7,-311
+            969: 8,-316
+            990: -3,-312
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteCornerNe
           decals:
-            1143: 1,-363
+            1135: 1,-363
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteCornerNw
           decals:
             33: 1,-2
             69: -4,-10
-            870: 28,-307
+            862: 28,-307
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerNw
           decals:
-            619: 3,-172
+            611: 3,-172
         - node:
             color: '#79150096'
             id: MiniTileWhiteCornerNw
           decals:
-            1053: -1,-63
+            1045: -1,-63
         - node:
             color: '#999453FF'
             id: MiniTileWhiteCornerNw
           decals:
-            564: 3,-166
+            556: 3,-166
         - node:
             color: '#9FED58CF'
             id: MiniTileWhiteCornerNw
           decals:
-            1337: -6,-195
+            1329: -6,-195
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerNw
           decals:
-            831: -1,-277
-            859: 4,-285
+            823: -1,-277
+            851: 4,-285
         - node:
             color: '#D381C996'
             id: MiniTileWhiteCornerNw
           decals:
-            937: -4,-300
-            949: 3,-300
-            979: 3,-311
-            999: -4,-312
-            1003: -6,-314
-            1055: -9,-318
-            1227: -7,-301
+            929: -4,-300
+            941: 3,-300
+            971: 3,-311
+            991: -4,-312
+            995: -6,-314
+            1047: -9,-318
+            1219: -7,-301
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteCornerNw
           decals:
-            1141: -1,-363
+            1133: -1,-363
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteCornerSe
@@ -2318,45 +2319,45 @@ entities:
             3: 2,0
             49: 6,-13
             72: -1,-12
-            869: 30,-309
+            861: 30,-309
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerSe
           decals:
-            611: 8,-179
+            603: 8,-179
         - node:
             color: '#79150096'
             id: MiniTileWhiteCornerSe
           decals:
-            1051: 0,-64
+            1043: 0,-64
         - node:
             color: '#999453FF'
             id: MiniTileWhiteCornerSe
           decals:
-            565: 7,-170
+            557: 7,-170
         - node:
             color: '#9FED58DB'
             id: MiniTileWhiteCornerSe
           decals:
-            639: -4,-198
+            631: -4,-198
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerSe
           decals:
-            857: 6,-286
+            849: 6,-286
         - node:
             color: '#D381C996'
             id: MiniTileWhiteCornerSe
           decals:
-            934: -3,-306
-            960: 7,-305
-            976: 8,-317
-            990: -3,-320
+            926: -3,-306
+            952: 7,-305
+            968: 8,-317
+            982: -3,-320
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteCornerSe
           decals:
-            1147: 1,-367
+            1139: 1,-367
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteCornerSw
@@ -2364,57 +2365,57 @@ entities:
             4: -2,0
             54: 1,-13
             67: -4,-12
-            868: 28,-309
+            860: 28,-309
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteCornerSw
           decals:
-            612: 7,-179
-            617: 3,-177
+            604: 7,-179
+            609: 3,-177
         - node:
             color: '#79150096'
             id: MiniTileWhiteCornerSw
           decals:
-            1052: -1,-64
+            1044: -1,-64
         - node:
             color: '#999453FF'
             id: MiniTileWhiteCornerSw
           decals:
-            566: 3,-170
+            558: 3,-170
         - node:
             color: '#9FED58DB'
             id: MiniTileWhiteCornerSw
           decals:
-            640: -6,-198
+            632: -6,-198
         - node:
             color: '#A4610696'
             id: MiniTileWhiteCornerSw
           decals:
-            830: -1,-283
-            858: 4,-286
+            822: -1,-283
+            850: 4,-286
         - node:
             color: '#D381C996'
             id: MiniTileWhiteCornerSw
           decals:
-            930: -7,-306
-            961: 3,-305
-            970: 3,-317
-            983: -9,-320
+            922: -7,-306
+            953: 3,-305
+            962: 3,-317
+            975: -9,-320
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteCornerSw
           decals:
-            1148: -1,-367
+            1140: -1,-367
         - node:
             color: '#9FED5896'
             id: MiniTileWhiteEndN
           decals:
-            1333: -5,-196
+            1325: -5,-196
         - node:
             color: '#9FED5896'
             id: MiniTileWhiteEndS
           decals:
-            1334: -5,-197
+            1326: -5,-197
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteInnerNe
@@ -2424,74 +2425,74 @@ entities:
             color: '#A4610696'
             id: MiniTileWhiteInnerNe
           decals:
-            855: 0,-282
+            847: 0,-282
         - node:
             color: '#D381C996'
             id: MiniTileWhiteInnerNe
           decals:
-            962: 4,-302
-            978: 7,-316
+            954: 4,-302
+            970: 7,-316
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteInnerNw
           decals:
-            718: 5,-206
-            1331: -8,-310
+            710: 5,-206
+            1323: -8,-310
         - node:
             color: '#A4610696'
             id: MiniTileWhiteInnerNw
           decals:
-            856: 7,-282
+            848: 7,-282
         - node:
             color: '#D381C996'
             id: MiniTileWhiteInnerNw
           decals:
-            938: -4,-301
-            1002: -4,-314
-            1008: -6,-318
-            1326: -7,-192
+            930: -4,-301
+            994: -4,-314
+            1000: -6,-318
+            1318: -7,-192
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteInnerSe
           decals:
-            634: 1,-169
+            626: 1,-169
         - node:
             color: '#A4610696'
             id: MiniTileWhiteInnerSe
           decals:
-            854: 0,-278
+            846: 0,-278
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteInnerSe
           decals:
-            1134: -2.241021,-361.4977
-            1135: -2.4992852,-361.7559
-            1136: -2.7401419,-362.00235
+            1126: -2.241021,-361.4977
+            1127: -2.4992852,-361.7559
+            1128: -2.7401419,-362.00235
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteInnerSw
           decals:
-            618: 7,-177
-            719: 5,-191
-            1332: -8,-308
+            610: 7,-177
+            711: 5,-191
+            1324: -8,-308
         - node:
             color: '#A4610696'
             id: MiniTileWhiteInnerSw
           decals:
-            853: 7,-278
+            845: 7,-278
         - node:
             color: '#D381C996'
             id: MiniTileWhiteInnerSw
           decals:
-            1327: -7,-190
+            1319: -7,-190
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteInnerSw
           decals:
-            1130: 2.7602181,-362.00235
-            1131: 2.5136933,-361.7559
-            1132: 2.2476032,-361.486
-            1133: 2.0089047,-361.2591
+            1122: 2.7602181,-362.00235
+            1123: 2.5136933,-361.7559
+            1124: 2.2476032,-361.486
+            1125: 2.0089047,-361.2591
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteLineE
@@ -2508,104 +2509,104 @@ entities:
             47: 6,-11
             48: 6,-12
             71: -1,-11
-            863: 26,-306
-            864: 26,-307
-            865: 26,-308
-            866: 26,-309
-            867: 26,-310
-            875: 30,-308
-            926: 12,-308
-            927: 12,-307
-            928: 12,-309
-            1357: 2,-16
-            1358: 2,-17
-            1359: 2,-18
+            855: 26,-306
+            856: 26,-307
+            857: 26,-308
+            858: 26,-309
+            859: 26,-310
+            867: 30,-308
+            918: 12,-308
+            919: 12,-307
+            920: 12,-309
+            1349: 2,-16
+            1350: 2,-17
+            1351: 2,-18
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteLineE
           decals:
-            589: -2,-178
-            590: -2,-177
-            591: -2,-176
-            592: -2,-175
-            593: -2,-174
-            594: -2,-173
-            605: 8,-173
-            606: 8,-174
-            607: 8,-175
-            608: 8,-176
-            609: 8,-177
-            610: 8,-178
-            625: 1,-178
-            626: 1,-177
-            627: 1,-176
-            628: 1,-175
-            629: 1,-174
-            630: 1,-173
-            631: 1,-172
-            632: 1,-171
-            633: 1,-170
-            730: 1,-179
-            731: 1,-180
+            581: -2,-178
+            582: -2,-177
+            583: -2,-176
+            584: -2,-175
+            585: -2,-174
+            586: -2,-173
+            597: 8,-173
+            598: 8,-174
+            599: 8,-175
+            600: 8,-176
+            601: 8,-177
+            602: 8,-178
+            617: 1,-178
+            618: 1,-177
+            619: 1,-176
+            620: 1,-175
+            621: 1,-174
+            622: 1,-173
+            623: 1,-172
+            624: 1,-171
+            625: 1,-170
+            722: 1,-179
+            723: 1,-180
         - node:
             color: '#999453FF'
             id: MiniTileWhiteLineE
           decals:
-            567: 7,-169
-            568: 7,-168
-            569: 7,-167
+            559: 7,-169
+            560: 7,-168
+            561: 7,-167
         - node:
             color: '#9FED58CF'
             id: MiniTileWhiteLineE
           decals:
-            1339: -4,-196
+            1331: -4,-196
         - node:
             color: '#9FED58DB'
             id: MiniTileWhiteLineE
           decals:
-            641: -4,-197
+            633: -4,-197
         - node:
             color: '#A4610696'
             id: MiniTileWhiteLineE
           decals:
-            850: 0,-281
-            851: 0,-280
-            852: 0,-279
+            842: 0,-281
+            843: 0,-280
+            844: 0,-279
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineE
           decals:
-            940: -3,-301
-            941: -3,-302
-            942: -3,-303
-            943: -3,-304
-            944: -3,-305
-            951: 4,-301
-            955: 7,-303
-            956: 7,-304
-            972: 7,-312
-            973: 7,-313
-            974: 7,-314
-            975: 7,-315
-            991: -3,-319
-            992: -3,-318
-            993: -3,-317
-            994: -3,-316
-            995: -3,-315
-            996: -3,-314
-            997: -3,-313
+            932: -3,-301
+            933: -3,-302
+            934: -3,-303
+            935: -3,-304
+            936: -3,-305
+            943: 4,-301
+            947: 7,-303
+            948: 7,-304
+            964: 7,-312
+            965: 7,-313
+            966: 7,-314
+            967: 7,-315
+            983: -3,-319
+            984: -3,-318
+            985: -3,-317
+            986: -3,-316
+            987: -3,-315
+            988: -3,-314
+            989: -3,-313
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteLineE
           decals:
-            1125: -3,-363
-            1126: -3,-364
-            1127: -3,-365
-            1128: -3,-366
-            1129: -3,-367
-            1144: 1,-364
-            1145: 1,-365
-            1146: 1,-366
+            1117: -3,-363
+            1118: -3,-364
+            1119: -3,-365
+            1120: -3,-366
+            1121: -3,-367
+            1136: 1,-364
+            1137: 1,-365
+            1138: 1,-366
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteLineN
@@ -2616,74 +2617,74 @@ entities:
             75: -3,-10
             76: -2,-10
             80: 1,-15
-            874: 29,-307
+            866: 29,-307
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteLineN
           decals:
-            621: 4,-172
-            622: 5,-172
-            623: 6,-172
-            624: 7,-172
-            711: 4,-206
-            712: 3,-206
-            713: 1,-206
-            714: 2,-206
-            715: 0,-206
-            716: -1,-206
-            1330: -9,-310
+            613: 4,-172
+            614: 5,-172
+            615: 6,-172
+            616: 7,-172
+            703: 4,-206
+            704: 3,-206
+            705: 1,-206
+            706: 2,-206
+            707: 0,-206
+            708: -1,-206
+            1322: -9,-310
         - node:
             color: '#999453FF'
             id: MiniTileWhiteLineN
           decals:
-            576: 4,-166
-            577: 5,-166
-            578: 6,-166
+            568: 4,-166
+            569: 5,-166
+            570: 6,-166
         - node:
             color: '#9FED58CF'
             id: MiniTileWhiteLineN
           decals:
-            1338: -5,-195
+            1330: -5,-195
         - node:
             color: '#A4610696'
             id: MiniTileWhiteLineN
           decals:
-            816: 0,-277
-            817: 1,-277
-            818: 2,-277
-            819: 3,-277
-            820: 4,-277
-            821: 5,-277
-            822: 6,-277
-            823: 7,-277
-            824: 8,-277
-            832: 1,-282
-            833: 2,-282
-            834: 3,-282
-            835: 4,-282
-            836: 5,-282
-            837: 6,-282
-            862: 5,-285
+            808: 0,-277
+            809: 1,-277
+            810: 2,-277
+            811: 3,-277
+            812: 4,-277
+            813: 5,-277
+            814: 6,-277
+            815: 7,-277
+            816: 8,-277
+            824: 1,-282
+            825: 2,-282
+            826: 3,-282
+            827: 4,-282
+            828: 5,-282
+            829: 6,-282
+            854: 5,-285
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineN
           decals:
-            952: 5,-302
-            953: 6,-302
-            963: 4,-311
-            964: 5,-311
-            965: 6,-311
-            984: -8,-318
-            1001: -5,-314
-            1007: -7,-318
-            1225: -5,-301
-            1226: -6,-301
-            1323: -8,-192
+            944: 5,-302
+            945: 6,-302
+            955: 4,-311
+            956: 5,-311
+            957: 6,-311
+            976: -8,-318
+            993: -5,-314
+            999: -7,-318
+            1217: -5,-301
+            1218: -6,-301
+            1315: -8,-192
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteLineN
           decals:
-            1142: 0,-363
+            1134: 0,-363
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteLineS
@@ -2694,79 +2695,79 @@ entities:
             53: 2,-13
             73: -2,-12
             74: -3,-12
-            873: 29,-309
+            865: 29,-309
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteLineS
           decals:
-            614: 6,-177
-            615: 5,-177
-            616: 4,-177
-            635: 2,-169
-            705: 4,-191
-            706: 3,-191
-            707: 2,-191
-            708: 1,-191
-            709: 0,-191
-            710: -1,-191
-            1328: -9,-308
+            606: 6,-177
+            607: 5,-177
+            608: 4,-177
+            627: 2,-169
+            697: 4,-191
+            698: 3,-191
+            699: 2,-191
+            700: 1,-191
+            701: 0,-191
+            702: -1,-191
+            1320: -9,-308
         - node:
             color: '#999453FF'
             id: MiniTileWhiteLineS
           decals:
-            573: 4,-170
-            574: 5,-170
-            575: 6,-170
+            565: 4,-170
+            566: 5,-170
+            567: 6,-170
         - node:
             color: '#9FED58DB'
             id: MiniTileWhiteLineS
           decals:
-            638: -5,-198
+            630: -5,-198
         - node:
             color: '#A4610696'
             id: MiniTileWhiteLineS
           decals:
-            807: 0,-283
-            808: 1,-283
-            809: 2,-283
-            810: 3,-283
-            811: 4,-283
-            812: 5,-283
-            813: 6,-283
-            814: 7,-283
-            815: 8,-283
-            838: 1,-278
-            839: 2,-278
-            840: 3,-278
-            841: 4,-278
-            842: 5,-278
-            843: 6,-278
-            861: 5,-286
+            799: 0,-283
+            800: 1,-283
+            801: 2,-283
+            802: 3,-283
+            803: 4,-283
+            804: 5,-283
+            805: 6,-283
+            806: 7,-283
+            807: 8,-283
+            830: 1,-278
+            831: 2,-278
+            832: 3,-278
+            833: 4,-278
+            834: 5,-278
+            835: 6,-278
+            853: 5,-286
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineS
           decals:
-            931: -6,-306
-            932: -5,-306
-            933: -4,-306
-            957: 4,-305
-            958: 5,-305
-            959: 6,-305
-            966: 4,-317
-            967: 5,-317
-            968: 6,-317
-            969: 7,-317
-            985: -8,-320
-            986: -7,-320
-            987: -6,-320
-            988: -5,-320
-            989: -4,-320
-            1324: -8,-190
+            923: -6,-306
+            924: -5,-306
+            925: -4,-306
+            949: 4,-305
+            950: 5,-305
+            951: 6,-305
+            958: 4,-317
+            959: 5,-317
+            960: 6,-317
+            961: 7,-317
+            977: -8,-320
+            978: -7,-320
+            979: -6,-320
+            980: -5,-320
+            981: -4,-320
+            1316: -8,-190
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteLineS
           decals:
-            1149: 0,-367
+            1141: 0,-367
         - node:
             color: '#334E6DC8'
             id: MiniTileWhiteLineW
@@ -2780,117 +2781,117 @@ entities:
             29: 1,-4
             66: 1,-12
             68: -4,-11
-            872: 28,-308
+            864: 28,-308
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteLineW
           decals:
-            595: -5,-178
-            596: -5,-177
-            597: -5,-176
-            598: -5,-175
-            599: -5,-174
-            600: -5,-173
-            601: 3,-176
-            602: 3,-175
-            603: 3,-174
-            604: 3,-173
-            613: 7,-178
-            692: 5,-204
-            693: 5,-203
-            694: 5,-202
-            695: 5,-201
-            696: 5,-200
-            697: 5,-199
-            698: 5,-198
-            699: 5,-197
-            700: 5,-196
-            701: 5,-195
-            702: 5,-194
-            703: 5,-193
-            704: 5,-192
-            717: 5,-205
-            1329: -8,-309
+            587: -5,-178
+            588: -5,-177
+            589: -5,-176
+            590: -5,-175
+            591: -5,-174
+            592: -5,-173
+            593: 3,-176
+            594: 3,-175
+            595: 3,-174
+            596: 3,-173
+            605: 7,-178
+            684: 5,-204
+            685: 5,-203
+            686: 5,-202
+            687: 5,-201
+            688: 5,-200
+            689: 5,-199
+            690: 5,-198
+            691: 5,-197
+            692: 5,-196
+            693: 5,-195
+            694: 5,-194
+            695: 5,-193
+            696: 5,-192
+            709: 5,-205
+            1321: -8,-309
         - node:
             color: '#999453FF'
             id: MiniTileWhiteLineW
           decals:
-            570: 3,-169
-            571: 3,-168
-            572: 3,-167
+            562: 3,-169
+            563: 3,-168
+            564: 3,-167
         - node:
             color: '#9FED58CF'
             id: MiniTileWhiteLineW
           decals:
-            1340: -6,-196
+            1332: -6,-196
         - node:
             color: '#9FED58DB'
             id: MiniTileWhiteLineW
           decals:
-            642: -6,-197
+            634: -6,-197
         - node:
             color: '#A4610696'
             id: MiniTileWhiteLineW
           decals:
-            825: -1,-278
-            826: -1,-279
-            827: -1,-280
-            828: -1,-281
-            829: -1,-282
-            847: 7,-281
-            848: 7,-280
-            849: 7,-279
+            817: -1,-278
+            818: -1,-279
+            819: -1,-280
+            820: -1,-281
+            821: -1,-282
+            839: 7,-281
+            840: 7,-280
+            841: 7,-279
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineW
           decals:
-            935: -7,-305
-            936: -7,-304
-            945: 3,-304
-            946: 3,-303
-            947: 3,-302
-            948: 3,-301
-            980: 3,-312
-            981: 3,-316
-            982: -9,-319
-            1000: -4,-313
-            1004: -6,-315
-            1005: -6,-316
-            1006: -6,-317
-            1228: -7,-302
-            1229: -7,-303
-            1325: -7,-191
+            927: -7,-305
+            928: -7,-304
+            937: 3,-304
+            938: 3,-303
+            939: 3,-302
+            940: 3,-301
+            972: 3,-312
+            973: 3,-316
+            974: -9,-319
+            992: -4,-313
+            996: -6,-315
+            997: -6,-316
+            998: -6,-317
+            1220: -7,-302
+            1221: -7,-303
+            1317: -7,-191
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteLineW
           decals:
-            1120: 3,-367
-            1121: 3,-366
-            1122: 3,-365
-            1123: 3,-364
-            1124: 3,-363
-            1138: -1,-366
-            1139: -1,-365
-            1140: -1,-364
+            1112: 3,-367
+            1113: 3,-366
+            1114: 3,-365
+            1115: 3,-364
+            1116: 3,-363
+            1130: -1,-366
+            1131: -1,-365
+            1132: -1,-364
         - node:
             color: '#639137FF'
             id: QuarterTileOverlayGreyscale180
           decals:
-            308: -9,-90
-            309: -8,-90
-            310: -7,-90
+            300: -9,-90
+            301: -8,-90
+            302: -7,-90
         - node:
             color: '#639137FF'
             id: QuarterTileOverlayGreyscale90
           decals:
-            305: -9,-84
-            306: -8,-84
-            307: -7,-84
+            297: -9,-84
+            298: -8,-84
+            299: -7,-84
         - node:
             color: '#FFFFFFFF'
             id: Rock02
           decals:
-            182: 3.4198463,-40.51108
+            174: 3.4198463,-40.51108
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -2898,28 +2899,28 @@ entities:
           decals:
             105: 6,-37
             106: 6,-44
-            1050: -3,-114
+            1042: -3,-114
         - node:
             color: '#FFFFFFFF'
             id: StandClear
           decals:
-            554: 0,-153
-            555: 0,-136
-            556: 0,-126
-            557: 0,-109
-            558: 0,-99
-            559: 0,-82
-            560: 0,-45
-            561: 0,-28
-            562: 0,-18
-            1195: 0,-163
-            1196: 0,-180
-            1197: 0,-190
-            1198: 0,-207
-            1199: 0,-244
-            1200: 0,-261
-            1201: 0,-271
-            1202: 0,-288
+            546: 0,-153
+            547: 0,-136
+            548: 0,-126
+            549: 0,-109
+            550: 0,-99
+            551: 0,-82
+            552: 0,-45
+            553: 0,-28
+            554: 0,-18
+            1187: 0,-163
+            1188: 0,-180
+            1189: 0,-190
+            1190: 0,-207
+            1191: 0,-244
+            1192: 0,-261
+            1193: 0,-271
+            1194: 0,-288
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -2927,17 +2928,17 @@ entities:
           decals:
             107: -6,-32
             108: -6,-30
-            1269: -2,-255
+            1261: -2,-255
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleNE
           decals:
-            1015: -8,-314
+            1007: -8,-314
         - node:
             color: '#DE3A3A96'
             id: WarnCornerGreyscaleNE
           decals:
-            1110: -4,-356
+            1102: -4,-356
         - node:
             color: '#334E6DC8'
             id: WarnCornerGreyscaleNW
@@ -2947,14 +2948,14 @@ entities:
             color: '#D381C996'
             id: WarnCornerGreyscaleNW
           decals:
-            1016: -10,-314
+            1008: -10,-314
         - node:
             color: '#DE3A3A96'
             id: WarnCornerGreyscaleNW
           decals:
-            1108: -6,-357
-            1109: -5,-356
-            1111: -7,-358
+            1100: -6,-357
+            1101: -5,-356
+            1103: -7,-358
         - node:
             color: '#334E6DC8'
             id: WarnCornerGreyscaleSE
@@ -2964,12 +2965,12 @@ entities:
             color: '#D381C996'
             id: WarnCornerGreyscaleSE
           decals:
-            1013: -8,-316
+            1005: -8,-316
         - node:
             color: '#DE3A3A96'
             id: WarnCornerGreyscaleSE
           decals:
-            1115: -4,-359
+            1107: -4,-359
         - node:
             color: '#334E6DC8'
             id: WarnCornerGreyscaleSW
@@ -2979,61 +2980,61 @@ entities:
             color: '#D381C996'
             id: WarnCornerGreyscaleSW
           decals:
-            1014: -10,-316
+            1006: -10,-316
         - node:
             color: '#DE3A3A96'
             id: WarnCornerGreyscaleSW
           decals:
-            1112: -7,-359
+            1104: -7,-359
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
           decals:
-            883: 4,-313
-            1379: 7,-337
+            875: 4,-313
+            1371: 7,-337
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNW
           decals:
-            1378: 5,-337
+            1370: 5,-337
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSE
           decals:
-            885: 4,-315
-            1442: 7,-343
+            877: 4,-315
+            1434: 7,-343
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSW
           decals:
-            1440: 5,-343
+            1432: 5,-343
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallGreyscaleNE
           decals:
-            880: 20,-310
+            872: 20,-310
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallGreyscaleNW
           decals:
-            1341: 24,-310
+            1333: 24,-310
         - node:
             color: '#DE3A3A96'
             id: WarnCornerSmallGreyscaleNW
           decals:
             15: -3,-4
-            1118: -6,-358
-            1119: -5,-357
+            1110: -6,-358
+            1111: -5,-357
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallGreyscaleSE
           decals:
-            879: 20,-306
+            871: 20,-306
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallGreyscaleSW
           decals:
-            881: 24,-306
+            873: 24,-306
         - node:
             color: '#DE3A3A96'
             id: WarnCornerSmallGreyscaleSW
@@ -3043,12 +3044,12 @@ entities:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSE
           decals:
-            1381: 5,-337
+            1373: 5,-337
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerSmallSW
           decals:
-            1380: 7,-337
+            1372: 7,-337
         - node:
             color: '#DE3A3A96'
             id: WarnFullGreyscale
@@ -3058,32 +3059,32 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            886: 4,-314
-            887: 1,-315
-            888: 1,-314
-            889: 1,-313
-            1373: 7,-338
-            1374: 5,-339
-            1375: 5,-338
-            1383: 7,-339
-            1443: 8,-341
+            878: 4,-314
+            879: 1,-315
+            880: 1,-314
+            881: 1,-313
+            1365: 7,-338
+            1366: 5,-339
+            1367: 5,-338
+            1375: 7,-339
+            1435: 8,-341
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleE
           decals:
-            877: 20,-309
-            878: 20,-307
+            869: 20,-309
+            870: 20,-307
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
           decals:
-            1011: -8,-315
+            1003: -8,-315
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleE
           decals:
-            1116: -4,-358
-            1117: -4,-357
+            1108: -4,-358
+            1109: -4,-357
         - node:
             color: '#334E6DC8'
             id: WarnLineGreyscaleN
@@ -3097,7 +3098,7 @@ entities:
             color: '#D381C996'
             id: WarnLineGreyscaleN
           decals:
-            1012: -9,-314
+            1004: -9,-314
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleN
@@ -3111,10 +3112,10 @@ entities:
             color: '#EFB34196'
             id: WarnLineGreyscaleN
           decals:
-            1261: 13,-257
-            1262: 12,-257
-            1263: 11,-257
-            1264: 10,-257
+            1253: 13,-257
+            1254: 12,-257
+            1255: 11,-257
+            1256: 10,-257
         - node:
             color: '#334E6DC8'
             id: WarnLineGreyscaleS
@@ -3128,7 +3129,7 @@ entities:
             color: '#D381C996'
             id: WarnLineGreyscaleS
           decals:
-            1009: -9,-316
+            1001: -9,-316
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleS
@@ -3138,16 +3139,16 @@ entities:
             17: -3,-4
             18: -2,-4
             19: -1,-4
-            1113: -6,-359
-            1114: -5,-359
+            1105: -6,-359
+            1106: -5,-359
         - node:
             color: '#EFB34196'
             id: WarnLineGreyscaleS
           decals:
-            1265: 10,-249
-            1266: 11,-249
-            1267: 12,-249
-            1268: 13,-249
+            1257: 10,-249
+            1258: 11,-249
+            1259: 12,-249
+            1260: 13,-249
         - node:
             color: '#334E6DC8'
             id: WarnLineGreyscaleW
@@ -3159,13 +3160,13 @@ entities:
             color: '#9FED5896'
             id: WarnLineGreyscaleW
           decals:
-            876: 24,-307
-            1335: 24,-309
+            868: 24,-307
+            1327: 24,-309
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleW
           decals:
-            1010: -10,-315
+            1002: -10,-315
         - node:
             color: '#DE3A3A96'
             id: WarnLineGreyscaleW
@@ -3175,217 +3176,217 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            884: 3,-315
-            1376: 6,-337
-            1441: 6,-343
+            876: 3,-315
+            1368: 6,-337
+            1433: 6,-343
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            1370: 5,-339
-            1371: 5,-338
-            1372: 7,-338
-            1382: 7,-339
+            1362: 5,-339
+            1363: 5,-338
+            1364: 7,-338
+            1374: 7,-339
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            882: 3,-313
-            1377: 6,-337
+            874: 3,-313
+            1369: 6,-337
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNe
           decals:
-            210: -1,-59
-            225: -1,-67
+            202: -1,-59
+            217: -1,-67
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerNw
           decals:
-            206: -6,-59
-            243: -2,-62
+            198: -6,-59
+            235: -2,-62
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSe
           decals:
-            192: -1,-68
-            238: -1,-60
+            184: -1,-68
+            230: -1,-60
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinCornerSw
           decals:
-            197: -6,-68
-            240: -2,-65
+            189: -6,-68
+            232: -2,-65
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNe
           decals:
             79: -5,1
-            228: -4,-67
-            257: -2,-65
-            260: -1,-64
-            264: 0,-63
-            267: 0,-58
+            220: -4,-67
+            249: -2,-65
+            252: -1,-64
+            256: 0,-63
+            259: 0,-58
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerNw
           decals:
-            221: 1,-70
-            245: 0,-62
-            258: 1,-65
-            259: 0,-64
-            265: -1,-63
+            213: 1,-70
+            237: 0,-62
+            250: 1,-65
+            251: 0,-64
+            257: -1,-63
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSe
           decals:
-            235: -4,-60
-            256: -2,-62
-            262: -1,-63
-            263: 0,-64
-            268: 0,-69
+            227: -4,-60
+            248: -2,-62
+            254: -1,-63
+            255: 0,-64
+            260: 0,-69
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinInnerSw
           decals:
-            214: 1,-57
-            246: 0,-65
-            255: 1,-62
-            261: 0,-63
-            266: -1,-64
+            206: 1,-57
+            238: 0,-65
+            247: 1,-62
+            253: 0,-63
+            258: -1,-64
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineE
           decals:
             77: -5,2
-            229: -4,-66
-            230: -4,-65
-            231: -4,-64
-            232: -4,-63
-            233: -4,-62
-            234: -4,-61
-            249: -2,-64
-            250: -2,-63
-            467: -7,-111
-            468: -7,-110
-            469: -7,-109
-            470: -7,-108
-            474: 2,-122
-            475: 2,-121
-            476: 2,-120
-            504: -4,-145
-            505: -4,-146
-            506: -4,-147
-            507: -4,-149
-            508: -4,-148
-            509: -4,-143
-            510: -4,-142
-            511: -4,-141
-            512: -4,-140
-            513: -4,-139
+            221: -4,-66
+            222: -4,-65
+            223: -4,-64
+            224: -4,-63
+            225: -4,-62
+            226: -4,-61
+            241: -2,-64
+            242: -2,-63
+            459: -7,-111
+            460: -7,-110
+            461: -7,-109
+            462: -7,-108
+            466: 2,-122
+            467: 2,-121
+            468: 2,-120
+            496: -4,-145
+            497: -4,-146
+            498: -4,-147
+            499: -4,-149
+            500: -4,-148
+            501: -4,-143
+            502: -4,-142
+            503: -4,-141
+            504: -4,-140
+            505: -4,-139
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineN
           decals:
             78: -4,1
-            207: -5,-59
-            208: -4,-59
-            209: -2,-59
-            218: -2,-70
-            219: -1,-70
-            220: 0,-70
-            226: -2,-67
-            227: -3,-67
-            244: -1,-62
-            247: -1,-65
-            248: 0,-65
-            431: -9,-125
-            432: -7,-125
-            433: -8,-125
-            434: -9,-122
-            435: -8,-122
-            436: -7,-122
-            437: -9,-119
-            438: -8,-119
-            439: -7,-119
-            440: -9,-116
-            441: -8,-116
-            442: -7,-116
-            443: -9,-113
-            444: -8,-113
-            445: -7,-113
+            199: -5,-59
+            200: -4,-59
+            201: -2,-59
+            210: -2,-70
+            211: -1,-70
+            212: 0,-70
+            218: -2,-67
+            219: -3,-67
+            236: -1,-62
+            239: -1,-65
+            240: 0,-65
+            423: -9,-125
+            424: -7,-125
+            425: -8,-125
+            426: -9,-122
+            427: -8,-122
+            428: -7,-122
+            429: -9,-119
+            430: -8,-119
+            431: -7,-119
+            432: -9,-116
+            433: -8,-116
+            434: -7,-116
+            435: -9,-113
+            436: -8,-113
+            437: -7,-113
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineS
           decals:
-            193: -2,-68
-            194: -4,-68
-            195: -3,-68
-            196: -5,-68
-            215: 0,-57
-            216: -1,-57
-            217: -2,-57
-            236: -3,-60
-            237: -2,-60
-            239: -1,-65
-            251: -1,-62
-            252: 0,-62
-            415: -9,-114
-            416: -8,-114
-            417: -7,-114
-            418: -9,-117
-            419: -8,-117
-            420: -7,-117
-            421: -7,-120
-            422: -7,-120
-            423: -8,-120
-            424: -9,-120
-            425: -9,-123
-            426: -8,-123
-            427: -7,-123
-            428: -9,-126
-            429: -8,-126
-            430: -7,-126
+            185: -2,-68
+            186: -4,-68
+            187: -3,-68
+            188: -5,-68
+            207: 0,-57
+            208: -1,-57
+            209: -2,-57
+            228: -3,-60
+            229: -2,-60
+            231: -1,-65
+            243: -1,-62
+            244: 0,-62
+            407: -9,-114
+            408: -8,-114
+            409: -7,-114
+            410: -9,-117
+            411: -8,-117
+            412: -7,-117
+            413: -7,-120
+            414: -7,-120
+            415: -8,-120
+            416: -9,-120
+            417: -9,-123
+            418: -8,-123
+            419: -7,-123
+            420: -9,-126
+            421: -8,-126
+            422: -7,-126
         - node:
             color: '#FFFFFFFF'
             id: WoodTrimThinLineW
           decals:
-            198: -6,-67
-            199: -6,-66
-            200: -6,-65
-            201: -6,-64
-            202: -6,-63
-            203: -6,-62
-            204: -6,-61
-            205: -6,-60
-            211: 1,-60
-            212: 1,-59
-            213: 1,-58
-            222: 1,-69
-            223: 1,-68
-            224: 1,-67
-            241: -2,-64
-            242: -2,-63
-            253: 1,-63
-            254: 1,-64
-            463: -9,-111
-            464: -9,-110
-            465: -9,-109
-            466: -9,-108
-            471: -2,-122
-            472: -2,-121
-            473: -2,-120
-            514: -6,-139
-            515: -6,-140
-            516: -6,-141
-            517: -6,-142
-            518: -6,-143
-            519: -6,-144
-            520: -6,-145
-            521: -6,-146
-            522: -6,-147
-            523: -6,-148
-            524: -6,-149
+            190: -6,-67
+            191: -6,-66
+            192: -6,-65
+            193: -6,-64
+            194: -6,-63
+            195: -6,-62
+            196: -6,-61
+            197: -6,-60
+            203: 1,-60
+            204: 1,-59
+            205: 1,-58
+            214: 1,-69
+            215: 1,-68
+            216: 1,-67
+            233: -2,-64
+            234: -2,-63
+            245: 1,-63
+            246: 1,-64
+            455: -9,-111
+            456: -9,-110
+            457: -9,-109
+            458: -9,-108
+            463: -2,-122
+            464: -2,-121
+            465: -2,-120
+            506: -6,-139
+            507: -6,-140
+            508: -6,-141
+            509: -6,-142
+            510: -6,-143
+            511: -6,-144
+            512: -6,-145
+            513: -6,-146
+            514: -6,-147
+            515: -6,-148
+            516: -6,-149
         - node:
             color: '#DE3A3AFF'
             id: beepsky
@@ -3400,12 +3401,12 @@ entities:
             color: '#FFFFFFFF'
             id: guy
           decals:
-            1049: 4.9812827,-108.55144
+            1041: 4.9812827,-108.55144
         - node:
             color: '#FFFFFFFF'
             id: skull
           decals:
-            1301: -7.134697,-145.81009
+            1293: -7.134697,-145.81009
     - type: GridAtmosphere
       version: 2
       data:
@@ -5495,8 +5496,6 @@ entities:
       - 12367
       - 12297
       - 13324
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5925
     components:
     - type: Transform
@@ -5512,8 +5511,6 @@ entities:
       - 13396
       - 13395
       - 12306
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8201
     components:
     - type: Transform
@@ -5529,8 +5526,6 @@ entities:
       - 13200
       - 13201
       - 13202
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8432
     components:
     - type: Transform
@@ -5552,16 +5547,12 @@ entities:
       - 13345
       - 13346
       - 13347
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 10964
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-345.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11906
     components:
     - type: Transform
@@ -5581,8 +5572,6 @@ entities:
       - 13392
       - 13395
       - 13396
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12935
     components:
     - type: Transform
@@ -5596,8 +5585,6 @@ entities:
       - 13073
       - 393
       - 391
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13080
     components:
     - type: Transform
@@ -5613,8 +5600,6 @@ entities:
       - 390
       - 387
       - 146
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13105
     components:
     - type: Transform
@@ -5628,8 +5613,6 @@ entities:
       - 6915
       - 146
       - 396
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13109
     components:
     - type: Transform
@@ -5645,8 +5628,6 @@ entities:
       - 13106
       - 6036
       - 1191
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13110
     components:
     - type: Transform
@@ -5661,8 +5642,6 @@ entities:
       - 639
       - 6036
       - 1191
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13115
     components:
     - type: Transform
@@ -5681,8 +5660,6 @@ entities:
       - 10757
       - 13120
       - 1408
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13116
     components:
     - type: Transform
@@ -5695,8 +5672,6 @@ entities:
       - 4056
       - 2076
       - 10757
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13117
     components:
     - type: Transform
@@ -5714,8 +5689,6 @@ entities:
       - 1326
       - 1238
       - 1431
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13124
     components:
     - type: Transform
@@ -5728,8 +5701,6 @@ entities:
       - 13122
       - 1415
       - 1372
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13146
     components:
     - type: Transform
@@ -5750,8 +5721,6 @@ entities:
       - 13134
       - 13135
       - 13136
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13147
     components:
     - type: Transform
@@ -5767,8 +5736,6 @@ entities:
       - 13125
       - 1701
       - 1702
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13148
     components:
     - type: Transform
@@ -5784,8 +5751,6 @@ entities:
       - 13136
       - 13135
       - 13134
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13150
     components:
     - type: Transform
@@ -5802,8 +5767,6 @@ entities:
       - 4360
       - 1725
       - 1715
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13151
     components:
     - type: Transform
@@ -5818,8 +5781,6 @@ entities:
       - 3371
       - 1723
       - 1726
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13152
     components:
     - type: Transform
@@ -5831,8 +5792,6 @@ entities:
       - 13153
       - 3284
       - 3372
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13161
     components:
     - type: Transform
@@ -5860,8 +5819,6 @@ entities:
       - 3437
       - 3549
       - 13149
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13165
     components:
     - type: Transform
@@ -5874,8 +5831,6 @@ entities:
       - 3600
       - 13163
       - 2410
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13166
     components:
     - type: Transform
@@ -5885,8 +5840,6 @@ entities:
     - type: DeviceList
       devices:
       - 3626
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13168
     components:
     - type: Transform
@@ -5912,8 +5865,6 @@ entities:
       - 3552
       - 3608
       - 2410
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13171
     components:
     - type: Transform
@@ -5927,8 +5878,6 @@ entities:
       - 2412
       - 3457
       - 3599
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13176
     components:
     - type: Transform
@@ -5945,8 +5894,6 @@ entities:
       - 3647
       - 4016
       - 2833
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13178
     components:
     - type: Transform
@@ -5963,8 +5910,6 @@ entities:
       - 2826
       - 13173
       - 13172
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13180
     components:
     - type: Transform
@@ -5980,8 +5925,6 @@ entities:
       - 2829
       - 2828
       - 2831
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13182
     components:
     - type: Transform
@@ -5994,8 +5937,6 @@ entities:
       - 3954
       - 3650
       - 13181
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13185
     components:
     - type: Transform
@@ -6012,8 +5953,6 @@ entities:
       - 2835
       - 2834
       - 2837
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13187
     components:
     - type: Transform
@@ -6026,8 +5965,6 @@ entities:
       - 4037
       - 13186
       - 2837
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13189
     components:
     - type: Transform
@@ -6040,8 +5977,6 @@ entities:
       - 4556
       - 4559
       - 2826
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13209
     components:
     - type: Transform
@@ -6058,8 +5993,6 @@ entities:
       - 13193
       - 13194
       - 1498
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13211
     components:
     - type: Transform
@@ -6074,8 +6007,6 @@ entities:
       - 13199
       - 13191
       - 13190
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13213
     components:
     - type: Transform
@@ -6089,8 +6020,6 @@ entities:
       - 5275
       - 13197
       - 13196
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13218
     components:
     - type: Transform
@@ -6108,16 +6037,12 @@ entities:
       - 13201
       - 13200
       - 13203
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13220
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-171.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13239
     components:
     - type: Transform
@@ -6135,8 +6060,6 @@ entities:
       - 5128
       - 13225
       - 13226
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13241
     components:
     - type: Transform
@@ -6153,8 +6076,6 @@ entities:
       - 9827
       - 8852
       - 15086
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13244
     components:
     - type: Transform
@@ -6169,8 +6090,6 @@ entities:
       - 13225
       - 13242
       - 15087
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13247
     components:
     - type: Transform
@@ -6185,8 +6104,6 @@ entities:
       - 5128
       - 5135
       - 5130
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13249
     components:
     - type: Transform
@@ -6200,8 +6117,6 @@ entities:
       - 5083
       - 5135
       - 5134
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13251
     components:
     - type: Transform
@@ -6215,8 +6130,6 @@ entities:
       - 5107
       - 5130
       - 5131
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13252
     components:
     - type: Transform
@@ -6236,8 +6149,6 @@ entities:
       - 5121
       - 5131
       - 13242
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13317
     components:
     - type: Transform
@@ -6254,8 +6165,6 @@ entities:
       - 13312
       - 13311
       - 13310
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13322
     components:
     - type: Transform
@@ -6272,8 +6181,6 @@ entities:
       - 13318
       - 12322
       - 12333
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13333
     components:
     - type: Transform
@@ -6290,8 +6197,6 @@ entities:
       - 13314
       - 13315
       - 13332
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13335
     components:
     - type: Transform
@@ -6304,8 +6209,6 @@ entities:
       - 13334
       - 12298
       - 13332
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13341
     components:
     - type: Transform
@@ -6324,8 +6227,6 @@ entities:
       - 10538
       - 13340
       - 13339
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13358
     components:
     - type: Transform
@@ -6345,8 +6246,6 @@ entities:
       - 13355
       - 13356
       - 13357
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13365
     components:
     - type: Transform
@@ -6365,8 +6264,6 @@ entities:
       - 13362
       - 13363
       - 13364
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13370
     components:
     - type: Transform
@@ -6380,8 +6277,6 @@ entities:
       - 13366
       - 12430
       - 12530
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13374
     components:
     - type: Transform
@@ -6396,8 +6291,6 @@ entities:
       - 13367
       - 13372
       - 13373
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13382
     components:
     - type: Transform
@@ -6413,8 +6306,6 @@ entities:
       - 13357
       - 13356
       - 13355
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13383
     components:
     - type: Transform
@@ -6427,8 +6318,6 @@ entities:
       - 12564
       - 4689
       - 13360
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13391
     components:
     - type: Transform
@@ -6445,8 +6334,6 @@ entities:
       - 9425
       - 10870
       - 9426
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13402
     components:
     - type: Transform
@@ -6459,8 +6346,6 @@ entities:
       - 12813
       - 12920
       - 13396
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13421
     components:
     - type: Transform
@@ -6499,8 +6384,6 @@ entities:
       - 16682
       - 11912
       - 16679
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13426
     components:
     - type: Transform
@@ -6516,8 +6399,6 @@ entities:
       - 12986
       - 13419
       - 13418
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 13429
     components:
     - type: Transform
@@ -6529,8 +6410,6 @@ entities:
       - 13427
       - 13053
       - 12994
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14727
     components:
     - type: Transform
@@ -6545,8 +6424,6 @@ entities:
       - 9827
       - 8852
       - 14728
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15278
     components:
     - type: Transform
@@ -6565,8 +6442,6 @@ entities:
       - 12324
       - 9085
       - 17000
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15279
     components:
     - type: Transform
@@ -6581,8 +6456,6 @@ entities:
       - 7879
       - 8483
       - 7885
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15280
     components:
     - type: Transform
@@ -6601,8 +6474,6 @@ entities:
       - 8037
       - 6857
       - 15281
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15282
     components:
     - type: Transform
@@ -6622,8 +6493,6 @@ entities:
       - 15286
       - 15287
       - 7820
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15292
     components:
     - type: Transform
@@ -6643,8 +6512,6 @@ entities:
       - 6856
       - 15290
       - 15291
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 16971
     components:
     - type: Transform
@@ -6656,8 +6523,6 @@ entities:
       - 16996
       - 17001
       - 16990
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: AirCanister
   entities:
   - uid: 4848
@@ -6665,8 +6530,6 @@ entities:
     - type: Transform
       pos: -21.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Airlock
   entities:
   - uid: 2078
@@ -7041,30 +6904,11 @@ entities:
     - type: Transform
       pos: -6.5,-96.5
       parent: 2
-- proto: AirlockExternalEasyPry
-  entities:
   - uid: 12099
     components:
     - type: Transform
       pos: 5.5,-381.5
       parent: 2
-- proto: AirlockExternalEasyPryLocked
-  entities:
-  - uid: 879
-    components:
-    - type: Transform
-      pos: 8.5,-31.5
-      parent: 2
-  - uid: 1007
-    components:
-    - type: Transform
-      pos: 8.5,-29.5
-      parent: 2
-  - uid: 1013
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 2
 - proto: AirlockExternalEngineeringLocked
   entities:
   - uid: 1921
@@ -7295,6 +7139,21 @@ entities:
       parent: 2
 - proto: AirlockExternalLocked
   entities:
+  - uid: 879
+    components:
+    - type: Transform
+      pos: 8.5,-31.5
+      parent: 2
+  - uid: 1007
+    components:
+    - type: Transform
+      pos: 8.5,-29.5
+      parent: 2
+  - uid: 1013
+    components:
+    - type: Transform
+      pos: -7.5,-16.5
+      parent: 2
   - uid: 1691
     components:
     - type: Transform
@@ -12250,6 +12109,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-27.5
       parent: 2
+    - type: SpamEmitSound
+      enabled: False
 - proto: BlockGameArcadeComputerCircuitboard
   entities:
   - uid: 15271
@@ -12257,7 +12118,7 @@ entities:
     - type: Transform
       pos: 6.380858,-242.27087
       parent: 2
-- proto: BodyBag_Folded
+- proto: BodyBagFolded
   entities:
   - uid: 2706
     components:
@@ -31702,29 +31563,21 @@ entities:
     - type: Transform
       pos: -21.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7195
     components:
     - type: Transform
       pos: -21.5,-241.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9993
     components:
     - type: Transform
       pos: -4.5,-312.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11221
     components:
     - type: Transform
       pos: 4.5,-355.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Carpet
   entities:
   - uid: 1888
@@ -35951,6 +35804,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-154.5
       parent: 2
+- proto: ClothingBackpackDuffelSyndicatePyjamaBundle
+  entities:
+  - uid: 12108
+    components:
+    - type: Transform
+      pos: -11.520256,-161.46404
+      parent: 2
 - proto: ClothingBackpackMerc
   entities:
   - uid: 9088
@@ -36211,24 +36071,6 @@ entities:
     - type: Transform
       pos: 16.43729,-78.522385
       parent: 2
-- proto: ClothingHeadHatHairflower
-  entities:
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -1.3108504,-1.6374404
-      parent: 2
-  - uid: 993
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.308499,-40.737587
-      parent: 2
-  - uid: 4106
-    components:
-    - type: Transform
-      pos: -4.616196,-20.118092
-      parent: 2
 - proto: ClothingHeadHatShrineMaidenWig
   entities:
   - uid: 2671
@@ -37352,6 +37194,9 @@ entities:
     - type: Transform
       pos: 3.5,-201.5
       parent: 2
+    - type: SingletonDeviceNetServer
+      active: False
+      available: False
 - proto: Crowbar
   entities:
   - uid: 12231
@@ -37449,8 +37294,6 @@ entities:
     - type: Transform
       pos: -3.5,-168.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: CryoxadoneBeakerSmall
   entities:
   - uid: 2400
@@ -49018,6 +48861,24 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: FoodPoppy
+  entities:
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -1.3108504,-1.6374404
+      parent: 2
+  - uid: 993
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.308499,-40.737587
+      parent: 2
+  - uid: 4106
+    components:
+    - type: Transform
+      pos: -4.616196,-20.118092
+      parent: 2
 - proto: FoodPotato
   entities:
   - uid: 2306
@@ -49074,8 +48935,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-170.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
   - uid: 8512
@@ -49084,8 +48943,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-170.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
 - proto: GasFilterFlipped
@@ -49095,29 +48952,21 @@ entities:
     - type: Transform
       pos: -17.5,-257.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8816
     components:
     - type: Transform
       pos: -17.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8917
     components:
     - type: Transform
       pos: -17.5,-255.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11901
     components:
     - type: Transform
       pos: -17.5,-251.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerCarbonDioxide
   entities:
   - uid: 13271
@@ -49126,8 +48975,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerNitrogenStationLarge
   entities:
   - uid: 7546
@@ -49135,8 +48982,6 @@ entities:
     - type: Transform
       pos: -20.5,-257.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMinerOxygenStationLarge
   entities:
   - uid: 8202
@@ -49144,8 +48989,6 @@ entities:
     - type: Transform
       pos: -20.5,-255.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasMixer
   entities:
   - uid: 11211
@@ -49153,8 +48996,6 @@ entities:
     - type: Transform
       pos: 5.5,-356.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
 - proto: GasOutletInjector
@@ -49165,32 +49006,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-257.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 4021
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-255.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7237
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-251.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7924
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasPassiveVent
   entities:
   - uid: 545
@@ -49199,8 +49032,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-357.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
   - uid: 618
@@ -49209,8 +49040,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 938
@@ -49219,8 +49048,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-58.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1102
@@ -49229,8 +49056,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3114
@@ -49239,16 +49064,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 3256
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-92.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3405
@@ -49257,8 +49078,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-126.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3500
@@ -49267,8 +49086,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -9.5,-126.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3961
@@ -49277,8 +49094,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-135.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4049
@@ -49287,16 +49102,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 4154
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -7.5,-180.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5014
@@ -49305,8 +49116,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-200.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5026
@@ -49315,8 +49124,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-229.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5171
@@ -49325,8 +49132,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-220.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5175
@@ -49335,8 +49140,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-229.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5320
@@ -49345,16 +49148,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,-249.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 5367
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 7.5,-220.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 6796
@@ -49362,23 +49161,17 @@ entities:
     - type: Transform
       pos: -19.5,-257.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8789
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -19.5,-251.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 10694
     components:
     - type: Transform
       pos: -7.5,-332.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 10928
@@ -49386,8 +49179,6 @@ entities:
     - type: Transform
       pos: 8.5,-332.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 11916
@@ -49395,23 +49186,17 @@ entities:
     - type: Transform
       pos: -19.5,-255.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12016
     components:
     - type: Transform
       pos: -19.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12218
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 10.5,-283.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12389
@@ -49420,8 +49205,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-313.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FEF101FF'
   - uid: 12405
@@ -49430,8 +49213,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-315.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FEF101FF'
   - uid: 12517
@@ -49440,8 +49221,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-311.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12907
@@ -49450,8 +49229,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-358.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 13103
@@ -49460,8 +49237,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-369.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13104
@@ -49470,8 +49245,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-369.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 14298
@@ -49480,16 +49253,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14451
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-64.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
 - proto: GasPipeBend
@@ -63615,23 +63384,17 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -21.5,-246.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7217
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-245.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11217
     components:
     - type: Transform
       pos: 5.5,-355.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
   - uid: 11218
@@ -63639,8 +63402,6 @@ entities:
     - type: Transform
       pos: 4.5,-355.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FFD800FF'
   - uid: 11927
@@ -63649,24 +63410,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -20.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11930
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -19.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12412
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-313.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FEF101FF'
 - proto: GasPressurePump
@@ -63677,8 +63432,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2372
     components:
     - type: MetaData
@@ -63687,8 +63440,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-250.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2447
     components:
     - type: MetaData
@@ -63697,8 +63448,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-256.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2450
     components:
     - type: MetaData
@@ -63707,8 +63456,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-258.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2452
     components:
     - type: MetaData
@@ -63717,24 +63464,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -17.5,-252.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 2463
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,-259.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 3052
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-169.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4108
@@ -63745,8 +63486,6 @@ entities:
       parent: 2
     - type: GasPressurePump
       targetPressure: 4500
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 5500
@@ -63755,24 +63494,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -20.5,-246.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7747
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -20.5,-245.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12409
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,-313.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FEF101FF'
   - uid: 12410
@@ -63781,8 +63514,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-315.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12908
@@ -63791,8 +63522,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,-358.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasThermoMachineFreezer
@@ -63802,8 +63531,6 @@ entities:
     - type: Transform
       pos: -4.5,-168.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasValve
   entities:
   - uid: 5420
@@ -63812,8 +63539,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -18.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: GasVentPump
   entities:
   - uid: 576
@@ -63821,8 +63546,6 @@ entities:
     - type: Transform
       pos: -3.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 807
@@ -63831,8 +63554,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 838
@@ -63841,8 +63562,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-157.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 855
@@ -63850,8 +63569,6 @@ entities:
     - type: Transform
       pos: -1.5,-6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 856
@@ -63860,8 +63577,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 857
@@ -63873,8 +63588,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13080
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 870
@@ -63883,8 +63596,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 884
@@ -63896,8 +63607,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 12935
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 905
@@ -63906,8 +63615,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-46.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 921
@@ -63916,8 +63623,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 954
@@ -63929,8 +63634,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13110
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 977
@@ -63942,8 +63645,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13109
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1004
@@ -63951,8 +63652,6 @@ entities:
     - type: Transform
       pos: 0.5,-22.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1057
@@ -63961,8 +63660,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-160.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1123
@@ -63971,8 +63668,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-49.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1138
@@ -63981,8 +63676,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-31.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1141
@@ -63991,8 +63684,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-42.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1238
@@ -64004,8 +63695,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13117
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1278
@@ -64017,8 +63706,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1279
@@ -64026,8 +63713,6 @@ entities:
     - type: Transform
       pos: -2.5,-11.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1323
@@ -64036,8 +63721,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-79.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1325
@@ -64046,8 +63729,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-62.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1373
@@ -64056,8 +63737,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-56.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1375
@@ -64069,8 +63748,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14727
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1382
@@ -64079,8 +63756,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-68.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1415
@@ -64092,8 +63767,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13124
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1769
@@ -64101,8 +63774,6 @@ entities:
     - type: Transform
       pos: 0.5,-68.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 1806
@@ -64111,8 +63782,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-73.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2076
@@ -64124,8 +63793,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13116
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2415
@@ -64133,8 +63800,6 @@ entities:
     - type: Transform
       pos: -4.5,-324.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 2638
@@ -64143,8 +63808,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-289.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3011
@@ -64153,8 +63816,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3018
@@ -64163,8 +63824,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-52.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3040
@@ -64172,8 +63831,6 @@ entities:
     - type: Transform
       pos: 0.5,-184.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3110
@@ -64182,8 +63839,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-13.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3333
@@ -64192,8 +63847,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-76.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3351
@@ -64205,8 +63858,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13147
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3352
@@ -64215,8 +63866,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-81.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3371
@@ -64227,8 +63876,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13151
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3372
@@ -64240,8 +63887,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13152
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3373
@@ -64250,8 +63895,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-88.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3374
@@ -64260,8 +63903,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-96.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3391
@@ -64270,8 +63911,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-100.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3392
@@ -64283,8 +63922,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13148
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3393
@@ -64293,8 +63930,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-103.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3403
@@ -64303,8 +63938,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-106.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3436
@@ -64316,8 +63949,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3437
@@ -64329,8 +63960,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3438
@@ -64338,8 +63967,6 @@ entities:
     - type: Transform
       pos: -3.5,-107.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3451
@@ -64348,8 +63975,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-110.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3452
@@ -64358,8 +63983,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-110.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3457
@@ -64371,8 +63994,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13171
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3474
@@ -64383,8 +64004,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3475
@@ -64395,8 +64014,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3476
@@ -64407,8 +64024,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3477
@@ -64419,8 +64034,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3478
@@ -64432,8 +64045,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3480
@@ -64444,8 +64055,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3481
@@ -64453,8 +64062,6 @@ entities:
     - type: Transform
       pos: 0.5,-130.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3482
@@ -64463,8 +64070,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-133.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3483
@@ -64476,8 +64081,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13165
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3626
@@ -64489,8 +64092,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13166
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 3650
@@ -64502,8 +64103,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13182
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4016
@@ -64515,8 +64114,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13176
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4018
@@ -64525,8 +64122,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-138.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4020
@@ -64535,8 +64130,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-138.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4031
@@ -64547,8 +64140,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13187
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4033
@@ -64560,8 +64151,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13185
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4051
@@ -64569,8 +64158,6 @@ entities:
     - type: Transform
       pos: -4.5,-38.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4072
@@ -64579,8 +64166,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-154.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4146
@@ -64589,8 +64174,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-187.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4148
@@ -64599,8 +64182,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-181.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4195
@@ -64609,8 +64190,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4202
@@ -64622,8 +64201,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15292
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4234
@@ -64632,8 +64209,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-127.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4360
@@ -64645,8 +64220,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13150
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4558
@@ -64655,8 +64228,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-152.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4559
@@ -64668,8 +64239,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13189
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4567
@@ -64678,8 +64247,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-149.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4568
@@ -64691,8 +64258,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13180
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4905
@@ -64704,8 +64269,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4950
@@ -64717,8 +64280,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15292
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4967
@@ -64730,8 +64291,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13244
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 4992
@@ -64740,8 +64299,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 18.5,-243.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5057
@@ -64750,8 +64307,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-241.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5063
@@ -64760,8 +64315,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-235.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5082
@@ -64773,8 +64326,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13241
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5083
@@ -64786,8 +64337,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13249
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5108
@@ -64799,8 +64348,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13251
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5110
@@ -64812,8 +64359,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5121
@@ -64825,8 +64370,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5126
@@ -64835,8 +64378,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-208.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5127
@@ -64848,8 +64389,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13247
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5153
@@ -64858,8 +64397,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-214.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5156
@@ -64868,8 +64405,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-219.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5160
@@ -64878,8 +64413,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-219.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5161
@@ -64888,8 +64421,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-221.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5163
@@ -64898,8 +64429,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-230.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5164
@@ -64908,8 +64437,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-230.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5199
@@ -64917,8 +64444,6 @@ entities:
     - type: Transform
       pos: 0.5,-228.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5251
@@ -64930,8 +64455,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13211
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5260
@@ -64943,8 +64466,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8201
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5261
@@ -64956,8 +64477,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13213
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5288
@@ -64966,8 +64485,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-175.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5293
@@ -64976,8 +64493,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-163.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5302
@@ -64989,8 +64504,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13218
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 5307
@@ -64999,8 +64512,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-163.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6036
@@ -65012,8 +64523,6 @@ entities:
       deviceLists:
       - 13110
       - 13109
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6727
@@ -65022,8 +64531,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-251.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6904
@@ -65032,8 +64539,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-18.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6905
@@ -65042,8 +64547,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-178.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 6915
@@ -65055,8 +64558,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13105
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7504
@@ -65065,8 +64566,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-262.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7506
@@ -65075,8 +64574,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-265.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 7769
@@ -65085,8 +64582,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8066
@@ -65095,8 +64590,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8070
@@ -65105,8 +64598,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-243.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8071
@@ -65118,8 +64609,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15279
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8113
@@ -65127,8 +64616,6 @@ entities:
     - type: Transform
       pos: 0.5,-238.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8123
@@ -65136,8 +64623,6 @@ entities:
     - type: Transform
       pos: 0.5,-211.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8157
@@ -65146,8 +64631,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8314
@@ -65159,8 +64642,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15280
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8431
@@ -65169,8 +64650,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-165.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 8877
@@ -65179,8 +64658,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-268.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10658
@@ -65191,8 +64668,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 5925
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10811
@@ -65201,8 +64676,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-354.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10869
@@ -65211,8 +64684,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-343.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 10976
@@ -65220,8 +64691,6 @@ entities:
     - type: Transform
       pos: 7.5,-337.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12142
@@ -65230,8 +64699,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12273
@@ -65240,8 +64707,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-295.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12275
@@ -65250,8 +64715,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-348.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12305
@@ -65263,8 +64726,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13341
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12333
@@ -65276,8 +64737,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13322
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12341
@@ -65288,8 +64747,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13317
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12345
@@ -65298,8 +64755,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-284.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12349
@@ -65308,8 +64763,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-284.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12356
@@ -65320,8 +64773,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13333
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12362
@@ -65333,8 +64784,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13335
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12367
@@ -65346,8 +64795,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 2277
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12382
@@ -65356,8 +64803,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-297.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12428
@@ -65369,8 +64814,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13374
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12429
@@ -65379,8 +64822,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-321.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12430
@@ -65391,8 +64832,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13370
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12470
@@ -65404,8 +64843,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8432
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12474
@@ -65413,8 +64850,6 @@ entities:
     - type: Transform
       pos: 5.5,-265.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12501
@@ -65426,8 +64861,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13365
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12508
@@ -65438,8 +64871,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13383
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12540
@@ -65448,8 +64879,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,-311.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12568
@@ -65458,8 +64887,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-311.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12577
@@ -65467,8 +64894,6 @@ entities:
     - type: Transform
       pos: 9.5,-304.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12580
@@ -65480,8 +64905,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13382
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12603
@@ -65490,8 +64913,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-330.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12637
@@ -65499,8 +64920,6 @@ entities:
     - type: Transform
       pos: 0.5,-292.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12641
@@ -65508,8 +64927,6 @@ entities:
     - type: Transform
       pos: 0.5,-324.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12652
@@ -65518,8 +64935,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-327.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12705
@@ -65531,8 +64946,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13358
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12718
@@ -65541,8 +64954,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-330.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12754
@@ -65554,8 +64965,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12895
@@ -65563,8 +64972,6 @@ entities:
     - type: Transform
       pos: 0.5,-344.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12897
@@ -65575,8 +64982,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 11906
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12898
@@ -65588,8 +64993,6 @@ entities:
       deviceLists:
       - 13391
       - 11906
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12918
@@ -65597,8 +65000,6 @@ entities:
     - type: Transform
       pos: 0.5,-351.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12920
@@ -65610,8 +65011,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13402
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12932
@@ -65622,8 +65021,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12943
@@ -65635,8 +65032,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12984
@@ -65648,8 +65043,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12985
@@ -65661,8 +65054,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12986
@@ -65674,8 +65065,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13426
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12987
@@ -65687,8 +65076,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13426
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12988
@@ -65700,8 +65087,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12989
@@ -65713,8 +65098,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12994
@@ -65725,8 +65108,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13429
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 12997
@@ -65735,8 +65116,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-367.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 13077
@@ -65744,8 +65123,6 @@ entities:
     - type: Transform
       pos: -3.5,-368.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 13079
@@ -65753,8 +65130,6 @@ entities:
     - type: Transform
       pos: 4.5,-368.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 13145
@@ -65765,8 +65140,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13146
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 13207
@@ -65777,8 +65150,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13209
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 13237
@@ -65790,8 +65161,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13239
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14825
@@ -65799,8 +65168,6 @@ entities:
     - type: Transform
       pos: 5.5,-22.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14826
@@ -65808,8 +65175,6 @@ entities:
     - type: Transform
       pos: -4.5,-22.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14835
@@ -65817,8 +65182,6 @@ entities:
     - type: Transform
       pos: 5.5,-49.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14847
@@ -65826,8 +65189,6 @@ entities:
     - type: Transform
       pos: -4.5,-76.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14848
@@ -65835,8 +65196,6 @@ entities:
     - type: Transform
       pos: 5.5,-76.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14861
@@ -65844,8 +65203,6 @@ entities:
     - type: Transform
       pos: 5.5,-103.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14862
@@ -65853,8 +65210,6 @@ entities:
     - type: Transform
       pos: -4.5,-103.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14885
@@ -65862,8 +65217,6 @@ entities:
     - type: Transform
       pos: -4.5,-130.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14889
@@ -65871,8 +65224,6 @@ entities:
     - type: Transform
       pos: 5.5,-130.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 14950
@@ -65881,8 +65232,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-132.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15049
@@ -65890,8 +65239,6 @@ entities:
     - type: Transform
       pos: -4.5,-184.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15098
@@ -65900,8 +65247,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,-190.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15112
@@ -65909,8 +65254,6 @@ entities:
     - type: Transform
       pos: -4.5,-157.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15119
@@ -65919,8 +65262,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-157.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15195
@@ -65929,8 +65270,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-292.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 15284
@@ -65942,8 +65281,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15282
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16679
@@ -65955,8 +65292,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 16990
@@ -65968,8 +65303,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 16971
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasVentScrubber
@@ -65980,8 +65313,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-19.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 611
@@ -65993,8 +65324,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13105
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 620
@@ -66003,8 +65332,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 645
@@ -66013,8 +65340,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-14.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 665
@@ -66023,8 +65348,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-16.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 742
@@ -66032,8 +65355,6 @@ entities:
     - type: Transform
       pos: 5.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 747
@@ -66044,8 +65365,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13080
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 751
@@ -66054,8 +65373,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 769
@@ -66064,8 +65381,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 770
@@ -66074,8 +65389,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1022
@@ -66084,8 +65397,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-73.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1139
@@ -66094,8 +65405,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-29.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1155
@@ -66107,8 +65416,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13109
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1191
@@ -66121,8 +65428,6 @@ entities:
       deviceLists:
       - 13110
       - 13109
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1201
@@ -66131,8 +65436,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-36.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1207
@@ -66141,8 +65444,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-46.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1222
@@ -66150,8 +65451,6 @@ entities:
     - type: Transform
       pos: 1.5,-25.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1239
@@ -66163,8 +65462,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13110
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1283
@@ -66172,8 +65469,6 @@ entities:
     - type: Transform
       pos: 6.5,-57.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1292
@@ -66181,8 +65476,6 @@ entities:
     - type: Transform
       pos: 1.5,-52.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1299
@@ -66191,8 +65484,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-63.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1324
@@ -66201,8 +65492,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-10.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1326
@@ -66214,8 +65503,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13117
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1332
@@ -66224,8 +65511,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-66.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1378
@@ -66237,8 +65522,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 14727
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1383
@@ -66247,8 +65530,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-69.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1409
@@ -66260,8 +65541,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13124
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 1612
@@ -66270,8 +65549,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-263.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 1825
@@ -66283,8 +65560,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 12935
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 2797
@@ -66293,8 +65568,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-289.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3027
@@ -66306,8 +65579,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8432
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3120
@@ -66315,8 +65586,6 @@ entities:
     - type: Transform
       pos: 1.5,-167.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 3261
     components:
     - type: Transform
@@ -66325,8 +65594,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13151
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3262
@@ -66338,8 +65605,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13151
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3279
@@ -66348,8 +65613,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-87.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3281
@@ -66358,8 +65621,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-98.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3284
@@ -66371,8 +65632,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13152
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3285
@@ -66380,8 +65639,6 @@ entities:
     - type: Transform
       pos: -3.5,-81.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3309
@@ -66389,8 +65646,6 @@ entities:
     - type: Transform
       pos: 1.5,-79.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3310
@@ -66402,8 +65657,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13147
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3314
@@ -66415,8 +65668,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13148
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3326
@@ -66425,8 +65676,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-100.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3513
@@ -66438,8 +65687,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3549
@@ -66451,8 +65698,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3550
@@ -66464,8 +65709,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3551
@@ -66477,8 +65720,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3552
@@ -66490,8 +65731,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3553
@@ -66503,8 +65742,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3598
@@ -66513,8 +65750,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-127.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3599
@@ -66525,8 +65760,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13171
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3600
@@ -66537,8 +65770,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13165
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3603
@@ -66550,8 +65781,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3608
@@ -66563,8 +65792,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13168
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3622
@@ -66573,8 +65800,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-110.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3623
@@ -66583,8 +65808,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-115.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3630
@@ -66596,8 +65819,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13161
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3631
@@ -66605,8 +65826,6 @@ entities:
     - type: Transform
       pos: 1.5,-106.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3632
@@ -66614,8 +65833,6 @@ entities:
     - type: Transform
       pos: -4.5,-107.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3637
@@ -66624,8 +65841,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-108.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3647
@@ -66637,8 +65852,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13176
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3672
@@ -66646,8 +65859,6 @@ entities:
     - type: Transform
       pos: 1.5,-133.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3874
@@ -66656,8 +65867,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-139.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3944
@@ -66665,8 +65874,6 @@ entities:
     - type: Transform
       pos: 1.5,-160.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3954
@@ -66677,8 +65884,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13182
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3980
@@ -66690,8 +65895,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13180
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3982
@@ -66700,8 +65903,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-135.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 3993
@@ -66713,8 +65914,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13185
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4012
@@ -66723,8 +65922,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-148.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4013
@@ -66733,8 +65930,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-154.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4037
@@ -66746,8 +65941,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13187
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4050
@@ -66756,8 +65949,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-43.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4055
@@ -66766,8 +65957,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-59.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4056
@@ -66778,8 +65967,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13116
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4149
@@ -66788,8 +65975,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-181.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4150
@@ -66797,8 +65982,6 @@ entities:
     - type: Transform
       pos: 1.5,-187.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4171
@@ -66807,8 +65990,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-17.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 4508
     components:
     - type: Transform
@@ -66818,8 +65999,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13146
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4509
@@ -66831,8 +66010,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13150
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4554
@@ -66841,8 +66018,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-152.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4556
@@ -66854,8 +66029,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13189
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4670
@@ -66867,8 +66040,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4942
@@ -66877,8 +66048,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-235.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4943
@@ -66886,8 +66055,6 @@ entities:
     - type: Transform
       pos: 1.5,-214.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 4981
@@ -66899,8 +66066,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5068
@@ -66911,8 +66076,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13252
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5069
@@ -66921,8 +66084,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-208.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5070
@@ -66934,8 +66095,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13244
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5072
@@ -66947,8 +66106,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13249
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5073
@@ -66960,8 +66117,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13241
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5107
@@ -66973,8 +66128,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13251
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5178
@@ -66983,8 +66136,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-229.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5179
@@ -66993,8 +66144,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-229.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5185
@@ -67003,8 +66152,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-229.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5188
@@ -67013,8 +66160,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-220.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5189
@@ -67023,8 +66168,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,-220.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5190
@@ -67033,8 +66176,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-220.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5225
@@ -67042,8 +66183,6 @@ entities:
     - type: Transform
       pos: -6.5,-178.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5252
@@ -67055,8 +66194,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13211
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5275
@@ -67068,8 +66205,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13213
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5277
@@ -67081,8 +66216,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8201
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5301
@@ -67094,8 +66227,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13218
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5312
@@ -67104,8 +66235,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-163.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 5346
@@ -67117,8 +66246,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 8201
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 6198
@@ -67127,8 +66254,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 15.5,-243.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7453
@@ -67137,8 +66262,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-262.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7476
@@ -67150,8 +66273,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15292
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7563
@@ -67159,8 +66280,6 @@ entities:
     - type: Transform
       pos: 10.5,-253.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7776
@@ -67172,8 +66291,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15292
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7823
@@ -67181,8 +66298,6 @@ entities:
     - type: Transform
       pos: -3.5,-243.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 7881
@@ -67191,8 +66306,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-172.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 7882
@@ -67201,8 +66314,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-179.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 8063
@@ -67210,8 +66321,6 @@ entities:
     - type: Transform
       pos: -3.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8089
@@ -67223,8 +66332,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15280
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8091
@@ -67235,8 +66342,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15279
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8209
@@ -67245,8 +66350,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,-260.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 8883
@@ -67254,8 +66357,6 @@ entities:
     - type: Transform
       pos: 1.5,-268.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 9953
@@ -67264,8 +66365,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-297.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 10972
@@ -67274,8 +66373,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-342.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 10973
@@ -67283,8 +66380,6 @@ entities:
     - type: Transform
       pos: 6.5,-337.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 11912
@@ -67296,15 +66391,11 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12134
     components:
     - type: Transform
       pos: 1.5,-241.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 12224
@@ -67315,8 +66406,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13341
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12240
@@ -67325,8 +66414,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-284.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12246
@@ -67335,8 +66422,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-287.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12297
@@ -67347,8 +66432,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 2277
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12298
@@ -67360,8 +66443,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13335
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12322
@@ -67373,8 +66454,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13322
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12340
@@ -67385,8 +66464,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13317
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12355
@@ -67397,8 +66474,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13333
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12375
@@ -67406,8 +66481,6 @@ entities:
     - type: Transform
       pos: 1.5,-295.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12399
@@ -67416,8 +66489,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-321.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12433
@@ -67429,8 +66500,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13374
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12444
@@ -67438,8 +66507,6 @@ entities:
     - type: Transform
       pos: 4.5,-318.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12502
@@ -67451,8 +66518,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13365
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12507
@@ -67461,8 +66526,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-310.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12530
@@ -67474,8 +66537,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13370
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12564
@@ -67487,8 +66548,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13383
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12581
@@ -67500,8 +66559,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13382
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12621
@@ -67509,8 +66566,6 @@ entities:
     - type: Transform
       pos: -5.5,-297.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12653
@@ -67518,8 +66573,6 @@ entities:
     - type: Transform
       pos: 1.5,-327.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12704
@@ -67531,8 +66584,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13358
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12721
@@ -67541,8 +66592,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-331.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12782
@@ -67550,8 +66599,6 @@ entities:
     - type: Transform
       pos: -4.5,-330.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12798
@@ -67564,8 +66611,6 @@ entities:
       deviceLists:
       - 11906
       - 5925
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12811
@@ -67574,8 +66619,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-348.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12812
@@ -67584,8 +66627,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-346.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12813
@@ -67597,8 +66638,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13402
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12896
@@ -67610,8 +66649,6 @@ entities:
       deviceLists:
       - 13391
       - 11906
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12914
@@ -67619,8 +66656,6 @@ entities:
     - type: Transform
       pos: 1.5,-354.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12933
@@ -67632,8 +66667,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 12944
@@ -67645,8 +66678,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13039
@@ -67657,8 +66688,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13040
@@ -67670,8 +66699,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13041
@@ -67683,8 +66710,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13053
@@ -67695,8 +66720,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13429
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13055
@@ -67705,8 +66728,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-367.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13067
@@ -67718,8 +66739,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13068
@@ -67731,8 +66750,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13081
@@ -67744,8 +66761,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13082
@@ -67757,8 +66772,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13421
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13088
@@ -67770,8 +66783,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13426
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13094
@@ -67783,8 +66794,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13426
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 13236
@@ -67796,8 +66805,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 13239
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 14427
@@ -67805,8 +66812,6 @@ entities:
     - type: Transform
       pos: 14.5,-61.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 14428
@@ -67814,8 +66819,6 @@ entities:
     - type: Transform
       pos: 16.5,-61.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 15161
@@ -67824,8 +66827,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 9.5,-116.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 15283
     components:
     - type: Transform
@@ -67835,8 +66836,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 15282
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 16999
@@ -67845,8 +66844,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-248.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 17001
@@ -67858,8 +66855,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 16971
-    - type: AtmosDevice
-      joinedGrid: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GasVolumePump
@@ -67870,15 +66865,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,-246.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 7198
     components:
     - type: Transform
       pos: -16.5,-246.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Gateway
   entities:
   - uid: 2226
@@ -75257,7 +74248,7 @@ entities:
       pos: 8.5,-176.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -134221.61
+      secondsUntilStateChange: -134384.86
       state: Closing
   - uid: 11796
     components:
@@ -77549,36 +76540,26 @@ entities:
     - type: Transform
       pos: -7.5,-175.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9822
     components:
     - type: Transform
       pos: -4.5,-311.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11937
     components:
     - type: Transform
       pos: -13.5,-250.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12143
     components:
     - type: Transform
       pos: 4.5,-1.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 16957
     components:
     - type: Transform
       pos: -21.5,-257.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: NitrousOxideCanister
   entities:
   - uid: 11220
@@ -77586,8 +76567,6 @@ entities:
     - type: Transform
       pos: 5.5,-355.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: NoticeBoard
   entities:
   - uid: 2785
@@ -77665,43 +76644,31 @@ entities:
     - type: Transform
       pos: -21.5,-242.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 8891
     components:
     - type: Transform
       pos: -6.5,-268.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9992
     components:
     - type: Transform
       pos: -5.5,-312.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11914
     components:
     - type: Transform
       pos: -21.5,-255.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 12140
     components:
     - type: Transform
       pos: 4.5,-2.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 14640
     components:
     - type: Transform
       pos: -6.5,-258.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: PaintingAmogusTriptych
   entities:
   - uid: 14569
@@ -77954,22 +76921,16 @@ entities:
     - type: Transform
       pos: -21.5,-243.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 9821
     components:
     - type: Transform
       pos: -5.5,-311.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
   - uid: 11915
     components:
     - type: Transform
       pos: -21.5,-251.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
   - uid: 2470
@@ -87630,11 +86591,15 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-258.5
       parent: 2
+    - type: SpamEmitSound
+      enabled: False
   - uid: 15273
     components:
     - type: Transform
       pos: 5.5,-242.5
       parent: 2
+    - type: SpamEmitSound
+      enabled: False
 - proto: SpawnMobAlexander
   entities:
   - uid: 2310
@@ -88553,8 +87518,6 @@ entities:
     - type: Transform
       pos: -21.5,-240.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: Stunbaton
   entities:
   - uid: 10736
@@ -89295,13 +88258,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-37.5
       parent: 2
-- proto: SyndicateJawsOfLife
-  entities:
-  - uid: 12108
-    components:
-    - type: Transform
-      pos: -11.481979,-161.38908
-      parent: 2
 - proto: Syringe
   entities:
   - uid: 2475
@@ -90879,8 +89835,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,-244.5
       parent: 2
-    - type: AtmosDevice
-      joinedGrid: 2
 - proto: TegCirculator
   entities:
   - uid: 3584
@@ -105505,7 +104459,7 @@ entities:
     - type: Transform
       pos: 1.2513196,-368.03192
       parent: 2
-- proto: WeaponPistolMk58Nonlethal
+- proto: WeaponPistolMk58
   entities:
   - uid: 12774
     components:
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index e9a7f9c958..7881cddd4a 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,6 +24,7 @@
     - category: Thirst
     - alertType: Magboots
     - alertType: Pacified
+    - alertType: Deflecting
 
 - type: entity
   id: AlertSpriteView
@@ -474,3 +475,11 @@
     state: critical
   name: Debug6
   description: Debug
+
+- type: alert
+  id: Deflecting
+  icons:
+  - sprite: /Textures/Interface/Alerts/deflecting.rsi
+    state: deflecting0
+  name: alerts-deflecting-name
+  description: alerts-deflecting-desc
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
index dea1ddb69c..e39933c365 100644
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -84,6 +84,7 @@
   description: anomaly-behavior-reflect
   components:
   - type: Reflect
+    innate: true
     reflectProb: 0.5
     reflects:
       - Energy
diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index 0db1327431..02223b6a9f 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -242,7 +242,7 @@
     Piercing: 0.2
     Shock: 0.0
     Cold: 0.0
-    Heat: -1 # heat damage cauterizes wounds, but will still hurt obviously.
+    Heat: -0.5 # heat damage cauterizes wounds, but will still hurt obviously.
     Poison: 0.0
     Radiation: 0.0
     Asphyxiation: 0.0
diff --git a/Resources/Prototypes/DeviceLinking/source_ports.yml b/Resources/Prototypes/DeviceLinking/source_ports.yml
index 18b9b831e6..1988f29e45 100644
--- a/Resources/Prototypes/DeviceLinking/source_ports.yml
+++ b/Resources/Prototypes/DeviceLinking/source_ports.yml
@@ -45,6 +45,11 @@
   description: signal-port-description-doorstatus
   defaultLinks: [ DoorBolt ]
 
+- type: sourcePort
+  id: DockStatus
+  name: signal-port-name-dockstatus
+  description: signal-port-description-dockstatus
+
 - type: sourcePort
   id: OrderSender
   name: signal-port-name-order-sender
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 2462d3d041..66a9c60511 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -31,6 +31,7 @@
         - AppraisalTool
         - JawsOfLife
         - GPS
+        - WeldingMask
       components:
         - SprayPainter
         - NetworkConfigurator
@@ -482,6 +483,10 @@
         - Handcuff
         - BallisticAmmoProvider
         - CartridgeAmmo
+        - DoorRemote
+        - Whistle
+        - HolosignProjector
+        - BalloonPopper
   - type: ItemMapper
     mapLayers:
       flashbang:
@@ -612,7 +617,7 @@
     sprite: Clothing/Belt/securitywebbing.rsi
   - type: Clothing
     sprite: Clothing/Belt/securitywebbing.rsi
-  
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltMercWebbing
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 0c2ded620e..8b73eee0d2 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -242,6 +242,12 @@
   name: combat gloves
   description: These tactical gloves are fireproof and shock resistant.
   components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/combat.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/combat.rsi
+  - type: GloveHeatResistance
+    heatResistance: 1400
   - type: Insulated
   - type: Fiber
     fiberMaterial: fibers-insulative
diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
index cd5c63d7ec..c0ae440a56 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml
@@ -19,6 +19,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - WeldingMask
   - type: HideLayerClothing
     slots:
     - Snout
@@ -37,6 +38,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - WeldingMask
 
 - type: entity
   parent: WeldingMaskBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index ecc4156aff..6da428ee5f 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -96,6 +96,7 @@
         Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature
   - type: Reflect
     reflectProb: 1
+    innate: true # armor grants a passive shield that does not require concentration to maintain
     reflects:
       - Energy
 
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index eb32b48e79..be80f9c692 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -8,6 +8,8 @@
     name: ghost-role-information-rat-king-name
     description: ghost-role-information-rat-king-description
     rules: ghost-role-information-rat-king-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobRatKing
   - type: Sprite
@@ -27,6 +29,8 @@
     name: ghost-role-information-remilia-name
     description: ghost-role-information-remilia-description
     rules: ghost-role-information-remilia-rules
+    raffle:
+      settings: short
   - type: GhostRoleMobSpawner
     prototype: MobBatRemilia
   - type: Sprite
@@ -46,6 +50,8 @@
     name: ghost-role-information-cerberus-name
     description: ghost-role-information-cerberus-description
     rules: ghost-role-information-cerberus-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobCorgiCerberus
   - type: Sprite
@@ -64,6 +70,8 @@
   components:
   - type: GhostRole
     rules: ghost-role-information-nukeop-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanNukeOp
   - type: Sprite
@@ -103,6 +111,8 @@
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
     rules: ghost-role-component-default-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobDragon
   - type: Sprite
@@ -121,6 +131,8 @@
     name: ghost-role-information-space-ninja-name
     description: ghost-role-information-space-ninja-description
     rules: ghost-role-information-space-ninja-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanSpaceNinja
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml b/Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml
new file mode 100644
index 0000000000..05707c7151
--- /dev/null
+++ b/Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml
@@ -0,0 +1,53 @@
+- type: entity
+  parent: MobHuman
+  id: MobDebugCounter
+  name: debug counter
+  description: He can count
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugCounterCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          0.5
+        MaximumIdleTime: !type:Single
+          0.5
+        Count: !type:Single
+          0
+
+- type: entity
+  parent: MobHuman
+  id: MobDebugRandomCounter
+  name: debug random counter
+  description: He can randomize
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugRandomCounterCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          1
+        MaximumIdleTime: !type:Single
+          1
+        Count: !type:Single
+          0
+
+- type: entity
+  parent: MobHuman
+  id: MobDebugRandomLess
+  name: debug random less
+  description: He can lessing
+  suffix: AI, DEBUG
+  components:
+    - type: HTN
+      rootTask:
+        task: DebugRandomLessCompound
+      blackboard:
+        MinimumIdleTime: !type:Single
+          1
+        MaximumIdleTime: !type:Single
+          1
+        Count: !type:Single
+          0
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 3a0b4d2858..535cb73470 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1308,6 +1308,8 @@
     makeSentient: true
     name: ghost-role-information-monkey-name
     description: ghost-role-information-monkey-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Loadout
     prototypes: [SyndicateOperativeGearMonkey]
@@ -2292,6 +2294,8 @@
       makeSentient: true
       name: ghost-role-information-giant-spider-name
       description: ghost-role-information-giant-spider-description
+      raffle:
+        settings: short
     - type: GhostTakeoverAvailable
 
 - type: entity
@@ -2816,6 +2820,8 @@
     allowMovement: true
     description: ghost-role-information-SyndiCat-description
     rules: ghost-role-information-SyndiCat-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: AutoImplant
     implants:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
index 6aea0e89b0..07ee6b1536 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
@@ -10,6 +10,8 @@
       makeSentient: true
       name: ghost-role-information-behonker-name
       description: ghost-role-information-behonker-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: HTN
       rootTask:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index 7308267473..3a77dbab4c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -163,6 +163,8 @@
       makeSentient: true
       name: ghost-role-information-sentient-carp-name
       description: ghost-role-information-sentient-carp-description
+      raffle:
+        settings: short
     - type: GhostTakeoverAvailable
     - type: HTN
       rootTask:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
index 58d30ccfc0..a6641efe8c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -232,6 +232,8 @@
   - type: GhostRole
     prob: 0
     description: ghost-role-information-angry-slimes-description
+    raffle:
+      settings: short
   - type: NpcFactionMember
     factions:
     - SimpleHostile
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
index 5511c40baa..74658f0a2d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -12,6 +12,8 @@
     makeSentient: true
     name: ghost-role-information-hellspawn-name
     description: ghost-role-information-hellspawn-description
+    raffle:
+      settings: default
   - type: RotationVisuals
     defaultRotation: 90
     horizontalRotation: 90
@@ -53,6 +55,7 @@
   - type: Perishable
   - type: Reflect
     reflectProb: 0.7
+    innate: true
     reflects:
       - Energy
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index 1fcd074b8e..aa12eac1c2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -90,6 +90,8 @@
     name: ghost-role-information-rat-king-name
     description: ghost-role-information-rat-king-description
     rules: ghost-role-information-rat-king-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
index 83d3dbd069..8a56a39916 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -56,6 +56,8 @@
     name: ghost-role-information-revenant-name
     description: ghost-role-information-revenant-description
     rules: ghost-role-information-revenant-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Revenant
     malfunctionWhitelist:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 7a36046a0f..b405a67d06 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -154,6 +154,8 @@
     makeSentient: true
     name: ghost-role-information-honkbot-name
     description: ghost-role-information-honkbot-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     interactSuccessString: petting-success-honkbot
@@ -179,6 +181,8 @@
     makeSentient: true
     name: ghost-role-information-jonkbot-name
     description: ghost-role-information-jonkbot-description
+    raffle:
+      settings: default
   - type: InteractionPopup
     interactSuccessSound:
       path: /Audio/Items/brokenbikehorn.ogg
@@ -315,9 +319,65 @@
     makeSentient: true
     name: ghost-role-information-mimebot-name
     description: ghost-role-information-mimebot-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     interactSuccessString: petting-success-mimebot
     interactFailureString: petting-failure-mimebot
   - type: Inventory
     templateId: head
+
+- type: entity
+  parent: MobSiliconBase
+  id: MobSupplyBot
+  name: supplybot
+  description: Delivers cargo!
+  components:
+  - type: Sprite
+    sprite: Mobs/Silicon/Bots/supplybot.rsi
+    layers:
+    - state: supplybot
+  - type: GhostRole
+    name: ghost-role-information-supplybot-name
+    description: ghost-role-information-supplybot-description
+  - type: Construction
+    graph: SupplyBot
+    node: bot
+  - type: Access
+    tags:
+    - Cargo
+    - Maintenance
+    - Salvage
+  - type: Dumpable
+  - type: Storage
+    maxItemSize: Huge
+    grid:
+    - 0,0,9,3
+  - type: UserInterface
+    interfaces:
+      enum.StorageUiKey.Key:
+        type: StorageBoundUserInterface
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+  - type: UnpoweredFlashlight
+  - type: PointLight
+    enabled: false
+    radius: 3.5
+    softness: 2
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBorg
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - FootstepSound
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+    - Supply
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index b3a80f90c7..77cf43cdbc 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -126,6 +126,8 @@
     makeSentient: true
     name: ghost-role-information-slimes-name
     description: ghost-role-information-slimes-description
+    raffle:
+      settings: short
   - type: Speech
     speechVerb: Slime
     speechSounds: Slime
@@ -197,6 +199,8 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short
 
 - type: entity
   name: green slime
@@ -232,6 +236,8 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short
 
 - type: entity
   name: yellow slime
@@ -267,3 +273,5 @@
         - SimpleHostile
     - type: GhostRole
       description: ghost-role-information-angry-slimes-description
+      raffle:
+        settings: short
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
index bd5711f82e..de3a282eeb 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -104,6 +104,8 @@
     name: ghost-role-information-xeno-name
     description: ghost-role-information-xeno-description
     rules: ghost-role-information-xeno-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: TypingIndicator
     proto: alien
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 0eda8ae9d7..cb9dc1c911 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -14,6 +14,8 @@
     makeSentient: true
     name: ghost-role-information-space-dragon-name
     description: ghost-role-information-space-dragon-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: HTN
     rootTask:
@@ -89,6 +91,12 @@
     speedModifierThresholds:
       250: 0.7
       400: 0.5
+  # disable taking damage from fire, since its a fire breathing dragon
+  - type: Flammable
+    damage:
+      types: {}
+  - type: Temperature
+    heatDamageThreshold: 800
   - type: Metabolizer
     solutionOnBody: false
     updateInterval: 0.25
@@ -139,10 +147,33 @@
     spawnRiftAction: ActionSpawnRift
   - type: GenericAntag
     rule: Dragon
+  - type: ActionGun
+    action: ActionDragonsBreath
+    gunProto: DragonsBreathGun
   - type: GuideHelp
     guides:
     - MinorAntagonists
 
+- type: entity
+  noSpawn: true
+  id: DragonsBreathGun
+  name: dragon's lung
+  description: For dragon's breathing
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 5
+    rechargeSound:
+      path: /Audio/Animals/space_dragon_roar.ogg
+  - type: BasicEntityAmmoProvider
+    proto: ProjectileDragonsBreath
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Animals/space_dragon_roar.ogg
+    soundEmpty: null
+    projectileSpeed: 5
+
 - type: entity
   parent: BaseMobDragon
   id: MobDragonDungeon
@@ -150,6 +181,8 @@
   components:
   - type: GhostRole
     description: ghost-role-information-space-dragon-dungeon-description
+    raffle:
+      settings: default
   - type: SlowOnDamage
     speedModifierThresholds:
       100: 0.7
@@ -179,6 +212,7 @@
       state: icon
     event: !type:DragonSpawnRiftActionEvent
     useDelay: 1
+    priority: 3
 
 - type: entity
   id: ActionDevour
@@ -190,3 +224,18 @@
     icon: { sprite : Interface/Actions/devour.rsi, state: icon }
     iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
     event: !type:DevourActionEvent
+    priority: 1
+
+- type: entity
+  noSpawn: true
+  id: ActionDragonsBreath
+  name: "[color=orange]Dragon's Breath[/color]"
+  description: Spew out flames at anyone foolish enough to attack you!
+  components:
+  - type: WorldTargetAction
+    # TODO: actual sprite
+    icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
index 63e27b8c53..b7fb7eb66c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -44,6 +44,8 @@
     name: ghost-role-information-cerberus-name
     description: ghost-role-information-cerberus-description
     rules: ghost-role-information-cerberus-rules
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: MeleeWeapon
     altDisarm: false
diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
index 26c0ae30ec..c7b4464350 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -13,6 +13,8 @@
       makeSentient: true
       name: ghost-role-information-guardian-name
       description: ghost-role-information-guardian-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Input
       context: "human"
@@ -120,6 +122,8 @@
       makeSentient: true
       name: ghost-role-information-holoparasite-name
       description: ghost-role-information-holoparasite-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: NameIdentifier
       group: Holoparasite
@@ -150,6 +154,8 @@
       makeSentient: true
       name: ghost-role-information-ifrit-name
       description: ghost-role-information-ifrit-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomSprite
       available:
@@ -176,6 +182,8 @@
       makeSentient: true
       name: ghost-role-information-holoclown-name
       description: ghost-role-information-holoclown-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: NameIdentifier
       group: Holoparasite
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
index 20a6403ae3..2435770ff2 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -26,6 +26,8 @@
     - type: GhostRole
       name: ghost-role-information-Death-Squad-name
       description: ghost-role-information-Death-Squad-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ DeathSquadGear ]
@@ -62,6 +64,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGear ]
@@ -92,6 +96,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVA ]
@@ -114,6 +120,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-leader-name
       description: ghost-role-information-ert-leader-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTLeaderGearEVALecter ]
@@ -145,6 +153,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -174,6 +184,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-chaplain-name
       description: ghost-role-information-ert-chaplain-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTChaplainGearEVA ]
@@ -205,6 +217,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -234,6 +248,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-janitor-name
       description: ghost-role-information-ert-janitor-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTJanitorGearEVA ]
@@ -265,6 +281,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -294,6 +312,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-engineer-name
       description: ghost-role-information-ert-engineer-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTEngineerGearEVA ]
@@ -325,6 +345,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -354,6 +376,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVA ]
@@ -375,6 +399,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-security-name
       description: ghost-role-information-ert-security-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTSecurityGearEVALecter ]
@@ -406,6 +432,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -435,6 +463,8 @@
     - type: GhostRole
       name: ghost-role-information-ert-medical-name
       description: ghost-role-information-ert-medical-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ ERTMedicalGearEVA ]
@@ -463,6 +493,8 @@
     - type: GhostRole
       name: ghost-role-information-cburn-agent-name
       description: ghost-role-information-cburn-agent-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: RandomMetadata
       nameSegments:
@@ -489,6 +521,8 @@
     - type: GhostRole
       name: ghost-role-information-centcom-official-name
       description: ghost-role-information-centcom-official-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Loadout
       prototypes: [ CentcomGear ]
@@ -551,5 +585,7 @@
     - type: GhostRole
       name: ghost-role-information-cluwne-name
       description: ghost-role-information-cluwne-description
+      raffle:
+        settings: default
     - type: GhostTakeoverAvailable
     - type: Cluwne
diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
index f9132ce0ea..76727181b4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -17,6 +17,8 @@
   - type: GhostRole
     name: ghost-role-information-skeleton-pirate-name
     description: ghost-role-information-skeleton-pirate-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Loadout
     prototypes: [PirateGear]
@@ -31,6 +33,8 @@
   - type: GhostRole
     name: ghost-role-information-skeleton-biker-name
     description: ghost-role-information-skeleton-biker-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Loadout
     prototypes: [SkeletonBiker]
@@ -44,6 +48,8 @@
   - type: GhostRole
     name: ghost-role-information-closet-skeleton-name
     description: ghost-role-information-closet-skeleton-description
+    raffle:
+      settings: default
   - type: GhostTakeoverAvailable
   - type: Loadout
     prototypes: [LimitedPassengerGear]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 56bcfff306..7600882925 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -810,6 +810,8 @@
     allowMovement: true
     description: ghost-role-information-BreadDog-description
     rules: ghost-role-information-BreadDog-rules
+    raffle:
+      settings: short
   - type: GhostTakeoverAvailable
   - type: BarkAccent
   - type: Speech
@@ -827,6 +829,7 @@
   - type: Puller
     needsHands: false
   - type: Examiner
+  - type: DoAfter
   - type: CombatMode
   - type: MeleeWeapon
     soundHit:
@@ -834,4 +837,4 @@
     hidden: true
     damage:
       groups:
-        Brute: 1
\ No newline at end of file
+        Brute: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index 71b38959ce..c939dec52c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -672,6 +672,8 @@
     allowMovement: true
     description: ghost-role-information-Cak-description
     rules: ghost-role-information-Cak-rules
+    raffle:
+      settings: short
   - type: GhostTakeoverAvailable
   - type: OwOAccent
   - type: Speech
@@ -689,6 +691,7 @@
   - type: Puller
     needsHands: false
   - type: Examiner
+  - type: DoAfter
   - type: CombatMode
   - type: MeleeWeapon
     soundHit:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
index 3ce39afceb..c62783fcee 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
@@ -12,6 +12,8 @@
     name: ghost-role-information-syndicate-reinforcement-name
     description: ghost-role-information-syndicate-reinforcement-description
     rules: ghost-role-information-syndicate-reinforcement-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobHumanSyndicateAgent
   - type: EmitSoundOnUse
@@ -37,6 +39,8 @@
     name: ghost-role-information-syndicate-monkey-reinforcement-name
     description: ghost-role-information-syndicate-monkey-reinforcement-description
     rules: ghost-role-information-syndicate-monkey-reinforcement-rules
+    raffle:
+      settings: default
   - type: GhostRoleMobSpawner
     prototype: MobMonkeySyndicateAgent
     selectablePrototypes: ["SyndicateMonkey", "SyndicateKobold"]
@@ -61,5 +65,7 @@
       name: Syndicate Assault Cyborg
       description: Nuclear operatives needs reinforcements. You, a cold silicon killing machine, will help them.
       rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
+      raffle:
+        settings: default
     - type: GhostRoleMobSpawner
       prototype: PlayerBorgSyndicateAssaultBattery
diff --git a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
index 10c41efc54..667d5da11c 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/whistles.yml
@@ -6,8 +6,12 @@
   description: Someone forgot to turn off kettle?
   components:
   - type: Item
+    sprite: Objects/Fun/whistles.rsi
     size: Tiny
+  - type: Sprite
+    sprite: Objects/Fun/whistles.rsi
   - type: Clothing
+    sprite: Objects/Fun/whistles.rsi
     quickEquip: false
     slots: neck
   - type: UseDelay
@@ -16,7 +20,14 @@
     sound:
       collection: BaseWhistle
   - type: Whistle
-    distance: 5
+    distance: 3
+
+- type: entity
+  parent: BaseWhistle
+  id: Whistle
+  components:
+  - type: Sprite
+    state: whistle
 
 - type: entity
   parent: BaseWhistle
@@ -24,10 +35,11 @@
   description: Sound of it make you feel fear.
   components:
   - type: Sprite
-    sprite: Objects/Fun/whistle.rsi
-    state: securityWhistle
-  - type: Item
-    sprite: Objects/Fun/whistle.rsi
+    state: sec
+  - type: Clothing
+    equippedPrefix: sec
+  - type: Whistle
+    distance: 5
 
 - type: entity
   parent: BaseWhistle
@@ -36,13 +48,9 @@
   description: A whistle used by Syndicate commanders to draw attention. Avanti!
   components:
   - type: Sprite
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    state: icon
+    state: trench
   - type: Clothing
-    sprite: Clothing/Neck/Misc/whistles.rsi
-    quickEquip: False
-    slots:
-    - neck
+    equippedPrefix: trench
   - type: EmitSoundOnUse
     sound:
       collection: TrenchWhistle
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index a42b2fa113..a02f94215b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -212,6 +212,11 @@
     enabled: false
     radius: 8
     energy: 5
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellMedium
   - type: Anchorable
   - type: Damageable
     damageContainer: Inorganic
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index b794e42ff7..e7ebb1b98d 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -313,7 +313,7 @@
   name: mirror shield
   parent: BaseShield
   id: MirrorShield
-  description: Eerily glows red... you hear the geometer whispering
+  description: Glows an eerie red. You hear the Geometer whispering...
   components:
     - type: Sprite
       state: mirror-icon
@@ -321,6 +321,7 @@
       heldPrefix: mirror
     - type: Reflect
       reflectProb: 0.95
+      innate: true
       reflects:
         - Energy
     - type: Blocking #Mirror shield reflects heat/laser, but is relatively weak to everything else.
@@ -408,6 +409,7 @@
     - type: Reflect
       enabled: false
       reflectProb: 0.95
+      innate: true
       reflects:
         - Energy
     - type: Blocking
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 3005f6b947..6fdb77fe5f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -42,6 +42,8 @@
   - type: SolutionTransfer
     maxTransferAmount: 30
     canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: drink
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
index ed36861bb2..39a35dba8c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -48,6 +48,8 @@
   - type: SolutionTransfer
     maxTransferAmount: 30
     canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: beaker
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index db81ebbe49..ce0e0b629a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -136,6 +136,8 @@
     solution: beaker
   - type: SolutionTransfer
     canChangeTransferAmount: true
+  - type: SolutionItemStatus
+    solution: beaker
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 65942e330e..7bdd32f457 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem
   id: GasTankBase
@@ -238,3 +238,6 @@
     outputPressure: 101.3
   - type: Clothing
     sprite: Objects/Tanks/plasma.rsi
+    slots:
+    - Belt
+    - suitStorage
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 3556d1c8f8..d6adcd614e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -30,6 +30,39 @@
   - type: IgniteOnCollide
     fireStacks: 0.35
 
+- type: entity
+  noSpawn: true
+  parent: BaseBulletTrigger
+  id: ProjectileDragonsBreath
+  name: dragon's breath
+  description: Try not to get toasted.
+  components:
+  - type: PointLight
+    color: "#E25822"
+    radius: 3.0
+    energy: 5.0
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    layers:
+    - state: fireball
+      shader: unshaded
+  - type: IgnitionSource
+    temperature: 1000
+    ignited: true
+  - type: RepeatingTrigger
+    delay: 0.5 # line of fire as well as if it hits something
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
+    intensitySlope: 1
+    maxIntensity: 3
+    canCreateVacuum: false
+    deleteAfterExplosion: false
+    repeatable: true
+  - type: TimedDespawn
+    lifetime: 5
+
 - type: entity
   id: ProjectileAnomalyFireball
   name: fireball
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index 13c8b9cb25..7f593353bb 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,6 +78,8 @@
     malus: 0
   - type: Reflect
     enabled: false
+    reflectProb: 0.5
+    minReflectProb: 0.25
   - type: IgnitionSource
     temperature: 700
 
@@ -218,7 +220,7 @@
   name: double-bladed energy sword
   parent: EnergySword
   id: EnergySwordDouble
-  description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
+  description: Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
   components:
   - type: EnergySword
   - type: ItemToggle
@@ -269,7 +271,8 @@
     size: Small
     sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
   - type: Reflect
-    reflectProb: .75
+    reflectProb: .80
+    minReflectProb: .65
     spread: 75
   - type: UseDelay
     delay: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 7cc33b7155..11e7f983e0 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,12 +13,17 @@
     attackRate: 1.5
     damage:
       types:
-        Slash: 17 #cmon, it has to be at least BETTER than the rest.
+        Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Reflect
     enabled: true
-    reflectProb: .1
+    # Design intent: a robust captain or tot can sacrifice movement to make the most of this weapon, but they have to
+    # really restrict themselves to walking speed or less.
+    reflectProb: 0.5
+    velocityBeforeNotMaxProb: 1.0
+    velocityBeforeMinProb: 3.0
+    minReflectProb: 0.1
     spread: 90
   - type: Item
     size: Normal
@@ -83,6 +88,9 @@
     - Back
     - Belt
   - type: Reflect
+    reflectProb: 0.3
+    velocityBeforeNotMaxProb: 6.0 # don't punish ninjas for being ninjas
+    velocityBeforeMinProb: 10.0
 
 - type: entity
   name: machete
@@ -152,7 +160,7 @@
     wideAnimationRotation: -135
     damage:
       types:
-        Slash: 16
+        Slash: 15
     soundHit:
         path: /Audio/Weapons/bladeslice.ogg
   - type: Item
@@ -164,7 +172,7 @@
   name: The Throngler
   parent: BaseItem
   id: Throngler
-  description: Why would you make this?
+  description: Why would someone make this?
   components:
     - type: Sharp
     - type: Sprite
@@ -185,7 +193,10 @@
         path: /Audio/Effects/explosion_small1.ogg
     - type: Reflect
       enabled: true
-      reflectProb: .25
+      reflectProb: 0.5 # In robust hands, deflects as well as an e-sword
+      velocityBeforeNotMaxProb: 1.0
+      velocityBeforeMinProb: 3.0
+      minReflectProb: 0.1
       spread: 90
     - type: Item
       size: Ginormous
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 5d6b1088f1..43d1228a40 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -6,6 +6,11 @@
   description: Necessary for connecting two space craft together.
   components:
   - type: Docking
+  - type: DockingSignalControl
+  - type: DeviceLinkSource
+    ports:
+      - DoorStatus
+      - DockStatus
   - type: Fixtures
     fixtures:
       fix1:
@@ -75,7 +80,6 @@
   suffix: Glass, Docking
   description: Necessary for connecting two space craft together.
   components:
-  - type: Docking
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
     snapCardinals: false
@@ -127,7 +131,6 @@
   suffix: Glass, Docking
   description: Necessary for connecting two space craft together.
   components:
-  - type: Docking
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
     snapCardinals: false
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 2556b9ddfd..a3124c09f6 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -51,6 +51,10 @@
       disposals: !type:Container
   - type: Physics
     bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
   - type: Construction
     graph: Toilet
     node: toilet
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 167b376214..436eaa2697 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -91,7 +91,7 @@
     bulb: Tube
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: ContainerContainer
     containers:
       light_bulb: !type:ContainerSlot
@@ -132,7 +132,7 @@
     hasLampOnSpawn: LightTube
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: AmbientOnPowered
   - type: AmbientSound
     volume: -15
@@ -151,7 +151,7 @@
     hasLampOnSpawn: LedLightTube
     damage:
       types:
-        Heat: 2.5
+        Heat: 1 #LEDs don't get as hot
   - type: PointLight
     radius: 15
     energy: 1
@@ -173,19 +173,19 @@
 - type: entity
   id: PoweredlightExterior
   description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Blue
+  suffix: Exterior
   parent: Poweredlight
   components:
   - type: PoweredLight
     hasLampOnSpawn: ExteriorLightTube
     damage:
       types:
-        Heat: 5
+        Heat: 4 #brighter light gets hotter
 
 - type: entity
   parent: AlwaysPoweredWallLight
   id: AlwaysPoweredLightExterior
-  suffix: Always Powered, Blue
+  suffix: Always Powered, Exterior
   components:
   - type: PointLight
     radius: 12
@@ -204,7 +204,7 @@
     hasLampOnSpawn: SodiumLightTube
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 10
     energy: 2.5
@@ -291,7 +291,7 @@
     bulb: Bulb
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DeviceNetwork
@@ -330,7 +330,7 @@
     hasLampOnSpawn: LedLightBulb
     damage:
       types:
-        Heat: 2.5
+        Heat: 1
 
 - type: entity
   id: PoweredSmallLight
@@ -345,7 +345,7 @@
     hasLampOnSpawn: LightBulb
     damage:
       types:
-        Heat: 5
+        Heat: 2
 
 #Emergency Lights
 - type: entity
@@ -400,7 +400,7 @@
     hasLampOnSpawn: LightTubeCrystalCyan
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
@@ -427,7 +427,7 @@
     hasLampOnSpawn: LightTubeCrystalBlue
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
@@ -454,7 +454,7 @@
     hasLampOnSpawn: LightTubeCrystalPink
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
@@ -481,7 +481,7 @@
     hasLampOnSpawn: LightTubeCrystalOrange
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
@@ -508,7 +508,7 @@
     hasLampOnSpawn: LightTubeCrystalRed
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
@@ -535,7 +535,7 @@
     hasLampOnSpawn: LightTubeCrystalGreen
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: PointLight
     radius: 8
     energy: 3
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
index 34a6f08294..2afde4ef3f 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -79,7 +79,7 @@
     bulb: Tube
     damage:
       types:
-        Heat: 20
+        Heat: 2
   - type: ContainerContainer
     containers:
       light_bulb: !type:ContainerSlot
@@ -124,7 +124,7 @@
     hasLampOnSpawn: LightTube
     damage:
       types:
-        Heat: 20
+        Heat: 2
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered
@@ -153,7 +153,7 @@
     hasLampOnSpawn: LedLightTube
     damage:
       types:
-        Heat: 20
+        Heat: 1
   - type: StaticPrice
     price: 25
   - type: AmbientOnPowered
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
index 8eceb76b63..72f5439646 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml
@@ -89,7 +89,7 @@
     on: false
     damage:
       types:
-        Heat: 5
+        Heat: 2
   - type: ApcPowerReceiver
   - type: ExtensionCableReceiver
   - type: DeviceNetwork
@@ -145,4 +145,4 @@
     volume: 0
     range: 10
     sound:
-      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
\ No newline at end of file
+      path: "/Audio/Effects/Lightning/strobeepsilon.ogg"
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 6a351d47f0..8b2cb5d5c7 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -129,6 +129,7 @@
     - PlushiePenguin
     - PlushieHuman
     - ClothingHeadHatCowboyRed
+    - Whistle
   - type: WiresPanel
   - type: Wires
     layoutId: Arcade
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index e4ae1c42e8..5830813f8f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -50,9 +50,44 @@
   - type: ResearchClient
   - type: TechnologyDatabase
 
+# a lathe that can be sped up with space lube / slowed down with glue
+- type: entity
+  abstract: true
+  parent: BaseLathe
+  id: BaseLatheLube
+  components:
+  - type: ReagentSpeed
+    solution: lube
+    modifiers:
+      SpaceLube: 0.25
+      SpaceGlue: 5
+  - type: SolutionContainerManager
+    solutions:
+      lube:
+        maxVol: 250
+  - type: Spillable
+    solution: lube
+  - type: RefillableSolution
+    solution: lube
+  - type: ExaminableSolution
+    solution: lube
+
+- type: entity
+  abstract: true
+  id: BaseHyperlathe
+  components:
+  - type: Lathe
+    materialUseMultiplier: 0.5
+    timeMultiplier: 1.5
+  - type: LatheHeatProducing
+  - type: ReagentSpeed
+    modifiers:
+      SpaceLube: 0.8 # being faster means less heat so lube needs to be nerfed
+      SpaceGlue: 5 # no change from normal lathe, overheat!!!
+
 - type: entity
   id: Autolathe
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: autolathe
   description: It produces items using metal and glass.
   components:
@@ -215,22 +250,18 @@
 
 - type: entity
   id: AutolatheHyperConvection
-  parent: Autolathe
+  parent: [Autolathe, BaseHyperlathe]
   name: hyper convection autolathe
   description: A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
   components:
   - type: Sprite
     sprite: Structures/Machines/autolathe_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
   - type: Machine
     board: AutolatheHyperConvectionMachineCircuitboard
 
 - type: entity
   id: Protolathe
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: protolathe
   description: Converts raw materials into useful objects.
   components:
@@ -334,22 +365,18 @@
 
 - type: entity
   id: ProtolatheHyperConvection
-  parent: Protolathe
+  parent: [Protolathe, BaseHyperlathe]
   name: hyper convection protolathe
   description: A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
   components:
   - type: Sprite
     sprite: Structures/Machines/protolathe_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
   - type: Machine
     board: ProtolatheHyperConvectionMachineCircuitboard
 
 - type: entity
   id: CircuitImprinter
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: circuit imprinter
   description: Prints circuit boards for machines.
   components:
@@ -470,22 +497,18 @@
 
 - type: entity
   id: CircuitImprinterHyperConvection
-  parent: CircuitImprinter
+  parent: [CircuitImprinter, BaseHyperlathe]
   name: hyper convection circuit imprinter
   description: A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively.
   components:
   - type: Sprite
     sprite: Structures/Machines/circuit_imprinter_hypercon.rsi
-  - type: Lathe
-    materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
-  - type: LatheHeatProducing
   - type: Machine
     board: CircuitImprinterHyperConvectionMachineCircuitboard
 
 - type: entity
   id: ExosuitFabricator
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: exosuit fabricator
   description: Creates parts for robotics and other mechanical needs
   components:
@@ -643,7 +666,7 @@
 
 - type: entity
   id: SecurityTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: security techfab
   description: Prints equipment for use by security crew.
   components:
@@ -764,7 +787,7 @@
 
 - type: entity
   id: AmmoTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: ammo techfab
   description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy.
   components:
@@ -815,7 +838,7 @@
 
 - type: entity
   id: MedicalTechFab
-  parent: BaseLathe
+  parent: BaseLatheLube
   name: medical techfab
   description: Prints equipment for use by the medbay.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 46eb57c388..e8025556aa 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -96,6 +96,9 @@
         enabled:
           True: { state: gasFilterFOn }
           False: { state: gasFilterF }
+  - type: Construction
+    node: filterflipped
+
   - type: PipeColorVisuals
   - type: NodeContainer
     nodes:
@@ -196,6 +199,8 @@
         !type:PipeNode
         nodeGroupID: Pipe
         pipeDirection: North
+  - type: Construction
+    node: mixerflipped
 
 - type: entity
   parent: GasPipeBase
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 0224105117..7aee589647 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -271,6 +271,8 @@
           bounds: "-0.25,-0.5,0.5,0.5"
         mask:
         - SubfloorMask
+  - type: Construction
+    node: routerflipped
 
 - type: entity
   id: DisposalJunction
@@ -353,6 +355,8 @@
           bounds: "-0.25,-0.5,0.5,0.5"
         mask:
         - SubfloorMask
+  - type: Construction
+    node: junctionflipped
 
 - type: entity
   id: DisposalYJunction
@@ -489,3 +493,5 @@
         pipe:
           Free: { state: signal-router-flipped-free }
           Anchored: { state: signal-router-flipped }
+  - type: Construction
+    node: signal_router_flipped
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index 725f4c9b0f..496ea41611 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -5,6 +5,8 @@
   placement:
     mode: SnapgridCenter
   components:
+  - type: Pullable
+  - type: Anchorable
   - type: Sprite
     sprite: Structures/Storage/morgue.rsi
     layers:
@@ -28,11 +30,11 @@
         shape:
           !type:PhysShapeAabb
           bounds: "-0.5,-0.5,0.5,0.5"
-        density: 190
+        density: 1000
         mask:
         - MachineMask
         layer:
-        - WallLayer
+        - HalfWallLayer
   - type: EntityStorage
     isCollidableWhenOpen: true
     showContents: false
diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index 79a1e35799..d0b468ca53 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -27,9 +27,9 @@
           bounds: "-0.3,-0.3,0.3,0.3"
         density: 140
         mask:
-        - MachineMask
+        - TableMask
         layer:
-        - MachineLayer
+        - TableLayer
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 799805272d..3787f4e603 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -4,7 +4,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 5
     startDelay: 10
     duration: 120
     earliestStart: 20
@@ -24,11 +24,10 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 6
+      weight: 2
       startDelay: 10
       duration: 240
-      minimumPlayers: 50
-      earliestStart: 40
+      earliestStart: 20
     - type: CargoGiftsRule
       description: cargo-gift-pizza-large
       sender: cargo-gift-default-sender
@@ -44,7 +43,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 4
+      weight: 5
       startDelay: 10
       duration: 240
       earliestStart: 30
@@ -90,7 +89,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 8
+      weight: 6
       startDelay: 10
       duration: 120
       minimumPlayers: 30
@@ -132,7 +131,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 6
+      weight: 4
       startDelay: 10
       duration: 120
       earliestStart: 10
@@ -154,7 +153,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 3
+      weight: 4
       startDelay: 10
       duration: 120
       earliestStart: 20
@@ -174,7 +173,7 @@
   noSpawn: true
   components:
     - type: StationEvent
-      weight: 2
+      weight: 3
       startDelay: 10
       duration: 120
       earliestStart: 20
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 6692efb3f5..092a178ac3 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -4,7 +4,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 8
     startDelay: 30
     duration: 35
   - type: AnomalySpawnRule
@@ -15,7 +15,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 5
+    weight: 8
     startDelay: 30
     duration: 35
   - type: BluespaceArtifactRule
@@ -26,7 +26,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 1
+    weight: 2
     reoccurrenceDelay: 5
     earliestStart: 1
     duration: 1
@@ -38,7 +38,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 7
     duration: 1
     minimumPlayers: 15
   - type: BreakerFlipRule
@@ -51,7 +51,7 @@
   - type: StationEvent
     startAnnouncement: station-event-bureaucratic-error-announcement
     minimumPlayers: 25
-    weight: 5
+    weight: 3
     duration: 1
   - type: BureaucraticErrorRule
 
@@ -73,7 +73,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 5
     duration: 1
     minimumPlayers: 10
   - type: RandomEntityStorageSpawnRule
@@ -85,10 +85,10 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 5
+    weight: 6.5
     duration: 1
-    earliestStart: 45
-    reoccurrenceDelay: 60
+    earliestStart: 40
+    reoccurrenceDelay: 20
     minimumPlayers: 20
   - type: RandomSpawnRule
     prototype: SpawnPointGhostDragon
@@ -99,11 +99,11 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 6
     duration: 1
     earliestStart: 30
-    reoccurrenceDelay: 60
-    minimumPlayers: 40
+    reoccurrenceDelay: 20
+    minimumPlayers: 30
   - type: NinjaSpawnRule
 
 - type: entity
@@ -119,15 +119,16 @@
   - type: RandomSpawnRule
     prototype: MobRevenant
 
-- type: entity
-  id: FalseAlarm
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    weight: 15
-    duration: 1
-  - type: FalseAlarmRule
+# disabled until event is rewritten to be more interesting
+#- type: entity
+#  id: FalseAlarm
+#  parent: BaseGameRule
+#  noSpawn: true
+#  components:
+#  - type: StationEvent
+#    weight: 15
+#    duration: 1
+#  - type: FalseAlarmRule
 
 - type: entity
   id: GasLeak
@@ -139,9 +140,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     endAnnouncement: station-event-gas-leak-end-announcement
-    earliestStart: 10
-    minimumPlayers: 5
-    weight: 10
+    weight: 8
     startDelay: 20
   - type: GasLeakRule
 
@@ -153,7 +152,7 @@
   - type: StationEvent
     earliestStart: 15
     minimumPlayers: 15
-    weight: 5
+    weight: 7
     startDelay: 50
     duration: 240
   - type: KudzuGrowthRule
@@ -187,9 +186,8 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    earliestStart: 30
-    minimumPlayers: 35
-    weight: 5
+    earliestStart: 15
+    weight: 6
     duration: 50
   - type: VentCrittersRule
     entries:
@@ -203,7 +201,7 @@
       prob: 0.001
     specialEntries:
     - id: SpawnPointGhostRatKing
-      prob: 0.005
+      prob: 0.001
 
 - type: entity
   id: CockroachMigration
@@ -215,7 +213,7 @@
     startAudio:
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
-    weight: 5
+    weight: 6
     duration: 50
   - type: VentCrittersRule
     entries:
@@ -230,7 +228,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 5
     startAnnouncement: station-event-power-grid-check-start-announcement
     endAnnouncement: station-event-power-grid-check-end-announcement
     startAudio:
@@ -248,8 +246,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 6
     duration: 1
+    maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
     startAudio:
       path: /Audio/Announcements/attention.ogg
   - type: RandomSentienceRule
@@ -260,7 +259,7 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 8
     startAnnouncement: station-event-solar-flare-start-announcement
     endAnnouncement: station-event-solar-flare-end-announcement
     startAudio:
@@ -299,31 +298,6 @@
     duration: 60
   - type: VentClogRule
 
-- type: entity
-  id: VentCritters
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    startAnnouncement: station-event-vent-creatures-start-announcement
-    startAudio:
-      path: /Audio/Announcements/attention.ogg
-    startDelay: 10
-    earliestStart: 15
-    minimumPlayers: 15
-    weight: 5
-    duration: 60
-  - type: VentCrittersRule
-    entries:
-    - id: MobMouse
-      prob: 0.02
-    - id: MobMouse1
-      prob: 0.02
-    - id: MobMouse2
-      prob: 0.02
-    - id: MobMouseCancer
-      prob: 0.001
-
 - type: entity
   id: SlimesSpawn
   parent: BaseGameRule
@@ -377,8 +351,8 @@
       path: /Audio/Announcements/attention.ogg
     startDelay: 10
     earliestStart: 20
-    minimumPlayers: 15
-    weight: 1
+    minimumPlayers: 20
+    weight: 1.5
     duration: 60
   - type: VentCrittersRule
     entries:
@@ -392,8 +366,8 @@
   components:
   - type: StationEvent
     earliestStart: 50
-    minimumPlayers: 15
-    weight: 3
+    minimumPlayers: 30
+    weight: 2
     duration: 1
   - type: ZombieRule
   - type: AntagSelection
@@ -425,10 +399,9 @@
   noSpawn: true
   components:
   - type: StationEvent
-    earliestStart: 45
-    weight: 5
+    earliestStart: 35
+    weight: 5.5
     minimumPlayers: 20
-    reoccurrenceDelay: 30
     duration: 1
   - type: LoadMapRule
     mapPath: /Maps/Shuttles/striker.yml
@@ -461,9 +434,9 @@
   components:
   - type: StationEvent
     earliestStart: 25
-    weight: 15
+    weight: 8
     minimumPlayers: 15
-    reoccurrenceDelay: 60
+    reoccurrenceDelay: 30
     startAnnouncement: station-event-communication-interception
     startAudio:
       path: /Audio/Announcements/intercept.ogg
@@ -485,9 +458,10 @@
   noSpawn: true
   components:
   - type: StationEvent
-    weight: 10
+    weight: 7
     duration: 150
     maxDuration: 300
+    reoccurrenceDelay: 30
   - type: MassHallucinationsRule
     minTimeBetweenIncidents: 0.1
     maxTimeBetweenIncidents: 300
@@ -504,9 +478,9 @@
     startAnnouncement: station-event-immovable-rod-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    weight: 5
+    weight: 3.5
     duration: 1
-    earliestStart: 45
+    earliestStart: 30
     minimumPlayers: 20
   - type: ImmovableRodRule
     rodPrototypes:
@@ -541,7 +515,7 @@
   id: IonStorm
   components:
   - type: StationEvent
-    weight: 10
+    weight: 8
     reoccurrenceDelay: 20
     duration: 1
   - type: IonStormRule
@@ -554,5 +528,6 @@
     - type: StationEvent
       earliestStart: 0
       minimumPlayers: 20
+      maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
       weight: 5
     - type: MobReplacementRule
diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml
index 428735709f..c417132992 100644
--- a/Resources/Prototypes/GameRules/midround.yml
+++ b/Resources/Prototypes/GameRules/midround.yml
@@ -43,7 +43,7 @@
       playerRatio: 1
       lateJoinAdditional: true
       allowNonHumans: true
-      multiAntagSetting: All
+      multiAntagSetting: NotExclusive
       startingGear: ThiefGear
       components:
       - type: Pacified
diff --git a/Resources/Prototypes/GhostRoleRaffles/deciders.yml b/Resources/Prototypes/GhostRoleRaffles/deciders.yml
new file mode 100644
index 0000000000..b23464cf70
--- /dev/null
+++ b/Resources/Prototypes/GhostRoleRaffles/deciders.yml
@@ -0,0 +1,3 @@
+- type: ghostRoleRaffleDecider
+  id: default
+  decider: !type:RngGhostRoleRaffleDecider {}
diff --git a/Resources/Prototypes/GhostRoleRaffles/settings.yml b/Resources/Prototypes/GhostRoleRaffles/settings.yml
new file mode 100644
index 0000000000..7ed9326ee0
--- /dev/null
+++ b/Resources/Prototypes/GhostRoleRaffles/settings.yml
@@ -0,0 +1,15 @@
+# for important antag roles (nukie reinforcements, ninja, etc.)
+- type: ghostRoleRaffleSettings
+  id: default
+  settings:
+    initialDuration: 30
+    joinExtendsDurationBy: 10
+    maxDuration: 90
+
+# for roles that don't matter too much or are available plentifully (e.g. space carp)
+- type: ghostRoleRaffleSettings
+  id: short
+  settings:
+    initialDuration: 10
+    joinExtendsDurationBy: 5
+    maxDuration: 30
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 889b12a08e..fe826a8334 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -1,3 +1,14 @@
+# Timers
+- type: loadoutEffectGroup
+  id: Command
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Command
+      time: 3600 # 1 hour
+
+# Plushies
 - type: loadout
   id: PlushieLizard
   equipment: PlushieLizard
@@ -7,7 +18,95 @@
   storage:
     back:
     - PlushieLizard
+    
+- type: loadout
+  id: PlushieSpaceLizard
+  equipment: PlushieSpaceLizard
 
+- type: startingGear
+  id: PlushieSpaceLizard
+  storage:
+    back:
+    - PlushieSpaceLizard
+
+# Smokeables
+- type: loadout
+  id: Lighter
+  equipment: Lighter
+
+- type: startingGear
+  id: Lighter
+  storage:
+    back:
+    - Lighter
+
+- type: loadout
+  id: CigPackGreen
+  equipment: CigPackGreen
+
+- type: startingGear
+  id: CigPackGreen
+  storage:
+    back:
+    - CigPackGreen
+
+- type: loadout
+  id: CigPackRed
+  equipment: CigPackRed
+
+- type: startingGear
+  id: CigPackRed
+  storage:
+    back:
+    - CigPackRed
+
+- type: loadout
+  id: CigPackBlue
+  equipment: CigPackBlue
+
+- type: startingGear
+  id: CigPackBlue
+  storage:
+    back:
+    - CigPackBlue
+
+- type: loadout
+  id: CigPackBlack
+  equipment: CigPackBlack
+
+- type: startingGear
+  id: CigPackBlack
+  storage:
+    back:
+    - CigPackBlack
+
+- type: loadout
+  id: CigarCase
+  equipment: CigarCase
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: Command
+
+- type: startingGear
+  id: CigarCase
+  storage:
+    back:
+    - CigarCase
+
+- type: loadout
+  id: CigarGold
+  equipment: CigarGold
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: Command
+
+- type: startingGear
+  id: CigarGold
+  storage:
+    back:
+    - CigarGold
+
+# Pins
 - type: loadout
   id: ClothingNeckLGBTPin
   equipment: ClothingNeckLGBTPin
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index e3313bff44..c6a1d3a822 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -6,6 +6,14 @@
   maxLimit: 3
   loadouts:
   - PlushieLizard
+  - PlushieSpaceLizard
+  - Lighter
+  - CigPackGreen
+  - CigPackRed
+  - CigPackBlue
+  - CigPackBlack
+  - CigarCase
+  - CigarGold
   - ClothingNeckLGBTPin
   - ClothingNeckAromanticPin
   - ClothingNeckAsexualPin
diff --git a/Resources/Prototypes/NPCs/debug.yml b/Resources/Prototypes/NPCs/debug.yml
new file mode 100644
index 0000000000..c7929be103
--- /dev/null
+++ b/Resources/Prototypes/NPCs/debug.yml
@@ -0,0 +1,90 @@
+- type: htnCompound
+  id: DebugCounterCompound
+  branches:
+    - tasks:
+      - !type:HTNPrimitiveTask
+        operator: !type:AddFloatOperator
+          targetKey: Count
+          amount: 1
+
+      - !type:HTNPrimitiveTask
+        operator: !type:SayKeyOperator
+          key: Count
+
+      - !type:HTNPrimitiveTask
+          operator: !type:RandomOperator
+            targetKey: IdleTime
+            minKey: MinimumIdleTime
+            maxKey: MaximumIdleTime
+
+      - !type:HTNPrimitiveTask
+        operator: !type:WaitOperator
+          key: IdleTime
+        preconditions:
+          - !type:KeyExistsPrecondition
+            key: IdleTime
+
+- type: htnCompound
+  id: DebugRandomCounterCompound
+  branches:
+    - tasks:
+      - !type:HTNPrimitiveTask
+        operator: !type:SetRandomFloatOperator
+          targetKey: Count
+          minAmount: 0
+          maxAmount: 100
+
+      - !type:HTNPrimitiveTask
+        operator: !type:SayKeyOperator
+          key: Count
+
+      - !type:HTNPrimitiveTask
+          operator: !type:RandomOperator
+            targetKey: IdleTime
+            minKey: MinimumIdleTime
+            maxKey: MaximumIdleTime
+
+      - !type:HTNPrimitiveTask
+        operator: !type:WaitOperator
+          key: IdleTime
+        preconditions:
+          - !type:KeyExistsPrecondition
+            key: IdleTime
+
+- type: htnCompound
+  id: DebugRandomLessCompound
+  branches:
+    - tasks:
+      - !type:HTNPrimitiveTask
+        operator: !type:SetRandomFloatOperator
+          targetKey: Count
+          minAmount: 0
+          maxAmount: 100
+
+      - !type:HTNPrimitiveTask
+        operator: !type:SayKeyOperator
+          key: Count
+        preconditions:
+          - !type:KeyFloatLessPrecondition
+            key: Count
+            value: 50
+      
+      - !type:HTNPrimitiveTask
+          operator: !type:RandomOperator
+            targetKey: IdleTime
+            minKey: MinimumIdleTime
+            maxKey: MaximumIdleTime
+
+      - !type:HTNPrimitiveTask
+        operator: !type:WaitOperator
+          key: IdleTime
+        preconditions:
+          - !type:KeyExistsPrecondition
+            key: IdleTime
+
+    - tasks:
+      - !type:HTNPrimitiveTask
+        operator: !type:SpeakOperator
+          speech: "fuck!"
+
+ 
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
new file mode 100644
index 0000000000..efabb849bb
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
@@ -0,0 +1,23 @@
+- type: constructionGraph
+  id: SupplyBot
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: bot
+      steps:
+      - tag: ProximitySensor
+        icon:
+          sprite: Objects/Misc/proximity_sensor.rsi
+          state: icon
+        name: proximity sensor
+      - tag: BorgHead
+        icon:
+          sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+          state: borg_head
+        name: borg head
+        doAfter: 1
+      - material: Steel
+        amount: 10
+  - node: bot
+    entity: MobSupplyBot
diff --git a/Resources/Prototypes/SoundCollections/expeditions.yml b/Resources/Prototypes/SoundCollections/expeditions.yml
new file mode 100644
index 0000000000..526a16f3c2
--- /dev/null
+++ b/Resources/Prototypes/SoundCollections/expeditions.yml
@@ -0,0 +1,5 @@
+- type: soundCollection
+  id: ExpeditionEnd
+  files:
+  - /Audio/Expedition/tension_session.ogg
+  - /Audio/Expedition/deadline.ogg
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index 54330133d7..73b36c137b 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -7,6 +7,7 @@
 - type: emote
   id: Cough
   name: chat-emote-name-cough
+  icon: Interface/Emotes/cough.png
   category: Vocal
   whitelist:
     components:
@@ -46,6 +47,7 @@
 - type: emote
   id: Yawn
   name: chat-emote-name-yawn
+  icon: Interface/Emotes/yawn.png
   category: Vocal
   whitelist:
     components:
diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml
index 29a09c03cb..84e48c1c23 100644
--- a/Resources/Prototypes/Voice/speech_emotes.yml
+++ b/Resources/Prototypes/Voice/speech_emotes.yml
@@ -41,7 +41,7 @@
   id: Laugh
   name: chat-emote-name-laugh
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/laugh.png
   whitelist:
     components:
     - Vocal
@@ -82,7 +82,7 @@
   id: Honk
   name: chat-emote-name-honk
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/honk.png
   whitelist:
     requireAll: true
     components:
@@ -107,7 +107,7 @@
   id: Sigh
   name: chat-emote-name-sigh
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/sigh.png
   whitelist:
     components:
     - Vocal
@@ -127,7 +127,7 @@
   id: Whistle
   name: chat-emote-name-whistle
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/whistle.png
   whitelist:
     components:
     - Vocal
@@ -150,7 +150,7 @@
   id: Crying
   name: chat-emote-name-crying
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/cry.png
   whitelist:
     components:
     - Vocal
@@ -182,7 +182,7 @@
   name: chat-emote-name-squish
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/squish.png
   whitelist:
     components:
     - Vocal
@@ -206,7 +206,7 @@
   name: chat-emote-name-chitter
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chitter.png
   whitelist:
     components:
     - Vocal
@@ -230,6 +230,7 @@
   name: chat-emote-name-squeak
   category: Vocal
   available: false
+  icon: Interface/Emotes/squeak.png
   whitelist:
     components:
       - Vocal
@@ -253,7 +254,7 @@
   name: chat-emote-name-click
   category: Vocal
   available: false
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/click.png
   whitelist:
     components:
     - Vocal
@@ -274,7 +275,7 @@
   id: Clap
   name: chat-emote-name-clap
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/clap.png
   whitelist:
     components:
     - Hands
@@ -294,7 +295,7 @@
   id: Snap
   name: chat-emote-name-snap
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/snap.png
   whitelist:
     components:
     - Hands
@@ -321,7 +322,7 @@
   id: Salute
   name: chat-emote-name-salute
   category: Hands
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/salute.png
   whitelist:
     components:
     - Hands
@@ -340,7 +341,7 @@
 - type: emote
   id: DefaultDeathgasp
   name: chat-emote-name-deathgasp
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/deathgasp.png
   whitelist:
     components:
     - MobState
@@ -351,14 +352,14 @@
 - type: emote
   id: MonkeyDeathgasp
   name: chat-emote-name-deathgasp
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/deathgasp.png
   chatMessages: ["chat-emote-msg-deathgasp-monkey"]
 
 - type: emote
   id: Buzz
   name: chat-emote-name-buzz
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/buzz.png
   whitelist:
     requireAll: true
     components:
@@ -383,13 +384,14 @@
   id: Weh
   name: chat-emote-name-weh
   category: Vocal
+  icon: Interface/Emotes/weh.png
   chatMessages: [Wehs!]
 
 - type: emote
   id: Chirp
   name: chat-emote-name-chirp
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chirp.png
   whitelist:
     requireAll: true
     components:
@@ -414,7 +416,7 @@
   id: Beep
   name: chat-emote-name-beep
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/beep.png
   whitelist:
     requireAll: true
     components:
@@ -439,7 +441,7 @@
   id: Chime
   name: chat-emote-name-chime
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/chime.png
   whitelist:
     requireAll: true
     components:
@@ -464,7 +466,7 @@
   id: Buzz-Two
   name: chat-emote-name-buzztwo
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/buzztwo.png
   whitelist:
     requireAll: true
     components:
@@ -507,7 +509,7 @@
   id: Ping
   name: chat-emote-name-ping
   category: Vocal
-  icon: Interface/Actions/scream.png
+  icon: Interface/Emotes/ping.png
   whitelist:
     requireAll: true
     components:
diff --git a/Resources/Prototypes/lobbyscreens.yml b/Resources/Prototypes/lobbyscreens.yml
index f1c2b0c78b..1a21e231e3 100644
--- a/Resources/Prototypes/lobbyscreens.yml
+++ b/Resources/Prototypes/lobbyscreens.yml
@@ -1,43 +1 @@
-- type: lobbyBackground
-  id: CPBeginning
-  background: /Textures/_CP14/LobbyScreens/beginning.webp
-
-#- type: lobbyBackground
-#  id: Robotics
-#  background: /Textures/LobbyScreens/robotics.webp
-#
-#- type: lobbyBackground
-#  id: Supermatter
-#  background: /Textures/LobbyScreens/supermatter.webp
-#
-#- type: lobbyBackground
-#  id: Warden
-#  background: /Textures/LobbyScreens/warden.webp
-#
-#- type: lobbyBackground
-#  id: Pharmacy
-#  background: /Textures/LobbyScreens/pharmacy.webp
-#
-#- type: lobbyBackground
-#  id: SSXIV
-#  background: /Textures/LobbyScreens/ssxiv.webp
-#
-#- type: lobbyBackground
-#  id: Susstation
-#  background: /Textures/LobbyScreens/susstation.webp
-#
-#- type: lobbyBackground
-#  id: SkellyVsTheRev
-#  background: /Textures/LobbyScreens/skellyvstherev.webp
-#
-#- type: lobbyBackground
-#  id: Doomed
-#  background: /Textures/LobbyScreens/doomed.webp
-#
-#- type: lobbyBackground
-#  id: Blueprint
-#  background: /Textures/LobbyScreens/blueprint.webp
-#
-#- type: lobbyBackground
-#  id: Behonker
-#  background: /Textures/LobbyScreens/behonker.webp
+# Dont used in CrystallPunk
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 3424d5a4e5..253aa48565 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1283,6 +1283,9 @@
 - type: Tag
   id: WeaponShotgunKammerer
 
+- type: Tag
+  id: WeldingMask
+
 - type: Tag
   id: WetFloorSign
 
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
new file mode 100644
index 0000000000..7ca224617c
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
new file mode 100644
index 0000000000..eedef5290d
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
new file mode 100644
index 0000000000..2e6ce0b9b9
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
new file mode 100644
index 0000000000..41ca0dddfb
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
new file mode 100644
index 0000000000..1ad417f8f1
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by OnsenCapy (NamelessName on Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
index 2c29e1db67..85732b2735 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..e24011cc92
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png
deleted file mode 100644
index 8617b5a239..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png
deleted file mode 100644
index d205602ccf..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..5ad3f9c79a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png
deleted file mode 100644
index 22a6c42d8f..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png
deleted file mode 100644
index a204bb0a78..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
index 2c29e1db67..85732b2735 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..34d61a07ca
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png
deleted file mode 100644
index 8de0449073..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png
deleted file mode 100644
index 7a96aed731..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..99955187a8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png
deleted file mode 100644
index 030472239b..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png
deleted file mode 100644
index 270a9249db..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
index 2c29e1db67..85732b2735 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..f79fe95b57
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png
deleted file mode 100644
index b53973feec..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png
deleted file mode 100644
index 0f534f88b1..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..f94eecb411
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png
deleted file mode 100644
index 819ca15f44..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png
deleted file mode 100644
index 848bfcfe88..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
index 2c29e1db67..85732b2735 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..17790bee54
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png
deleted file mode 100644
index 7d3ce26157..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png
deleted file mode 100644
index 67f7494249..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..d25030e13a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png
index 8f01538a7a..486ae09969 100644
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png
deleted file mode 100644
index 4eaae604cd..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png
deleted file mode 100644
index f5f2f5c6f7..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
index 2c29e1db67..85732b2735 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..d300533c20
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png
deleted file mode 100644
index c7b53126d4..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png
deleted file mode 100644
index b6be1feebb..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..a9b1843872
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png
deleted file mode 100644
index 946a56c89a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png
deleted file mode 100644
index e490de88da..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png
new file mode 100644
index 0000000000..879ce40a74
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-light-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png
new file mode 100644
index 0000000000..40f2eca45a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-unshaded-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png
new file mode 100644
index 0000000000..f61a157050
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/equipped-head-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png
deleted file mode 100644
index 9ee768d5ee..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png
deleted file mode 100644
index 8a7835b20d..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png
deleted file mode 100644
index e9ba55de1e..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png
deleted file mode 100644
index 2990605237..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png
deleted file mode 100644
index 6c80725c0a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png
deleted file mode 100644
index 45d73f73df..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
index 1faf3aa6d0..63b9901450 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -32,27 +32,15 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "equipped-head-vox",
       "directions": 4
     },
     {
-      "name": "inhand-left-unshaded",
+      "name": "equipped-head-light-vox",
       "directions": 4
     },
     {
-      "name": "inhand-left-light",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-unshaded",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-light",
+      "name": "equipped-head-unshaded-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
index ac71856cd7..4655926986 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..f02e33c658
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png
deleted file mode 100644
index 5216ba5dd9..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png
deleted file mode 100644
index 2ffe013c12..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..9a0101f09a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png
deleted file mode 100644
index 6a5d075d80..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png
deleted file mode 100644
index 25796fc014..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png
new file mode 100644
index 0000000000..40d1f9a0c6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-unshaded-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png
new file mode 100644
index 0000000000..cc2fa16917
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/equipped-head-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png
deleted file mode 100644
index 60ca0efa13..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png
deleted file mode 100644
index 43f27a890f..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png
deleted file mode 100644
index 118914c8d3..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png
deleted file mode 100644
index 602020b276..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
index 16f509fa99..1df9c2ddbf 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by EmoGarbage404",
+  "copyright": "Made by EmoGarbage404. Vox states by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -28,19 +28,11 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "equipped-head-vox",
       "directions": 4
     },
     {
-      "name": "inhand-left-unshaded",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-unshaded",
+      "name": "equipped-head-unshaded-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
index 5a77b01e50..5956a9b0f4 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github). Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,14 @@
     {
       "name": "on-equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..a974f19a2b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..88ee1fbad6
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..02363a7faa
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png
deleted file mode 100644
index ee1c8d1c4b..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png
deleted file mode 100644
index fa19eea1f7..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
index d30007b497..107ac8c189 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1",
+  "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,11 +15,7 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..1a7ed3b866
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png
deleted file mode 100644
index 6be2c34d76..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png
deleted file mode 100644
index e3c056ada0..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
index f1d91cbc4c..f0207bb688 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,11 +15,7 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
index 7bea2d1a86..6eb2417810 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..683d6ce97d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png
deleted file mode 100644
index f7375fd600..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png
deleted file mode 100644
index c2adc46cdb..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..574b3d985b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png
deleted file mode 100644
index 7c6e7831c8..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png
deleted file mode 100644
index 5ee7bc104c..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
index 7bea2d1a86..096f280355 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -18,11 +18,7 @@
       "directions": 4
     },
     {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
@@ -30,11 +26,7 @@
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..900ed95dc0
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png
deleted file mode 100644
index cafca9a938..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png
deleted file mode 100644
index 9645b59e2d..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..1a40bc3a26
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png
deleted file mode 100644
index bff16d72c4..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png
deleted file mode 100644
index 355977d540..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
index d431123de2..d80c50a1c4 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..efacfba741
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png
deleted file mode 100644
index b26ae9a31f..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png
deleted file mode 100644
index fc0edd4a97..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..09d835e9b9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png
deleted file mode 100644
index 3f5034da6c..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png
deleted file mode 100644
index 45776a03b8..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..11de602a6e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png
deleted file mode 100644
index 81e8a07fdd..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png
deleted file mode 100644
index e10648fd9b..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json
index 2d5aaae8c7..2a085063a4 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,11 +15,7 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
index 7bea2d1a86..6eb2417810 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..1952c3152d
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png
deleted file mode 100644
index 8fbfbbf6c6..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png
deleted file mode 100644
index 035c6fc061..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..3011afac41
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png
deleted file mode 100644
index 85cbfb321a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png
deleted file mode 100644
index c876fefb6c..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..8d0cd093f3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json
index 2244815b78..48f0cbb615 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/piratecaptainhelm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github) for ss14",
+    "copyright": "Made by brainfood1183 (github) for ss14. Vox states by Flareguy for Space Station 14",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,10 @@
         {
             "name": "equipped-HELMET",
             "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..663733cfe8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json
index 2244815b78..5bb20fd0fb 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/pirateeva.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (github) for ss14",
+    "copyright": "Made by brainfood1183 (github) for ss14. Vox state by Flareguy for Space Station 14",
     "size": {
         "x": 32,
         "y": 32
@@ -13,6 +13,10 @@
         {
             "name": "equipped-HELMET",
             "directions": 4
+        },
+        {
+            "name": "equipped-HELMET-vox",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
index 7bea2d1a86..dd046e6d22 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..9f2f5c41df
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
deleted file mode 100644
index dc16b147b8..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
deleted file mode 100644
index e289c62a84..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..b577d32feb
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
deleted file mode 100644
index b107272dda..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
deleted file mode 100644
index 59a3181afb..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
index 7bea2d1a86..6eb2417810 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..c3f24c8b34
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png
deleted file mode 100644
index b11a533c26..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png
deleted file mode 100644
index b9c9df2350..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..007852fc10
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png
deleted file mode 100644
index 12d13f0e18..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png
deleted file mode 100644
index 141dc492a4..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..025e702667
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png
deleted file mode 100644
index c0c5863a3b..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png
deleted file mode 100644
index f29877bf5a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json
index c53de83901..afc9f219ac 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/santahelm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -15,11 +15,7 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
index 7bea2d1a86..6eb2417810 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..6954a4e1a8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png
deleted file mode 100644
index c81cf30dc9..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png
deleted file mode 100644
index f5b449d7b9..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..b48bb710d9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png
deleted file mode 100644
index 32f699cb47..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png
deleted file mode 100644
index 71d2a09325..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
index 0180f7feb0..00d69acbf7 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14",
+  "copyright": "sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -20,6 +20,14 @@
     {
       "name": "on-equipped-HELMET",
       "directions": 4
+    },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..2a3619db8e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..5b9e2b19ad
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
index 75d37bdc8e..2aa3ba14f1 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e,",
+  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..439b6c6ebc
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png
deleted file mode 100644
index 68329b89c1..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png
deleted file mode 100644
index 38cc8ca8a6..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..56bca1c618
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png
deleted file mode 100644
index 742af4cd00..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png
deleted file mode 100644
index 79f70ac121..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vox.png
new file mode 100644
index 0000000000..d0124f743b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-light-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vox.png
new file mode 100644
index 0000000000..4486bff562
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-unshaded-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vox.png
new file mode 100644
index 0000000000..80a31d544f
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/equipped-head-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png
deleted file mode 100644
index 7f1657d9e5..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-light.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png
deleted file mode 100644
index fe450b8df1..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png
deleted file mode 100644
index 81cecd01c2..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png
deleted file mode 100644
index 7749494c56..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png
deleted file mode 100644
index be08f2c257..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-unshaded.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png
deleted file mode 100644
index 2bbec0f04c..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
index a8d7f24c6f..3a3c70208e 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original by Emisse, modified by EmoGarbage404",
+  "copyright": "Original by Emisse, modified by EmoGarbage404. Vox states by Flareguy for SS14",
 
   "size": {
     "x": 32,
@@ -33,27 +33,15 @@
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "equipped-head-vox",
       "directions": 4
     },
     {
-      "name": "inhand-left-unshaded",
+      "name": "equipped-head-light-vox",
       "directions": 4
     },
     {
-      "name": "inhand-left-light",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-unshaded",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-light",
+      "name": "equipped-head-unshaded-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
index e9de1ae57b..9b960ec32b 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -21,24 +21,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..eb2027c5fa
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png
deleted file mode 100644
index 1b108753b3..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png
deleted file mode 100644
index dc0500af77..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..8804afa3d8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png
deleted file mode 100644
index c1350c8242..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png
deleted file mode 100644
index db67f97b6f..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
index 97f37c327b..935b7e1c30 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
+  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14",
 
   "size": {
     "x": 32,
@@ -18,24 +18,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..5276e3f681
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png
deleted file mode 100644
index 79a96cd711..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png
deleted file mode 100644
index 0c7b0caddf..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..65069f91c7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png
deleted file mode 100644
index 505808fc9d..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png
deleted file mode 100644
index 862f6294fb..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
index 97f37c327b..935b7e1c30 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
+  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14",
 
   "size": {
     "x": 32,
@@ -18,24 +18,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..4f4b2f0f77
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png
deleted file mode 100644
index 22a8dd14b1..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png
deleted file mode 100644
index 71572c0ffd..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..bf7243ed32
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png
deleted file mode 100644
index 5a40993d72..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png
deleted file mode 100644
index 27a27d1e8e..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
index b69addc476..9adc3b7cef 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)",
+  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github). Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..4d5f2cf4b7
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png
deleted file mode 100644
index 97f21fd350..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png
deleted file mode 100644
index 0e950a6674..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..8c072609c9
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png
deleted file mode 100644
index 0e174c04c3..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png
deleted file mode 100644
index b049400348..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
index 7bea2d1a86..6eb2417810 100644
--- a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox states by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,24 +17,16 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-inhand-right",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "on-inhand-left",
+      "name": "off-equipped-HELMET-vox",
       "directions": 4
     },
     {
-      "name": "on-inhand-right",
+      "name": "on-equipped-HELMET-vox",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..647d0e76c1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png
deleted file mode 100644
index 90b7c2574a..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png
deleted file mode 100644
index de647331f9..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..a0345048e8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png
deleted file mode 100644
index fc11467e8f..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png
deleted file mode 100644
index 131989b592..0000000000
Binary files a/Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
index 7597f1c421..b7dbbb8cd2 100644
--- a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/clothing/head.dmi. Vox states taken from paradise at https://github.com/ParadiseSS13/Paradise/blob/765461f14aa4dd4f1edc33242c667843134678b5/icons/mob/clothing/species/vox/head.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "off-inhand-left",
       "directions": 4
@@ -29,6 +33,10 @@
       "name": "on-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "on-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..ea6e7edce8
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..301ff00e34
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..58e8aa9e70
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json
index e0ee93d642..e55d1eb469 100644
--- a/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/bombsuit.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..50d4ec39d5
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
index 2e66e1d835..89a026869f 100644
--- a/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/eva.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..b5f224b98a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png
index c64f69b0d8..f6f0e58c6b 100644
Binary files a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
index 2e66e1d835..89a026869f 100644
--- a/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/eva_large.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..62ff233af1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json
index 2e66e1d835..89a026869f 100644
--- a/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/eva_syndicate.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json
index 9530d0f7aa..014284471a 100644
--- a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station and modified by Peptide90 https://github.com/ParadiseSS13/Paradise/commit/46bb8d448f52278a8f027b3f5bdf061e39d06140",
+  "copyright": "Taken from paradise station and modified by Peptide90 https://github.com/ParadiseSS13/Paradise/commit/46bb8d448f52278a8f027b3f5bdf061e39d06140. Vox states by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "off-equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "off-inhand-left",
       "directions": 4
@@ -29,6 +33,10 @@
       "name": "on-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "on-equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "on-inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..ad7bbad447
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 0000000000..2ebb820f60
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/firehelmet.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..522a2eb923
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
index a470e00944..3cf0b8d484 100644
--- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..952b32f3a1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
index 5048ec6bb0..abfed0635a 100644
--- a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb",
+  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..703d927ecf
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
index db2bbfafd4..a0653e5c65 100644
--- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "light-equipped-HELMET",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..59f1e3263b
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
index 5463bcbfd2..9a6c9935ec 100644
--- a/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit)",
+  "copyright": "Taken from paradise https://github.com/ParadiseSS13/Paradise/tree/master/icons (unknown commit). Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..1ed974c206
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
index 8836c0b646..f505b4e75e 100644
--- a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites & vox state by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png
new file mode 100644
index 0000000000..e228a8a33a
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
index 8bedbfb78e..a0bf954585 100644
--- a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy. Vox state taken from from Paradise at https://github.com/ParadiseSS13/Paradise/blob/b1658390731745adf5cc9fb039bb0f17ad3c11a7/icons/mob/clothing/species/vox/helmet.dmi ",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "equipped-HELMET-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png
new file mode 100644
index 0000000000..f504228f7d
Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/equipped-MASK-vox.png differ
diff --git a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
index 05b793baab..021dcf76b7 100644
--- a/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
+++ b/Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-MASK",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-vox",
+      "directions": 4
+    },
     {
       "name": "up-equipped-MASK",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json b/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
deleted file mode 100644
index 31cda14261..0000000000
--- a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/meta.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Firewatchin on Discord.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-
-  "states": [
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..cffb51e5e5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
index 3f816376c7..f9e375d700 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894",
+    "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894. Vox states by Flareguy for Space Station 14",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e0bfdfbc38
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
index b979f8bfb8..a9366f0bc1 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/69842/commits/d8138946b0ed06fced522729ac8eaa0596864329 edited by Skarletto (github), edited by Emisse for ss14. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..f0e99ee3c3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
index 30607d47ea..c429d1116c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb",
+  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..1d9b1d1459
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
index e482264df5..434b53f472 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..ea3c78dfbe
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
index e0d437b8ec..9b89dd2d07 100644
--- a/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Armor/security_slim.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..1fd6c3828d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json
index 20e876460d..cc68d97d37 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json
@@ -11,6 +11,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "icon"
     }
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..31e6f31708
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
index 55e082d620..fa20ea7d59 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , edited by Alekshhh. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..fa32996aa8
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..ce7c029026
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..6d96d0a037
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..f83538ee60
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..58b84263ac
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..547839061b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..fa9a53d373
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..9cba3e8ef3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..89369f8794
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..973451e5f5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e432bb2d01
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
index 02abb07806..c2b48b1d76 100644
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
@@ -21,6 +21,14 @@
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..2363b4118d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..be85f19ea6
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
index 4fbd43a08b..b7b0719efa 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox state by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e5f648a31f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
index 4fbd43a08b..6de2d485b8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..cb2c630801
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
index 4fbd43a08b..6de2d485b8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..284954aabc
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
index 4fbd43a08b..daa64b2f5c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite made by Flareguy",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..29130c57f0
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
index 4fbd43a08b..6de2d485b8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/12c21ced8432015485484b17e311dcceb7c458f6. Vox sprite by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..b896fbef73
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..644c67846b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
index 342d784473..dd6598db97 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Emisse for SS14",
+  "copyright": "Made by Emisse for SS14. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..52c1cea7cf
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
index 2cfc2220e1..c62258c9ea 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by EmoGarbage404",
+  "copyright": "Made by EmoGarbage404. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..bf6028dfdb
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
index a9fe29a589..d14adbda1c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by brainfood1183 (github). Vox state made by Flareguy for SS14",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..631815d06b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
index 4f1d92e87e..084993c50a 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14",
+  "copyright": "Sprite made by Gtheglorious based on the sprite made by emisse for ss14, vox state made by Flareguy for SS14.",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..cbf92dffde
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
index 6ba7a445cd..4a1b60796c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, edited by Emisse for SS14. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..a6066c595b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..7e4e050f9d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..c082fd2340
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
index d977572f2a..b1c9a09ed0 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Texture edit from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..2085dc1c83
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json
index 3641da6f50..9acde9a4de 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..6b6a36e0e7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e8149c9cd9
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
index 00685e361b..87d6d0e669 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser",
+  "copyright": "Taken from paradise station git at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..f0638fc80d
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
index 8840689d9e..8663673f5c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (Github) for ss14",
+    "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..ce3d20cc20
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
index 8840689d9e..8663673f5c 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by brainfood1183 (Github) for ss14",
+    "copyright": "Made by brainfood1183 (Github) for ss14. Vox state made by Flareguy for SS14",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..629584e995
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..b8c26d6f41
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..0d8f373dc1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json
index 13748622fe..eb28d4c8a1 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/santahardsuit.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Edited by StanTheCarpenter. Originally taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..8c301cbe55
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..30cf54325e
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
index 54a0ed85fa..180439fbcc 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14",
+  "copyright": "Sprite made by Gtheglorious based on the sprite made by Alekshhh for SS14. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..c06d8fae90
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
index 32d6d8901a..8acf2ddc61 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Sprite made by Gtheglorious based on the sprite taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..999761e150
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
index d8001fe037..0f941dba75 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
@@ -2,7 +2,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original by Emisse, modified by EmoGarbage404",
+  "copyright": "Original by Emisse, modified by EmoGarbage404. Vox state made by Flareguy for SS14",
 
   "size": {
     "x": 32,
@@ -16,6 +16,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..df2abbbf03
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
index e216d7371a..7feaeab5c8 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, equipped-OUTERCLOTHING-monkey made by Dutch-VanDerLinde, vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..24c1aa2a87
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
index c9f0d90ea1..2f56eb487f 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
+  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..869cf41ce2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
index c9f0d90ea1..2f56eb487f 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd",
+  "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..9417c5547b
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
index 373d282410..7a1d624eb1 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiemedic.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github)",
+  "copyright": "Based on tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by EmoGarbage404 (github). Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..d4e4ab0f53
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e4ea5d5fa4
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..df08ef1986
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json
index 5de1afef0f..ccfd0c0303 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/ghostsheet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/38809",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/38809. Vox state by Flareguy for SS1",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-OUTERCLOTHING",
             "directions": 4
         },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..6423bd5c73
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
index 442bfb2920..b5f8619d65 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/grey_hoodie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -17,6 +17,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "open-equipped-OUTERCLOTHING",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..ff43b16105
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json
index b20ea0277f..cd0053daea 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/red_racoon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by netwy(583844759429316618)",
+  "copyright": "Created by netwy(583844759429316618). Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..d5efb0d4b2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..b50aa58c48
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
index 9a00c5741a..ed75ee470b 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/skubbody.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "EOBGames from tgstation",
+  "copyright": "EOBGames from tgstation. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,10 @@
     {
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-vox.png
new file mode 100644
index 0000000000..0a23447f94
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/body-overlay-2-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
index b41f0209d7..2eda10ef51 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/straight_jacket.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "body-overlay-2",
       "directions": 4
     },
+    {
+      "name": "body-overlay-2-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..e39761b360
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..a586ec3fe3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
index e482264df5..15aef26a56 100644
--- a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..36cea26549
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
index 659ed1dddf..256947e75f 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
+  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..2fb7750843
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
index 86e27c9c1f..f5dee1d1ce 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..99b555f7ac
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
index b2c50fc4c6..4b7a5cedc1 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..9601695dac
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
index e164425199..d535031b2e 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..7f71b04f1c
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
index e164425199..d535031b2e 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/eva_syndicate.rsi/meta.json
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "equipped-OUTERCLOTHING-monkey",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..c585862bb1
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
index e482264df5..920eab5520 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..13f9dacef3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
index e482264df5..920eab5520 100644
--- a/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..50e6d79c20
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
index e482264df5..920eab5520 100644
--- a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..6d9f6dbead
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
index 05ec90135e..4c56c355a4 100644
--- a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..ee35c40fbd
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
index e482264df5..920eab5520 100644
--- a/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/vest.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000..17d75d29b3
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
index e482264df5..0e30ab4d3f 100644
--- a/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Vests/webvest.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Vox state by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
index b3ecbd9712..7dce3cbc9b 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png b/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png
new file mode 100644
index 0000000000..37404e77f7
Binary files /dev/null and b/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png differ
diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json b/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
similarity index 64%
rename from Resources/Textures/Objects/Fun/whistle.rsi/meta.json
rename to Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
index 59159ff617..f5d94c891a 100644
--- a/Resources/Textures/Objects/Fun/whistle.rsi/meta.json
+++ b/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
@@ -1,14 +1,14 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by Foleps (discord)",
+    "copyright": "Deflecting icon by Ubaser",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
         {
-            "name": "securityWhistle"
+            "name": "deflecting0"
         }
     ]
 }
diff --git a/Resources/Textures/Interface/Emotes/attributions.yml b/Resources/Textures/Interface/Emotes/attributions.yml
new file mode 100644
index 0000000000..125651e419
--- /dev/null
+++ b/Resources/Textures/Interface/Emotes/attributions.yml
@@ -0,0 +1,117 @@
+# Attempted to keep the files in alphabetical order so its easier to audit.
+# Finding individual authors is an unfeasible task. If you can reference the author please do so.
+
+- files: ["beep.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from borg_chest.png and borg_head.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzz.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["buzztwo.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bee texture (0.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chime.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing desk bell texture (normal.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chirp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing nymph texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["chitter.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mothroach.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["clap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["click.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing crab.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["cough.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["cry.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["deathgasp.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["honk.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from existing bikehorn texture (icon.png) by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["laugh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["ping.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["salute.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["sigh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["snap.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["squeak.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from mouse-0.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["squish.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from blue_adult_slime.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["vocal.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
+
+- files: ["weh.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from plushie_lizard.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["whistle.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Modified from scream.png by TyAshley (AllenTheGreat)"
+  source: "https://github.com/TyAshley"
+
+- files: ["yawn.png"]
+  license: "CC-BY-SA-3.0"
+  copyright: "Created by TyAshley (AllenTheGreat) at commit 7f6c7cd82943dbc9a1fe8a79d6a924ac600b3fdb"
+  source: "https://github.com/TyAshley"
diff --git a/Resources/Textures/Interface/Emotes/beep.png b/Resources/Textures/Interface/Emotes/beep.png
new file mode 100644
index 0000000000..f59b0925ab
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/beep.png differ
diff --git a/Resources/Textures/Interface/Emotes/buzz.png b/Resources/Textures/Interface/Emotes/buzz.png
new file mode 100644
index 0000000000..da7ac363a4
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/buzz.png differ
diff --git a/Resources/Textures/Interface/Emotes/buzztwo.png b/Resources/Textures/Interface/Emotes/buzztwo.png
new file mode 100644
index 0000000000..460a8868a5
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/buzztwo.png differ
diff --git a/Resources/Textures/Interface/Emotes/chime.png b/Resources/Textures/Interface/Emotes/chime.png
new file mode 100644
index 0000000000..ca595be5d3
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chime.png differ
diff --git a/Resources/Textures/Interface/Emotes/chirp.png b/Resources/Textures/Interface/Emotes/chirp.png
new file mode 100644
index 0000000000..57e8b67143
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chirp.png differ
diff --git a/Resources/Textures/Interface/Emotes/chitter.png b/Resources/Textures/Interface/Emotes/chitter.png
new file mode 100644
index 0000000000..f6e1101223
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/chitter.png differ
diff --git a/Resources/Textures/Interface/Emotes/clap.png b/Resources/Textures/Interface/Emotes/clap.png
new file mode 100644
index 0000000000..a0ef9e1316
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/clap.png differ
diff --git a/Resources/Textures/Interface/Emotes/click.png b/Resources/Textures/Interface/Emotes/click.png
new file mode 100644
index 0000000000..539aea7b92
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/click.png differ
diff --git a/Resources/Textures/Interface/Emotes/cough.png b/Resources/Textures/Interface/Emotes/cough.png
new file mode 100644
index 0000000000..cb1c2832ac
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/cough.png differ
diff --git a/Resources/Textures/Interface/Emotes/cry.png b/Resources/Textures/Interface/Emotes/cry.png
new file mode 100644
index 0000000000..2793a11b9d
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/cry.png differ
diff --git a/Resources/Textures/Interface/Emotes/deathgasp.png b/Resources/Textures/Interface/Emotes/deathgasp.png
new file mode 100644
index 0000000000..e27d0bb573
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/deathgasp.png differ
diff --git a/Resources/Textures/Interface/Emotes/honk.png b/Resources/Textures/Interface/Emotes/honk.png
new file mode 100644
index 0000000000..19441e4a0e
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/honk.png differ
diff --git a/Resources/Textures/Interface/Emotes/laugh.png b/Resources/Textures/Interface/Emotes/laugh.png
new file mode 100644
index 0000000000..a688fdb443
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/laugh.png differ
diff --git a/Resources/Textures/Interface/Emotes/ping.png b/Resources/Textures/Interface/Emotes/ping.png
new file mode 100644
index 0000000000..7408eb1f28
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/ping.png differ
diff --git a/Resources/Textures/Interface/Emotes/salute.png b/Resources/Textures/Interface/Emotes/salute.png
new file mode 100644
index 0000000000..5727d8fd85
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/salute.png differ
diff --git a/Resources/Textures/Interface/Emotes/sigh.png b/Resources/Textures/Interface/Emotes/sigh.png
new file mode 100644
index 0000000000..ff49a56360
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/sigh.png differ
diff --git a/Resources/Textures/Interface/Emotes/snap.png b/Resources/Textures/Interface/Emotes/snap.png
new file mode 100644
index 0000000000..ae6d81c19d
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/snap.png differ
diff --git a/Resources/Textures/Interface/Emotes/squeak.png b/Resources/Textures/Interface/Emotes/squeak.png
new file mode 100644
index 0000000000..e32a89f598
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/squeak.png differ
diff --git a/Resources/Textures/Interface/Emotes/squish.png b/Resources/Textures/Interface/Emotes/squish.png
new file mode 100644
index 0000000000..efa1ce6c5e
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/squish.png differ
diff --git a/Resources/Textures/Interface/Emotes/vocal.png b/Resources/Textures/Interface/Emotes/vocal.png
new file mode 100644
index 0000000000..9b129ec466
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/vocal.png differ
diff --git a/Resources/Textures/Interface/Emotes/weh.png b/Resources/Textures/Interface/Emotes/weh.png
new file mode 100644
index 0000000000..fea5ad3b73
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/weh.png differ
diff --git a/Resources/Textures/Interface/Emotes/whistle.png b/Resources/Textures/Interface/Emotes/whistle.png
new file mode 100644
index 0000000000..029a52af23
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/whistle.png differ
diff --git a/Resources/Textures/Interface/Emotes/yawn.png b/Resources/Textures/Interface/Emotes/yawn.png
new file mode 100644
index 0000000000..8130fc9ab4
Binary files /dev/null and b/Resources/Textures/Interface/Emotes/yawn.png differ
diff --git a/Resources/Textures/LobbyScreens/attributions.yml b/Resources/Textures/LobbyScreens/attributions.yml
index 3b81fc68fd..1e35162cbf 100644
--- a/Resources/Textures/LobbyScreens/attributions.yml
+++ b/Resources/Textures/LobbyScreens/attributions.yml
@@ -42,3 +42,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "aserovich on discord"
   source: "https://github.com/space-wizards/space-station-14"
+
+- files: ["justaweekaway.webp"]
+  license: "CC-BY-SA-3.0"
+  copyright: "plantyfern on discord"
+  source: "https://github.com/space-wizards/space-station-14"
\ No newline at end of file
diff --git a/Resources/Textures/LobbyScreens/justaweekaway.webp b/Resources/Textures/LobbyScreens/justaweekaway.webp
new file mode 100644
index 0000000000..6e8205043c
Binary files /dev/null and b/Resources/Textures/LobbyScreens/justaweekaway.webp differ
diff --git a/Resources/Textures/LobbyScreens/justaweekaway.yml b/Resources/Textures/LobbyScreens/justaweekaway.yml
new file mode 100644
index 0000000000..5c43e23305
--- /dev/null
+++ b/Resources/Textures/LobbyScreens/justaweekaway.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: true
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..89fdd599b2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/meta.json b/Resources/Textures/Objects/Fun/whistles.rsi/meta.json
new file mode 100644
index 0000000000..4f59ad60e0
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/whistles.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "sec and whistle made by Foleps (discord), trench by Firewatchin (discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+
+  "states": [
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "whistle"
+    },
+    {
+      "name": "sec-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "sec"
+    },
+    {
+      "name": "trench-equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "trench"
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png
new file mode 100644
index 0000000000..053c457f03
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/sec-equipped-NECK.png differ
diff --git a/Resources/Textures/Objects/Fun/whistle.rsi/securityWhistle.png b/Resources/Textures/Objects/Fun/whistles.rsi/sec.png
similarity index 100%
rename from Resources/Textures/Objects/Fun/whistle.rsi/securityWhistle.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/sec.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png b/Resources/Textures/Objects/Fun/whistles.rsi/trench-equipped-NECK.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/whistles.rsi/equipped-NECK.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/trench-equipped-NECK.png
diff --git a/Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png b/Resources/Textures/Objects/Fun/whistles.rsi/trench.png
similarity index 100%
rename from Resources/Textures/Clothing/Neck/Misc/whistles.rsi/icon.png
rename to Resources/Textures/Objects/Fun/whistles.rsi/trench.png
diff --git a/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png b/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png
new file mode 100644
index 0000000000..35db0ffca4
Binary files /dev/null and b/Resources/Textures/Objects/Fun/whistles.rsi/whistle.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..a37261e3f7
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
index 9dd4186ecd..59aada80e0 100644
--- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..dd19aa5680
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
index 489cf3072a..21d23712e9 100644
--- a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..f139bc6db2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
index a1661aee78..fe19dcec1c 100644
--- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..7e2f947d34
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
index ce287bf277..74fc108c09 100644
--- a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..0470c6895f
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
index a1661aee78..fe19dcec1c 100644
--- a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..db800b2a3b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
index ce287bf277..74fc108c09 100644
--- a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..db800b2a3b
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
index ce3d401ca2..d71cdae541 100644
--- a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..0470c6895f
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
index a1661aee78..fe19dcec1c 100644
--- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png
new file mode 100644
index 0000000000..e282da2e6d
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png differ
diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
index a88e367a85..2d3199f75c 100644
--- a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
@@ -21,6 +21,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/migration.yml b/Resources/migration.yml
index ac82ad5396..f08573cb42 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -214,7 +214,7 @@ ActionVehicleHorn: null
 CrateFunATV: null
 CrateFunSyndicateSegway: null
 MobTaxiBot: null
-MobSupplyBot: null
+# MobSupplyBot: null
 SpawnVehicleMotobike: null
 SpawnVehicleATV: null
 SpawnVehicleSecway: null
diff --git a/RobustToolbox b/RobustToolbox
index 7cb3aeccc2..970da5f717 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 7cb3aeccc23a894b149b4547e5fecb399c8c507f
+Subproject commit 970da5f717c921bfa110aa5dc31e74edb96dcf99
diff --git a/runclient.bat b/runclient.bat
index f580d41e9d..96237c3441 100644
--- a/runclient.bat
+++ b/runclient.bat
@@ -1,6 +1,2 @@
 @echo off
-set PDIR=%~dp0
-cd %PDIR%Bin\Content.Client
-start Content.Client.exe %*
-cd %PDIR%
-set PDIR=
+dotnet run --project Content.Client
diff --git a/runserver.bat b/runserver.bat
index 573de0a15d..5c3f8acecd 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,7 +1,3 @@
 @echo off
-set PDIR=%~dp0
-cd %PDIR%Bin\Content.Server
-call Content.Server.exe %*
-cd %PDIR%
-set PDIR=
+dotnet run --project Content.Server
 pause