From f61de36a2e8c9c3ed42b49ebeca7f64f1b07207a Mon Sep 17 00:00:00 2001
From: Absotively <jen@jenpollock.ca>
Date: Wed, 30 Sep 2026 05:52:07 +0000
Subject: [PATCH 01/69] Minor gas device UI tweaks (#42710)

* Use FancyWindow, margin of 10 for most gas devices

* Use FancyWindow, margin of 10 for gas analyzer, gas canister UI

* Adjust gas UI min sizes, resizeability, keyboard handling

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
---
 Content.Client/Atmos/UI/GasAnalyzerWindow.xaml      |  7 ++++---
 Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs   |  2 +-
 Content.Client/Atmos/UI/GasCanisterWindow.xaml      |  7 ++++---
 Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs   |  3 ++-
 Content.Client/Atmos/UI/GasFilterWindow.xaml        |  6 +++---
 Content.Client/Atmos/UI/GasFilterWindow.xaml.cs     |  3 ++-
 Content.Client/Atmos/UI/GasMixerWindow.xaml         | 10 +++++-----
 Content.Client/Atmos/UI/GasMixerWindow.xaml.cs      |  3 ++-
 Content.Client/Atmos/UI/GasPressurePumpWindow.xaml  |  6 +++---
 Content.Client/Atmos/UI/GasThermomachineWindow.xaml |  2 +-
 Content.Client/Atmos/UI/GasVolumePumpWindow.xaml    |  4 ++--
 Content.Client/Atmos/UI/SpaceHeaterWindow.xaml      | 10 +++++-----
 Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs   |  3 ++-
 13 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml b/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml
index 160b6fa281..4d93f3d4e5 100644
--- a/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml
+++ b/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml
@@ -1,7 +1,8 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                MinSize="270 420"
                SetSize="360 420" Title="{Loc 'gas-analyzer-window-name'}">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5">
+    <BoxContainer Orientation="Vertical" Margin="10">
         <BoxContainer Name="CTopBox" Orientation="Horizontal"/>
         <!-- Gas Mix Data, Populated by function -->
         <TabContainer Name="CTabContainer" VerticalExpand="True" Margin="1 1 1 2">
@@ -43,4 +44,4 @@
             </ScrollContainer>
         </TabContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs b/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs
index 3680c82a55..0c78344348 100644
--- a/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs
@@ -15,7 +15,7 @@ using Direction = Robust.Shared.Maths.Direction;
 namespace Content.Client.Atmos.UI
 {
     [GenerateTypedNameReferences]
-    public sealed partial class GasAnalyzerWindow : DefaultWindow
+    public sealed partial class GasAnalyzerWindow : FancyWindow
     {
         private readonly SharedAtmosphereSystem _atmosphere;
         private NetEntity _currentEntity = NetEntity.Invalid;
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
index 3c7647385a..576685060e 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml
@@ -1,8 +1,9 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:s="clr-namespace:Content.Client.Stylesheets"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             MinSize="480 400" Title="Canister">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="10">
         <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <Label Text="{Loc comp-gas-canister-ui-canister-status}" StyleClasses="LabelHeading"/>
             <BoxContainer Orientation="Horizontal">
@@ -49,4 +50,4 @@
             </BoxContainer>
         </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs b/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
index b21aa737ac..2638d91c74 100644
--- a/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -13,7 +14,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a canister.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class GasCanisterWindow : DefaultWindow
+    public sealed partial class GasCanisterWindow : FancyWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml b/Content.Client/Atmos/UI/GasFilterWindow.xaml
index 5077fddc61..a5a12c5d1d 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml
@@ -1,8 +1,8 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             MinSize="480 400" Title="Filter">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="10">
         <controls:SwitchButton
             Name="ToggleStatusButton"
             HorizontalAlignment="Left"
@@ -25,4 +25,4 @@
             <Button Name="SelectGasButton" Text="{Loc comp-gas-filter-ui-filter-gas-confirm}" HorizontalExpand="True" Disabled="True" />
         </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
index fb5d1e871e..afe7290b79 100644
--- a/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasFilterWindow.xaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -14,7 +15,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas filter.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class GasFilterWindow : DefaultWindow
+    public sealed partial class GasFilterWindow : FancyWindow
     {
         private readonly ButtonGroup _buttonGroup = new();
 
diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml b/Content.Client/Atmos/UI/GasMixerWindow.xaml
index c36b53798a..1468ff55a3 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml
@@ -1,8 +1,8 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            MinSize="200 200" Title="Gas Mixer">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+            Resizable="False" Title="Gas Mixer">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="10">
         <controls:SwitchButton
             Name="ToggleStatusButton"
             HorizontalAlignment="Left"
@@ -10,7 +10,7 @@
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-mixer-ui-mixer-output-pressure}"/>
             <Control MinSize="5 0" />
-            <LineEdit Name="MixerPressureOutputInput" MinSize="70 0" />
+            <LineEdit Name="MixerPressureOutputInput" MinSize="80 0" />
             <Control MinSize="5 0" />
             <Button Name="SetMaxPressureButton" Text="{Loc comp-gas-mixer-ui-mixer-max}" />
             <Control MinSize="5 0" />
@@ -34,4 +34,4 @@
             <Button Name="SetMixerPercentageButton" Text="{Loc comp-gas-mixer-ui-mixer-set}" HorizontalAlignment="Right" Disabled="True"/>
         </BoxContainer>
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
index 6592b27779..349fea101b 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Content.Client.Atmos.EntitySystems;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
@@ -19,7 +20,7 @@ namespace Content.Client.Atmos.UI
     /// Client-side UI used to control a gas mixer.
     /// </summary>
     [GenerateTypedNameReferences]
-    public sealed partial class GasMixerWindow : DefaultWindow
+    public sealed partial class GasMixerWindow : FancyWindow
     {
         public event Action<bool>? ToggleStatusButtonPressed;
         public event Action<string>? MixerOutputPressureChanged;
diff --git a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
index f2ce0aada6..0dcf39bf87 100644
--- a/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasPressurePumpWindow.xaml
@@ -1,8 +1,8 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            SetSize="340 110" MinSize="340 110" Title="Pressure Pump">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+            MinSize="50 50" Resizable="False" Title="Pressure Pump">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="10">
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <controls:SwitchButton
                 Name="ToggleStatusButton"
@@ -14,7 +14,7 @@
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Label Text="{Loc comp-gas-pump-ui-pump-output-pressure}"/>
-            <FloatSpinBox HorizontalExpand="True" Name="PumpPressureOutputInput" MinSize="70 0" />
+            <FloatSpinBox HorizontalExpand="True" Name="PumpPressureOutputInput" MinSize="155 0" />
         </BoxContainer>
     </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
index 3d1e45f0ff..2fb557a22d 100644
--- a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
+++ b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml
@@ -2,7 +2,7 @@
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                MinSize="300 120" Title="{Loc comp-gas-thermomachine-ui-title-freezer}">
-    <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+    <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="10" SeparationOverride="10">
         <controls:SwitchButton
             Name="ToggleStatusButton"
             HorizontalAlignment="Left"
diff --git a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
index 9396744ed5..4f19de94b9 100644
--- a/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
+++ b/Content.Client/Atmos/UI/GasVolumePumpWindow.xaml
@@ -1,8 +1,8 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-            MinSize="200 120" Title="Volume Pump">
-    <BoxContainer Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+            MinSize="50 50" Resizable="False" Title="Volume Pump">
+    <BoxContainer Orientation="Vertical" Margin="10" SeparationOverride="10">
         <controls:SwitchButton
             Name="ToggleStatusButton"
             HorizontalAlignment="Left"
diff --git a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml
index 3efb4fb3e5..a4fee6557c 100644
--- a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml
+++ b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml
@@ -1,9 +1,9 @@
-<DefaultWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-               MinSize="280 160" Title="{Loc comp-space-heater-ui-title}">
+               MinSize="50 50" Resizable="False" Title="{Loc comp-space-heater-ui-title}">
 
-    <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="5 5 5 5" SeparationOverride="10">
+    <BoxContainer Name="VboxContainer" Orientation="Vertical" Margin="10" SeparationOverride="10">
 
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <controls:SwitchButton
@@ -22,7 +22,7 @@
             </BoxContainer>
             <BoxContainer Orientation="Horizontal" HorizontalExpand="True" HorizontalAlignment="Right">
                 <Button Text="{Loc comp-space-heater-ui-decrease-temperature-range}" Access="Public" Name="DecreaseTempRange" StyleClasses="OpenRight"/>
-                <LineEdit Name ="Thermostat" MinSize="55 0"></LineEdit>
+                <LineEdit Name ="Thermostat" MinSize="55 0" CanKeyboardFocus="False"></LineEdit>
                 <Button Text="{Loc comp-space-heater-ui-increase-temperature-range}" Access="Public" Name="IncreaseTempRange" StyleClasses="OpenLeft"/>
             </BoxContainer>
         </BoxContainer>
@@ -33,4 +33,4 @@
         </BoxContainer>
 
     </BoxContainer>
-</DefaultWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs
index ee2c334871..a8694c8163 100644
--- a/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs
+++ b/Content.Client/Atmos/UI/SpaceHeaterWindow.xaml.cs
@@ -1,3 +1,4 @@
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -11,7 +12,7 @@ namespace Content.Client.Atmos.UI;
 ///     Client-side UI used to control a space heater.
 /// </summary>
 [GenerateTypedNameReferences]
-public sealed partial class SpaceHeaterWindow : DefaultWindow
+public sealed partial class SpaceHeaterWindow : FancyWindow
 {
     // To account for a minimum delta temperature for atmos equalization to trigger we use a fixed step for target temperature increment/decrement
     public int TemperatureChangeDelta = 5;

From 09b80ab9935422e4be5c16355bf012c1427ef389 Mon Sep 17 00:00:00 2001
From: Princess Cheeseballs
 <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Wed, 30 Sep 2026 06:53:09 +0000
Subject: [PATCH 02/69] Make codewords mind role based (#46167)

* make codewords mind role based

* whoop
---
 Content.Client/Roles/RoleCodewordSystem.cs    |  5 --
 .../Systems/Chat/ChatUIController.cs          | 27 +++---
 .../Roles/RoleCodeword/RoleCodewordSystem.cs  |  5 --
 Content.Shared/Codewords/CodewordSystem.cs    | 88 ++++++++++++++++++-
 .../RoleCodewordComponent.cs                  | 12 ++-
 .../GameTicking/Rules/TraitorRuleSystem.cs    | 15 ++--
 .../RoleCodeword/SharedRoleCodewordSystem.cs  | 11 ---
 7 files changed, 110 insertions(+), 53 deletions(-)
 delete mode 100644 Content.Client/Roles/RoleCodewordSystem.cs
 delete mode 100644 Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
 rename Content.Shared/{Roles/RoleCodeword => Codewords}/RoleCodewordComponent.cs (73%)
 delete mode 100644 Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs

diff --git a/Content.Client/Roles/RoleCodewordSystem.cs b/Content.Client/Roles/RoleCodewordSystem.cs
deleted file mode 100644
index eea5319c03..0000000000
--- a/Content.Client/Roles/RoleCodewordSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Roles.RoleCodeword;
-
-namespace Content.Client.Roles;
-
-public sealed partial class RoleCodewordSystem : SharedRoleCodewordSystem;
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 2140879aa9..97a55748d2 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -10,19 +10,17 @@ using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.Client.Ghost;
 using Content.Client.Mind;
-using Content.Client.Roles;
-using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
 using Content.Client.UserInterface.Systems.Gameplay;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
 using Content.Shared.Chat;
+using Content.Shared.Codewords;
 using Content.Shared.Damage.ForceSay;
 using Content.Shared.Decals;
 using Content.Shared.Input;
 using Content.Shared.Radio;
-using Content.Shared.Roles.RoleCodeword;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -59,13 +57,12 @@ public sealed partial class ChatUIController : UIController
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IReplayRecordingManager _replayRecording = default!;
 
-    [UISystemDependency] private readonly ExamineSystem? _examine = default;
-    [UISystemDependency] private readonly GhostSystem? _ghost = default;
-    [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
-    [UISystemDependency] private readonly ChatSystem? _chatSys = default;
-    [UISystemDependency] private readonly TransformSystem? _transform = default;
-    [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
-    [UISystemDependency] private readonly RoleCodewordSystem? _roleCodewordSystem = default!;
+    [UISystemDependency] private readonly ChatSystem _chatSys = default!;
+    [UISystemDependency] private readonly CodewordSystem _codeword = default!;
+    [UISystemDependency] private readonly ExamineSystem _examine = default!;
+    [UISystemDependency] private readonly GhostSystem _ghost = default!;
+    [UISystemDependency] private readonly TransformSystem _transform = default!;
+    [UISystemDependency] private readonly TypingIndicatorSystem _typingIndicator = default!;
 
     private SharedChatSystem? _sharedChatSys;
     private static readonly ProtoId<ColorPalettePrototype> ChatNamePalette = "ChatNames";
@@ -837,15 +834,11 @@ public sealed partial class ChatUIController : UIController
         }
 
         // Color any codewords for minds that have roles that use them
-        if (_player.LocalUser != null && _mindSystem != null && _roleCodewordSystem != null)
+        foreach (var data in _codeword.GetPlayerCodewords(_player.LocalUser))
         {
-            if (_mindSystem.TryGetMind(_player.LocalUser.Value, out var mindId) && _ent.TryGetComponent(mindId, out RoleCodewordComponent? codewordComp))
+            foreach (var codeword in data.Codewords)
             {
-                foreach (var (_, codewordData) in codewordComp.RoleCodewords)
-                {
-                    foreach (string codeword in codewordData.Codewords)
-                        msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", codewordData.Color.ToHex());
-                }
+                msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", data.Color.ToHex());
             }
         }
 
diff --git a/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs b/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
deleted file mode 100644
index 3525e459bb..0000000000
--- a/Content.Server/Roles/RoleCodeword/RoleCodewordSystem.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-using Content.Shared.Roles.RoleCodeword;
-
-namespace Content.Server.Roles.RoleCodeword;
-
-public sealed partial class RoleCodewordSystem : SharedRoleCodewordSystem;
diff --git a/Content.Shared/Codewords/CodewordSystem.cs b/Content.Shared/Codewords/CodewordSystem.cs
index 5cdfa17963..d64d9090d0 100644
--- a/Content.Shared/Codewords/CodewordSystem.cs
+++ b/Content.Shared/Codewords/CodewordSystem.cs
@@ -1,20 +1,27 @@
-using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Events;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
+using JetBrains.Annotations;
 using Robust.Shared.Map;
+using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using static System.Linq.Enumerable;
 
 namespace Content.Shared.Codewords;
 
 /// <summary>
-/// Gamerule that provides codewords for other gamerules that rely on them.
+/// System that generates and handles the assignment of codewords.
 /// </summary>
 public sealed partial class CodewordSystem : EntitySystem
 {
     [Dependency] private ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private SharedMindSystem _mind = default!;
+
+    [Dependency] private EntityQuery<RoleCodewordComponent> _codewordQuery;
 
     [SubscribeLocalEvent]
     private void OnRoundStart(RoundStartingEvent ev)
@@ -80,4 +87,81 @@ public sealed partial class CodewordSystem : EntitySystem
         }
         return codewords;
     }
+
+    /// <summary>
+    /// Returns all codewords a specific player knows
+    /// </summary>
+    /// <param name="player">Player account</param>
+    /// <returns>All codewords known by this entity.</returns>
+    [PublicAPI]
+    public List<CodewordsData> GetPlayerCodewords(NetUserId? player)
+    {
+        return player != null && _mind.TryGetMind(player.Value, out var mind)
+            ? GetMindCodewords(mind.Value.AsNullable())
+            : new List<CodewordsData>();
+    }
+
+    /// <summary>
+    /// Returns all codewords stored in a mind.
+    /// </summary>
+    /// <param name="entity">Entity</param>
+    /// <returns>All codewords known by this entity.</returns>
+    [PublicAPI]
+    public List<CodewordsData> GetEntityCodewords(Entity<MindContainerComponent?> entity)
+    {
+        return _mind.TryGetMind(entity, out var uid, out var mind)
+            ? GetMindCodewords((uid, mind))
+            : new List<CodewordsData>();
+    }
+
+    /// <summary>
+    /// Returns all codewords stored in a mind.
+    /// </summary>
+    /// <param name="mind">Mind entity</param>
+    /// <returns>All codewords known by this mind.</returns>
+    [PublicAPI]
+    public List<CodewordsData> GetMindCodewords(Entity<MindComponent?> mind)
+    {
+        var data = new List<CodewordsData>();
+        if (!Resolve(mind, ref mind.Comp))
+            return data;
+
+        foreach (var role in mind.Comp.MindRoleContainer.ContainedEntities)
+        {
+            if (GetRoleCodewords(role) is not { } codewords)
+                continue;
+
+            data.Add(codewords);
+        }
+
+        return data;
+    }
+
+    /// <summary>
+    /// Returns codewords associated with this role
+    /// </summary>
+    /// <param name="role">Role entity</param>
+    /// <returns>Codewords for this role, if they exist.</returns>
+    [PublicAPI]
+    public CodewordsData? GetRoleCodewords(Entity<RoleCodewordComponent?> role)
+    {
+        if (!_codewordQuery.Resolve(role, ref role.Comp, false))
+            return null;
+
+        return role.Comp.RoleCodewords;
+    }
+
+    /// <summary>
+    /// Sets the codewords for a given mindrole entity.
+    /// </summary>
+    /// <param name="ent">Mindrole entity.</param>
+    /// <param name="codewords">Codewords</param>
+    /// <param name="color">Color the codewords show as</param>
+    [PublicAPI]
+    public void SetRoleCodewords(Entity<RoleCodewordComponent> ent, List<string> codewords, Color color)
+    {
+        var data = new CodewordsData(color, codewords);
+        ent.Comp.RoleCodewords = data;
+        Dirty(ent);
+    }
 }
diff --git a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs b/Content.Shared/Codewords/RoleCodewordComponent.cs
similarity index 73%
rename from Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
rename to Content.Shared/Codewords/RoleCodewordComponent.cs
index 222aec9bf7..ba23fb5005 100644
--- a/Content.Shared/Roles/RoleCodeword/RoleCodewordComponent.cs
+++ b/Content.Shared/Codewords/RoleCodewordComponent.cs
@@ -1,12 +1,12 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Roles.RoleCodeword;
+namespace Content.Shared.Codewords;
 
 /// <summary>
 /// Used to display and highlight codewords in chat messages on the client.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRoleCodewordSystem), Other = AccessPermissions.Read)]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(CodewordSystem), Other = AccessPermissions.Read)]
 public sealed partial class RoleCodewordComponent : Component
 {
     /// <summary>
@@ -14,15 +14,21 @@ public sealed partial class RoleCodewordComponent : Component
     /// Key string should be unique for the role.
     /// </summary>
     [DataField, AutoNetworkedField]
-    public Dictionary<string, CodewordsData> RoleCodewords = new();
+    public CodewordsData RoleCodewords;
 }
 
 [DataDefinition, Serializable, NetSerializable]
 public partial struct CodewordsData
 {
+    /// <summary>
+    /// The Color these codewords appear as
+    /// </summary>
     [DataField]
     public Color Color;
 
+    /// <summary>
+    /// The Codewords!!!
+    /// </summary>
     [DataField]
     public List<string> Codewords;
 
diff --git a/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
index 4b0485cb8d..b0e40aab57 100644
--- a/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
+++ b/Content.Shared/GameTicking/Rules/TraitorRuleSystem.cs
@@ -11,7 +11,6 @@ using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Components;
 using Content.Shared.Roles.Jobs;
-using Content.Shared.Roles.RoleCodeword;
 using Robust.Shared.Random;
 
 namespace Content.Shared.GameTicking.Rules;
@@ -24,7 +23,6 @@ public abstract partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleComp
     [Dependency] private NpcFactionSystem _npcFaction = default!;
     [Dependency] private SharedJobSystem _jobs = default!;
     [Dependency] private SharedMindSystem _mindSystem = default!;
-    [Dependency] private SharedRoleCodewordSystem _roleCodewordSystem = default!;
     [Dependency] private SharedRoleSystem _roleSystem = default!;
 
     private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b");
@@ -102,24 +100,21 @@ public abstract partial class TraitorRuleSystem : GameRuleSystem<TraitorRuleComp
         //Since this provides neither an antag/job prototype, nor antag status/roletype,
         //and is intrinsically related to the traitor role
         //it does not need to be a separate Mind Role Entity
-        _roleSystem.MindHasRole<TraitorRoleComponent>((mindId, mind), out var traitorRole);
-        if (traitorRole is not null)
+        if (_roleSystem.MindHasRole<TraitorRoleComponent>((mindId, mind), out var traitorRole))
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Add traitor briefing components");
             EnsureComp<RoleBriefingComponent>(traitorRole.Value.Owner, out var briefingComp);
             briefingComp.Briefing = briefing;
+
+            // The mind entity is stored in nullspace with a PVS override for the owner, so only they can see the codewords.
+            var codewordComp = EnsureComp<RoleCodewordComponent>(traitorRole.Value);
+            Codeword.SetRoleCodewords((traitorRole.Value, codewordComp), factionCodewords.ToList(), TraitorCodewordColor);
         }
         else
         {
             Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - did not get traitor briefing");
         }
 
-        var color = TraitorCodewordColor; // Fall back to a dark red Syndicate color if a prototype is not found
-
-        // The mind entity is stored in nullspace with a PVS override for the owner, so only they can see the codewords.
-        var codewordComp = EnsureComp<RoleCodewordComponent>(mindId);
-        _roleCodewordSystem.SetRoleCodewords((mindId, codewordComp), "traitor", factionCodewords.ToList(), color);
-
         // Change the faction
         Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Change faction");
         _npcFaction.RemoveFaction(traitor, rule.Comp.NanoTrasenFaction, false);
diff --git a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs b/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
deleted file mode 100644
index 345cfd4e21..0000000000
--- a/Content.Shared/Roles/RoleCodeword/SharedRoleCodewordSystem.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Content.Shared.Roles.RoleCodeword;
-
-public abstract class SharedRoleCodewordSystem : EntitySystem
-{
-    public void SetRoleCodewords(Entity<RoleCodewordComponent> ent, string key, List<string> codewords, Color color)
-    {
-        var data = new CodewordsData(color, codewords);
-        ent.Comp.RoleCodewords[key] = data;
-        Dirty(ent);
-    }
-}

From 989c2caf16f44f0496b892b277934a71dadf44cb Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Wed, 30 Sep 2026 16:55:13 +0000
Subject: [PATCH 03/69] Add a link to the failing run in heisendetector issues
 (#46257)

* heisentest URL

* obvious test failure

* 2-space indent for submodules in action

* remove obvious test failure

* move failing action to the top of the template

* fix vars reference

* Revert "remove obvious test failure"

This reverts commit 403c27720bd1be6e7fc1584dec4b2c698796160e.

* pass individual environment variables

* Reapply "remove obvious test failure"

This reverts commit b42c9633c8add35c4e8ee0e77aafa051e7d5d88d.

* actions to run, bracket link, add SHA of commit

* Improve heisentest link

nem bully ban he
---
 .github/ISSUE_TEMPLATE/heisentest_template.md | 3 +++
 .github/workflows/heisendetector.yml          | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/heisentest_template.md b/.github/ISSUE_TEMPLATE/heisentest_template.md
index 2fde892b79..3e6d2ee5fc 100644
--- a/.github/ISSUE_TEMPLATE/heisentest_template.md
+++ b/.github/ISSUE_TEMPLATE/heisentest_template.md
@@ -6,6 +6,9 @@ labels: autogenerated
 
 A test failure has been detected on the main branch. This should never occur.
 
+Commit under test: {{ env.GITHUB_SHA }}
+[Link to failing run]({{ env.GITHUB_SERVER_URL }}/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }})
+
 > [!NOTE]
 > This issue is automatically generated by a github action and will be updated when this failure reoccurs.
 > Do not edit the body of this issue.
diff --git a/.github/workflows/heisendetector.yml b/.github/workflows/heisendetector.yml
index c72c539684..2e13c8499d 100644
--- a/.github/workflows/heisendetector.yml
+++ b/.github/workflows/heisendetector.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Checkout Master
       uses: actions/checkout@v6
       with:
-          submodules: recursive
+        submodules: recursive
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4.1.0
@@ -81,6 +81,10 @@ jobs:
           FULLNAME: ${{ matrix.value.fullname }}
           OUTPUT: ${{ matrix.value.output }}
           FAILURE: ${{ matrix.value.failure }}
+          GITHUB_SERVER_URL: ${{ vars.GITHUB_SERVER_URL }}
+          GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+          GITHUB_RUN_ID: ${{ vars.GITHUB_RUN_ID }}
+          GITHUB_SHA: ${{ vars.GITHUB_SHA }}
         with:
           filename: .github/ISSUE_TEMPLATE/heisentest_template.md
           update_existing: true

From b6bcb7815f15a2af34795aaac79a61a86cb97d85 Mon Sep 17 00:00:00 2001
From: jckspjf <jackspajfgithub@gmail.com>
Date: Thu, 1 Oct 2026 16:14:33 +0000
Subject: [PATCH 04/69] Thief Command Hardsuits Objective (#46200)

* Command Hardsuit Objective, stealGroup is now a list

* difficulty buff considering its command hardsuits
---
 .../Systems/StealConditionSystem.cs           |  4 +-
 .../Components/StealTargetComponent.cs        |  2 +-
 .../conditions/steal-target-groups.ftl        |  1 +
 .../Prototypes/Entities/Clothing/Belt/job.yml |  3 +-
 .../Entities/Clothing/Ears/headsets_alt.yml   |  3 +-
 .../Prototypes/Entities/Clothing/Eyes/hud.yml |  6 ++-
 .../Entities/Clothing/Hands/gloves.yml        |  3 +-
 .../Entities/Clothing/Head/hats.yml           |  3 +-
 .../Entities/Clothing/Neck/cloaks.yml         | 30 ++++++++++-----
 .../Entities/Clothing/Neck/medals.yml         |  6 ++-
 .../Clothing/OuterClothing/hardsuits.yml      | 37 ++++++++++++++++++-
 .../Clothing/OuterClothing/softsuits.yml      |  3 +-
 .../Entities/Clothing/Shoes/magboots.yml      |  3 +-
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    | 36 ++++++++++++------
 .../Entities/Objects/Consumable/Food/meat.yml |  3 +-
 .../Objects/Decoration/jackolantern.yml       |  3 +-
 .../Objects/Deliveries/deliveries.yml         |  3 +-
 .../Circuitboards/Machine/production.yml      |  3 +-
 .../Devices/Circuitboards/computer.yml        |  6 ++-
 .../Entities/Objects/Devices/cartridges.yml   |  3 +-
 .../Entities/Objects/Devices/door_remote.yml  |  3 +-
 .../Entities/Objects/Devices/flatpack.yml     |  3 +-
 .../Objects/Devices/forensic_scanner.yml      |  3 +-
 .../Objects/Devices/hand_teleporter.yml       |  3 +-
 .../Entities/Objects/Misc/bedsheets.yml       | 24 ++++++++----
 .../Entities/Objects/Misc/dat_fukken_disk.yml |  3 +-
 .../Entities/Objects/Misc/fluff_lights.yml    |  3 +-
 .../Entities/Objects/Misc/folders.yml         |  3 +-
 .../Objects/Misc/identification_cards.yml     |  6 ++-
 .../Entities/Objects/Misc/rubber_stamp.yml    |  3 +-
 .../Objects/Specific/Chapel/bibles.yml        |  3 +-
 .../Medical/handheld_crew_monitor.yml         |  3 +-
 .../Objects/Specific/Medical/hypospray.yml    |  3 +-
 .../Objects/Specific/Research/disk.yml        |  3 +-
 .../Xenoarchaeology/xenoartifacts.yml         |  3 +-
 .../Entities/Objects/Tools/flashlights.yml    |  3 +-
 .../Entities/Objects/Tools/jetpacks.yml       |  3 +-
 .../Entities/Objects/Tools/lantern.yml        |  3 +-
 .../Entities/Objects/Tools/lighters.yml       |  3 +-
 .../Weapons/Guns/Battery/battery_guns.yml     |  6 ++-
 .../Objects/Weapons/Guns/Pistols/pistols.yml  |  3 +-
 .../Weapons/Guns/Revolvers/revolvers.yml      |  3 +-
 .../Objects/Weapons/Melee/fireaxe.yml         |  3 +-
 .../Entities/Objects/Weapons/Melee/sword.yml  |  3 +-
 .../Entities/Structures/Dispensers/booze.yml  |  3 +-
 .../Entities/Structures/Dispensers/chem.yml   |  3 +-
 .../Entities/Structures/Furniture/altar.yml   |  3 +-
 .../Structures/Furniture/potted_plants.yml    |  3 +-
 .../Entities/Structures/Furniture/toilet.yml  |  3 +-
 .../Machines/Computers/computers.yml          |  6 ++-
 .../Structures/Machines/fax_machine.yml       |  3 +-
 .../Entities/Structures/Machines/lathe.yml    |  3 +-
 .../Entities/Structures/Machines/nuke.yml     |  3 +-
 .../Structures/Piping/Atmospherics/unary.yml  | 16 ++++----
 .../Structures/Power/Generation/teg.yml       |  6 ++-
 .../Prototypes/Objectives/objectiveGroups.yml |  1 +
 .../Objectives/stealTargetGroups.yml          |  7 ++++
 Resources/Prototypes/Objectives/thief.yml     | 11 ++++++
 58 files changed, 236 insertions(+), 95 deletions(-)

diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs
index c893b81ae4..3f42e1ec7a 100644
--- a/Content.Server/Objectives/Systems/StealConditionSystem.cs
+++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs
@@ -50,7 +50,7 @@ public sealed partial class StealConditionSystem : EntitySystem
             var query = AllEntityQuery<StealTargetComponent>();
             while (query.MoveNext(out var target))
             {
-                if (condition.Comp.StealGroup != target.StealGroup)
+                if (!target.StealGroup.Contains(condition.Comp.StealGroup))
                     continue;
 
                 targetList.Add(target);
@@ -179,7 +179,7 @@ public sealed partial class StealConditionSystem : EntitySystem
         if (!TryComp<StealTargetComponent>(entity, out var target))
             return 0;
 
-        if (target.StealGroup != condition.StealGroup)
+        if (!target.StealGroup.Contains(condition.StealGroup))
             return 0;
 
         // check if cartridge is installed
diff --git a/Content.Shared/Objectives/Components/StealTargetComponent.cs b/Content.Shared/Objectives/Components/StealTargetComponent.cs
index f286b0a32b..67ab5760f8 100644
--- a/Content.Shared/Objectives/Components/StealTargetComponent.cs
+++ b/Content.Shared/Objectives/Components/StealTargetComponent.cs
@@ -13,5 +13,5 @@ public sealed partial class StealTargetComponent : Component
     /// The theft group to which this item belongs.
     /// </summary>
     [DataField(required: true)]
-    public ProtoId<StealTargetGroupPrototype> StealGroup;
+    public List<ProtoId<StealTargetGroupPrototype>> StealGroup;
 }
diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
index bc327c950a..aa76167231 100644
--- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
+++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
@@ -17,6 +17,7 @@ steal-target-groups-weapon-energy-magnum = energy magnum
 steal-target-groups-figurines = figurine
 steal-target-groups-heads-cloaks = head's cloak
 steal-target-groups-heads-bedsheets = head's bedsheet
+steal-target-groups-heads-hardsuits = head's hardsuit
 steal-target-groups-stamps = stamp
 steal-target-groups-door-remotes = door remote
 steal-target-groups-encryption-keys = encryption key
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
index 4c39f13f3e..3cb03d2aaa 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -109,7 +109,8 @@
     grid:
     - 0,0,9,1
   - type: StealTarget
-    stealGroup: ChiefEngineerToolBelt
+    stealGroup:
+    - ChiefEngineerToolBelt
 
 - type: entity
   parent: ClothingBeltStorageBase
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
index e998fff261..01d752696e 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
@@ -87,7 +87,8 @@
   - type: Clothing
     sprite: Clothing/Ears/Headsets/medical.rsi
   - type: StealTarget
-    stealGroup: ClothingHeadsetAltMedical
+    stealGroup:
+    - ClothingHeadsetAltMedical
 
 - type: entity
   parent: [ClothingHeadsetAlt, BaseCommandContraband]
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 78cef66ec9..2f056812bd 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -5,7 +5,8 @@
   categories: [ HideSpawnMenu ]
   components:
   - type: StealTarget
-    stealGroup: ClothingEyesHuds
+    stealGroup:
+    - ClothingEyesHuds
 
 - type: entity
   id: ShowSecurityIcons
@@ -265,7 +266,8 @@
   suffix: Syndicate
   components:
   - type: StealTarget
-    stealGroup: ClothingEyesHuds
+    stealGroup:
+    - ClothingEyesHuds
 
 - type: entity
   parent: [ClothingEyesHudMedical, ClothingHeadEyeBaseFlippable]
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 5769c65733..e593435ef1 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -568,7 +568,8 @@
     - WhitelistChameleon
     - Kangaroo
   - type: StealTarget
-    stealGroup: ClothingHandsKnuckleDustersQM
+    stealGroup:
+    - ClothingHandsKnuckleDustersQM
 
 - type: entity
   parent: [ClothingHandsBase, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index c54bcf3693..2d37fb5f02 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -761,7 +761,8 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/warden.rsi
   - type: StealTarget
-    stealGroup: ClothingHeadHatWarden
+    stealGroup:
+    - ClothingHeadHatWarden
   - type: Tag
     tags:
     - PetWearable
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
index c5e4cca8ce..e44f80d5dd 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
@@ -7,7 +7,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/centcomcloakformal.rsi
   - type: StealTarget
-    stealGroup: HeadCloak # leaving this here because I suppose it might be interesting?
+    stealGroup:
+    - HeadCloak # leaving this here because I suppose it might be interesting?
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -18,7 +19,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/cap.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -29,7 +31,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/hos.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -40,7 +43,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/ce.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -51,7 +55,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/cmo.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -62,7 +67,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/rd.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -73,7 +79,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/qm.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: [ClothingNeckBase, BaseCommandContraband]
@@ -84,7 +91,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/hop.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: ClothingNeckBase
@@ -113,7 +121,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/capcloakformal.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: ClothingNeckBase
@@ -124,7 +133,8 @@
   - type: Sprite
     sprite: Clothing/Neck/Cloaks/admin.rsi
   - type: StealTarget
-    stealGroup: HeadCloak
+    stealGroup:
+    - HeadCloak
 
 - type: entity
   parent: ClothingNeckBase
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
index d3b3b97358..516561005c 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -33,7 +33,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Medals/gold.rsi
   - type: StealTarget
-    stealGroup: ClothingNeckGoldmedal
+    stealGroup:
+    - ClothingNeckGoldmedal
 
 - type: entity
   parent: ClothingNeckMedalBase
@@ -101,4 +102,5 @@
   - type: Clothing
     sprite: Clothing/Neck/Medals/clownmedal.rsi
   - type: StealTarget
-    stealGroup: ClothingNeckClownmedal
+    stealGroup:
+    - ClothingNeckClownmedal
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index f54e0f8ef9..3d094f3377 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -341,6 +341,9 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #Chief Engineer's Hardsuit
 - type: entity
@@ -379,6 +382,9 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -410,6 +416,9 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #Research Director's Hardsuit
 - type: entity
@@ -454,7 +463,9 @@
   - type: StaticPrice
     price: 750
   - type: StealTarget
-    stealGroup: ClothingOuterHardsuitRd
+    stealGroup:
+    - ClothingOuterHardsuitRd
+    - HeadHardsuit
 
 #Head of Security's Hardsuit
 - type: entity
@@ -487,6 +498,9 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #Luxury Mining Hardsuit
 - type: entity
@@ -862,6 +876,9 @@
     - 0,0,3,3
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTLeader
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #ERT Chaplain Hardsuit
 - type: entity
@@ -880,6 +897,9 @@
     - 0,0,3,3
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTChaplain
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #ERT Engineer Hardsuit
 - type: entity
@@ -900,6 +920,9 @@
     clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
   - type: FireProtection
     reduction: 0.8
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #ERT Medic Hardsuit
 - type: entity
@@ -918,6 +941,9 @@
     - 0,0,3,3
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTMedical
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #ERT Security Hardsuit
 - type: entity
@@ -940,6 +966,9 @@
     tags:
     - Hardsuit
     - WhitelistChameleon
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #ERT Janitor Hardsuit
 - type: entity
@@ -958,6 +987,9 @@
     - 0,0,3,3
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitERTJanitor
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #Deathsquad
 - type: entity
@@ -999,6 +1031,9 @@
   - type: HeldSpeedModifier
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitDeathsquad
+  - type: StealTarget
+    stealGroup:
+    - HeadHardsuit
 
 #CBURN Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
index 06ee2405e4..145d062563 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
@@ -119,7 +119,8 @@
         Caustic: 0.5
   - type: GroupExamine
   - type: StealTarget
-    stealGroup: ClothingOuterHardsuitVoidParamed
+    stealGroup:
+    - ClothingOuterHardsuitVoidParamed
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetVoidParamed
   - type: ItemToggleExaminableStatus
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
index bbc1f5a0fe..3b6de81b37 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
@@ -64,7 +64,8 @@
   - type: StaticPrice
     price: 750
   - type: StealTarget
-    stealGroup: ClothingShoesBootsMagAdv
+    stealGroup:
+    - ClothingShoesBootsMagAdv
 
 - type: entity
   parent: [ClothingShoesBootsMagBase]
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 8e3f6ae3c2..5b0e999487 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -65,7 +65,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalIan
+    stealGroup:
+    - AnimalIan
 
 - type: entity
   parent: [ MobCorgiIan, BaseSlicingRefinableButchering ]
@@ -174,7 +175,8 @@
       amount: 2
     - id: MaterialHideCorgi
   - type: StealTarget
-    stealGroup: AnimalIan
+    stealGroup:
+    - AnimalIan
 
 - type: entity
   parent: [ BaseUniquePet, MobCat ]
@@ -197,7 +199,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalNamedCat
+    stealGroup:
+    - AnimalNamedCat
   - type: SpeakOnException
     speechCooldown: 3m
     chanceSpeakNoAccent: 0.01
@@ -223,7 +226,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalNamedCat
+    stealGroup:
+    - AnimalNamedCat
 
 - type: entity
   parent: [ BaseUniquePet, MobCatCaracal ]
@@ -250,7 +254,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalNamedCat
+    stealGroup:
+    - AnimalNamedCat
 
 - type: entity
   parent: [ BaseUniquePet, MobFerret ]
@@ -322,7 +327,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalNamedCat
+    stealGroup:
+    - AnimalNamedCat
 
 - type: entity
   parent: [ BaseUniquePet, SimpleMobBase, StripableInventoryBase, BaseSlicingRefinableButchering , BaseMobDestructible ]
@@ -397,7 +403,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalMcGriff
+    stealGroup:
+    - AnimalMcGriff
   - type: MessyDrinker
 
 - type: entity
@@ -491,7 +498,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalWalter
+    stealGroup:
+    - AnimalWalter
   - type: Speech
     speechVerb: Canine
     speechSounds: Dog
@@ -519,7 +527,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalMorty
+    stealGroup:
+    - AnimalMorty
 
 - type: entity
   parent: MobPossumMorty
@@ -635,7 +644,8 @@
     - CannotSuicide
     - VimPilot
   - type: StealTarget
-    stealGroup: AnimalRenault
+    stealGroup:
+    - AnimalRenault
 
 - type: entity
   parent: [ BaseUniquePet, MobHamster, BaseSlicingRefinableButchering ]
@@ -772,7 +782,8 @@
     - DoorBumpOpener
     - FootstepSound
   - type: StealTarget
-    stealGroup: AnimalShiva
+    stealGroup:
+    - AnimalShiva
 
 - type: entity
   parent: [ BaseUniquePet, MobKangaroo ]
@@ -945,7 +956,8 @@
       gender: male
 #  - type: AlwaysRevolutionaryConvertible
   - type: StealTarget
-    stealGroup: AnimalTropico
+    stealGroup:
+    - AnimalTropico
 
 - type: entity
   parent: [ BaseUniquePet, MobParrotBase ]
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 9315826b78..7617a8ce3b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -309,7 +309,8 @@
   - type: StaticPrice
     price: 750
   - type: StealTarget
-    stealGroup: FoodMeatCorgi
+    stealGroup:
+    - FoodMeatCorgi
   - type: Item
     inhandVisuals:
       left:
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml b/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml
index 73c737ad7c..df63a389b3 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml
@@ -28,7 +28,8 @@
       radius: 2.0
       energy: 4.0
     - type: StealTarget
-      stealGroup: LAMP
+      stealGroup:
+      - LAMP
 
 - type: entity
   parent: CarvedPumpkin
diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
index 8c43e76ecd..71886d1ed7 100644
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
@@ -45,7 +45,8 @@
     containers:
       delivery: !type:Container
   - type: StealTarget
-    stealGroup: Mail
+    stealGroup:
+    - Mail
   - type: SimpleToolUsage
     doAfter: 4
     usageVerb: delivery-slice-verb
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 3e1cb8f34e..87b6fb282b 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -124,7 +124,8 @@
           amount: 2
           defaultPrototype: Beaker
     - type: StealTarget
-      stealGroup: MedicalTechFabCircuitboard
+      stealGroup:
+      - MedicalTechFabCircuitboard
 
 - type: entity
   id: CircuitImprinterMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 6023ccd088..b2d4fb1a9a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -221,7 +221,8 @@
     - type: ComputerBoard
       prototype: ComputerSalvageExpedition
     - type: StealTarget
-      stealGroup: SalvageExpeditionsComputerCircuitboard
+      stealGroup:
+      - SalvageExpeditionsComputerCircuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
@@ -234,7 +235,8 @@
   - type: ComputerBoard
     prototype: ComputerShuttleCargo
   - type: StealTarget
-    stealGroup: CargoShuttleConsoleCircuitboard
+    stealGroup:
+    - CargoShuttleConsoleCircuitboard
 
 - type: entity
   parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
index a51ededb0d..b7269f89eb 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml
@@ -136,7 +136,8 @@
       state: icon_magnifier
   - type: WantedListCartridge
   - type: StealTarget
-    stealGroup: WantedListCartridge
+    stealGroup:
+    - WantedListCartridge
 
 - type: entity
   parent: BasePDACartridge
diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
index b5cb02358e..61e3fb26a6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -28,7 +28,8 @@
         sprite: /Textures/Interface/Actions/actions_ai.rsi
         state: emergency_on
   - type: StealTarget
-    stealGroup: DoorRemote
+    stealGroup:
+    - DoorRemote
   - type: ActivatableUI
     inHandsOnly: true
     key: enum.DoorRemoteUiKey.Key
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index f5a4c022bf..9e489c27b1 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -88,7 +88,8 @@
     - AME
     - Power
   - type: StealTarget
-    stealGroup: AmePartFlatpack
+    stealGroup:
+    - AmePartFlatpack
 
 - type: entity
   parent: BaseFlatpack
diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index c1d0df2c6c..95a53ae8b0 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -28,7 +28,8 @@
     guides:
     - Forensics
   - type: StealTarget
-    stealGroup: ForensicScanner
+    stealGroup:
+    - ForensicScanner
 
 - type: entity
   name: forensic scanner report
diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
index 606ed84016..d8fbb71de0 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml
@@ -14,7 +14,8 @@
     - HighRiskItem
     - FitInTeleporterConsole
   - type: StealTarget
-    stealGroup: HandTeleporter
+    stealGroup:
+    - HandTeleporter
 
 - type: entity
   id: HandTeleporterAdmeme
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index 8e5d09645d..654478563b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -65,7 +65,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/captain.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetCE
@@ -78,7 +79,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/ce.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetCentcom
@@ -91,7 +93,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/centcom.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetClown
@@ -115,7 +118,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/cmo.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetCosmos
@@ -170,7 +174,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/hop.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetHOS
@@ -183,7 +188,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/hos.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetIan
@@ -258,7 +264,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/qm.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetRainbow
@@ -281,7 +288,8 @@
   - type: Clothing
     sprite: Clothing/Neck/Bedsheets/rd.rsi
   - type: StealTarget
-    stealGroup: HeadBedsheet
+    stealGroup:
+    - HeadBedsheet
 
 - type: entity
   id: BedsheetBrigmedic
diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
index 2325176ae2..9bf03c443e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml
@@ -21,7 +21,8 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: NukeDisk
+    stealGroup:
+    - NukeDisk
 
 - type: entity
   name: nuclear authentication disk
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index 945a5801ce..83f4d4a8e3 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -52,7 +52,8 @@
   - type: Physics
     canCollide: false
   - type: StealTarget
-    stealGroup: LAMP
+    stealGroup:
+    - LAMP
 
 - type: entity
   name: lamp
diff --git a/Resources/Prototypes/Entities/Objects/Misc/folders.yml b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
index 36900968df..5c702f6f2a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/folders.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/folders.yml
@@ -552,4 +552,5 @@
     - Folder
     - HighRiskItem
   - type: StealTarget
-    stealGroup: BoxFolderQmClipboard
+    stealGroup:
+    - BoxFolderQmClipboard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
index 873b8363f7..e7658ab7a6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -24,7 +24,8 @@
     - WhitelistChameleon
     - WhitelistChameleonIdCard
   - type: StealTarget
-    stealGroup: IDCard
+    stealGroup:
+    - IDCard
 
 #IDs with layers
 
@@ -70,7 +71,8 @@
     - WhitelistChameleonIdCard
     - HighRiskItem
   - type: StealTarget
-    stealGroup: CaptainIDCard
+    stealGroup:
+    - CaptainIDCard
 
 - type: entity
   parent: IDCardStandard
diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
index a7e7a47534..104e8efc2b 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@@ -29,7 +29,8 @@
       - state: handle-inhand-right
         color: "#f8f8f8"
   - type: StealTarget
-    stealGroup: Stamp
+    stealGroup:
+    - Stamp
 
 - type: entity
   name: alternate rubber stamp
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
index ab458a6003..687b1d059a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
@@ -59,7 +59,8 @@
     tags:
     - Book
   - type: StealTarget
-    stealGroup: Bible
+    stealGroup:
+    - Bible
 
 - type: entity
   parent: [Bible, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
index 20bf897884..e4fcac7dc9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
@@ -44,7 +44,8 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: HandheldCrewMonitor
+    stealGroup:
+    - HandheldCrewMonitor
 
 - type: entity
   id: HandheldCrewMonitorEmpty
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index e6911067e7..5c48a6761a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -68,7 +68,8 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: Hypospray
+    stealGroup:
+    - Hypospray
   - type: SolutionContainerVisuals
     maxFillLevels: 6
     fillBaseName: hypo_fill
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
index 38b6ddf657..3d8750853a 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml
@@ -86,7 +86,8 @@
         t3_border:
           3: { visible: true }
   - type: StealTarget
-    stealGroup: TechnologyDisk
+    stealGroup:
+    - TechnologyDisk
   - type: TechnologyDisk
 
 # random tech disks by tier
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
index 4a9b3a7813..e8b216b7f8 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/xenoartifacts.yml
@@ -35,7 +35,8 @@
     baseSprintSpeed: 0.5
   - type: UseDelay
   - type: StealTarget
-    stealGroup: XenoArtifact
+    stealGroup:
+    - XenoArtifact
   - type: ContainerContainer
     containers:
       node-container: !type:Container
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 932a7dd95b..41cbc4f0b4 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -68,7 +68,8 @@
   - type: StaticPrice
     price: 40
   - type: StealTarget
-    stealGroup: LAMP
+    stealGroup:
+    - LAMP
   - type: Clothing
     sprite: Objects/Tools/flashlight.rsi
     quickEquip: false
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
index eca7f43725..d8e53fb84c 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
@@ -169,7 +169,8 @@
     tags:
     - HighRiskItem
   - type: StealTarget
-    stealGroup: JetpackCaptainFilled
+    stealGroup:
+    - JetpackCaptainFilled
 
 # Filled captain
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 55b4d8d46f..4fdf430295 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -58,7 +58,8 @@
       containers:
         cell_slot: !type:ContainerSlot {}
     - type: StealTarget
-      stealGroup: LAMP
+      stealGroup:
+      - LAMP
     - type: Clothing
       sprite: Objects/Tools/lantern.rsi
       equippedPrefix: off
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 99eae7b04f..d4cb5606a2 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -275,7 +275,8 @@
       visible: false
       shader: unshaded
   - type: StealTarget
-    stealGroup: FlippoEngravedLighter
+    stealGroup:
+    - FlippoEngravedLighter
 
 - type: entity
   parent: [BaseBrandedLighter, BaseSyndicateContraband]
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 17fde1f5ff..5bc227a12f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -716,7 +716,8 @@
   - type: StaticPrice
     price: 750
   - type: StealTarget
-    stealGroup: WeaponAntiqueLaser
+    stealGroup:
+    - WeaponAntiqueLaser
   - type: SentienceTarget # I hope this is only the captain's gun
     flavorKind: station-event-random-sentience-flavor-inanimate
     weight: 0.0002 # 5,000 times less likely than 1 regular animal
@@ -926,7 +927,8 @@
     - HighRiskItem
     - Sidearm
   - type: StealTarget
-    stealGroup: WeaponEnergyMagnum
+    stealGroup:
+    - WeaponEnergyMagnum
   - type: Gun
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
index c58b4c6902..7f94f5f64d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -227,7 +227,8 @@
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
   - type: StealTarget
-    stealGroup: OfficerHandgun
+    stealGroup:
+    - OfficerHandgun
 
 - type: entity
   name: N1984
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index 7d234d5e1e..3e31e0d9f3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -96,7 +96,8 @@
     chambers: [ True, True, True, True, True, True ]
     ammoSlots: [ null, null, null, null, null, null ]
   - type: StealTarget
-    stealGroup: OfficerHandgun
+    stealGroup:
+    - OfficerHandgun
 
 - type: entity
   name: Mateba
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 6f4feb1e68..717361c274 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -54,7 +54,8 @@
   - type: UseDelay
     delay: 1
   - type: StealTarget
-    stealGroup: FireAxe
+    stealGroup:
+    - FireAxe
   - type: IgniteOnMeleeHit
     fireStacks: -4
 
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index cd7fc7d1d8..4b2d5e9e51 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -101,7 +101,8 @@
   - type: PirateAccent
     # not putting a BlockMovement component here cause that's funny.
   - type: StealTarget
-    stealGroup: CaptainSword
+    stealGroup:
+    - CaptainSword
 
 - type: entity
   name: katana
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index f051a9de72..a393090421 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -24,7 +24,8 @@
     - Bartender
     - Drinks
   - type: StealTarget
-    stealGroup: BoozeDispenser
+    stealGroup:
+    - BoozeDispenser
 
 - type: entity
   id: BoozeDispenser
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
index 7b9d55c01d..cda6a7bd2f 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml
@@ -23,7 +23,8 @@
     - Chemicals
     - Chemist
   - type: StealTarget
-    stealGroup: ChemDispenser
+    stealGroup:
+    - ChemDispenser
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
index 1672acd24d..7fef228bcf 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
@@ -97,7 +97,8 @@
     sprite: Structures/Furniture/Altars/Gods/nanotrasen.rsi
     state: nanotrasen
   - type: StealTarget
-    stealGroup: AltarNanotrasen
+    stealGroup:
+    - AltarNanotrasen
 
 - type: entity
   parent: AltarBaseSteel
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
index f5c3b03972..065d60b75e 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -246,7 +246,8 @@
   - type: Sprite
     state: plant-25
   - type: StealTarget
-    stealGroup: PlantRD
+    stealGroup:
+    - PlantRD
 
 - type: entity
   id: PottedPlant26
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index a7082e78ee..575c576a87 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -241,7 +241,8 @@
   suffix: Dirty Water, StealTarget
   components:
   - type: StealTarget
-    stealGroup: ToiletGoldenDirtyWater
+    stealGroup:
+    - ToiletGoldenDirtyWater
   - type: Solution
     solution:
         reagents:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index b88493f514..67134d3030 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -232,7 +232,8 @@
   - type: Computer
     board: CargoShuttleConsoleCircuitboard
   - type: StealTarget
-    stealGroup: CargoShuttleConsoleCircuitboard
+    stealGroup:
+    - CargoShuttleConsoleCircuitboard
 
 - type: entity
   parent: BaseComputerAiAccess
@@ -1384,7 +1385,8 @@
     - type: AccessReader
       access: [["Salvage"]]
     - type: StealTarget
-      stealGroup: SalvageExpeditionsComputerCircuitboard
+      stealGroup:
+      - SalvageExpeditionsComputerCircuitboard
 
 - type: entity
   parent: BaseComputer
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
index 4c0dfff445..68bdbc9b31 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -145,4 +145,5 @@
       name: "Captain's Office"
       receiveNukeCodes: true
     - type: StealTarget
-      stealGroup: FaxMachineCaptain
+      stealGroup:
+      - FaxMachineCaptain
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d54236a4a9..c271cf2f42 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -483,7 +483,8 @@
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
-    stealGroup: MedicalTechFabCircuitboard
+    stealGroup:
+    - MedicalTechFabCircuitboard
   - type: OreSiloClient
   - type: LatheAnnouncing
     channels: [Medical]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
index cb0a7a4d9c..cf81f4a901 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml
@@ -106,7 +106,8 @@
     containers:
       Nuke: !type:ContainerSlot
   - type: StealTarget
-    stealGroup: NuclearBomb
+    stealGroup:
+    - NuclearBomb
   - type: WarpPoint
     follow: true
     location: location-nuclear-bomb
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index aa56405738..3b41ff8f97 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -300,7 +300,7 @@
   name: freezer
   description: Cools gas in connected pipes.
   categories: !type:CreateVariants
-    sequences: [ [ ], [ HideSpawnMenu ], [ HideSpawnMenu ] ]  
+    sequences: [ [ ], [ HideSpawnMenu ], [ HideSpawnMenu ] ]
   placement:
     mode: AlignAtmosPipeLayers
   components:
@@ -313,7 +313,7 @@
         - state: freezerPanelOpen
           map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
         - sprite: !type:CreateVariants
-            values: 
+            values:
             - Structures/Piping/Atmospherics/thermomachine.rsi
             - Structures/Piping/Atmospherics/thermomachine_alt1.rsi
             - Structures/Piping/Atmospherics/thermomachine_alt2.rsi
@@ -322,7 +322,7 @@
           renderingStrategy: Default
     - type: AtmosPipeLayers
       pipeLayer: !type:CreateVariants
-        values: [ 0, 1, 2 ] 
+        values: [ 0, 1, 2 ]
       spriteLayersRsiPaths:
         enum.PipeVisualLayers.Pipe:
           Primary: Structures/Piping/Atmospherics/thermomachine.rsi
@@ -343,7 +343,8 @@
     - type: DeviceNetwork
       prefix: device-address-prefix-freezer
     - type: StealTarget
-      stealGroup: FreezerHeater
+      stealGroup:
+      - FreezerHeater
 
 - type: entity
   parent: !type:CreateVariants
@@ -378,7 +379,7 @@
         - state: heaterPanelOpen
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
         - sprite: !type:CreateVariants
-            values: 
+            values:
             - Structures/Piping/Atmospherics/thermomachine.rsi
             - Structures/Piping/Atmospherics/thermomachine_alt1.rsi
             - Structures/Piping/Atmospherics/thermomachine_alt2.rsi
@@ -387,7 +388,7 @@
           renderingStrategy: Default
     - type: AtmosPipeLayers
       pipeLayer: !type:CreateVariants
-        values: [ 0, 1, 2 ] 
+        values: [ 0, 1, 2 ]
       spriteLayersRsiPaths:
         enum.PipeVisualLayers.Pipe:
           Primary: Structures/Piping/Atmospherics/thermomachine.rsi
@@ -408,7 +409,8 @@
     - type: DeviceNetwork
       prefix: device-address-prefix-heater
     - type: StealTarget
-      stealGroup: FreezerHeater
+      stealGroup:
+      - FreezerHeater
 
 - type: entity
   parent: !type:CreateVariants
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
index 1a2218788c..ef1a73dc54 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
@@ -103,7 +103,8 @@
       - TEG
       - Power
     - type: StealTarget
-      stealGroup: Teg
+      stealGroup:
+      - Teg
 
 - type: entity
   id: TegCirculator
@@ -184,7 +185,8 @@
     - type: PipeRestrictOverlap
     - type: TegCirculator
     - type: StealTarget
-      stealGroup: Teg
+      stealGroup:
+      - Teg
     - type: DirectionalArrowIndicator
       arrows:
       - offset: 0, -1.5
diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml
index 3d86ad6f9c..962fc95074 100644
--- a/Resources/Prototypes/Objectives/objectiveGroups.yml
+++ b/Resources/Prototypes/Objectives/objectiveGroups.yml
@@ -77,6 +77,7 @@
   weights:
     HeadCloakStealCollectionObjective: 1                #command
     HeadBedsheetStealCollectionObjective: 1
+    HeadHardsuitStealCollectionObjective: 1
     StampStealCollectionObjective: 1
     DoorRemoteStealCollectionObjective: 1
     OfficerHandgunsStealCollectionObjective: 1         #sec
diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 048aa61c07..1c6c4209be 100644
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -107,6 +107,13 @@
     sprite: Objects/Misc/bedsheets.rsi
     state: sheetNT
 
+- type: stealTargetGroup
+  id: HeadHardsuit
+  name: steal-target-groups-heads-hardsuits
+  sprite:
+    sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
+    state: icon
+
 - type: stealTargetGroup
   id: Stamp
   name: steal-target-groups-stamps
diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index 203d5ed697..1e06d430fa 100644
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -74,6 +74,17 @@
   - type: Objective
     difficulty: 1.0
 
+- type: entity
+  parent: BaseThiefStealCollectionObjective
+  id: HeadHardsuitStealCollectionObjective
+  components:
+  - type: StealCondition
+    stealGroup: HeadHardsuit
+    minCollectionSize: 1
+    maxCollectionSize: 2
+  - type: Objective
+    difficulty: 3
+
 - type: entity
   parent: BaseThiefStealCollectionObjective
   id: StampStealCollectionObjective

From 9619bc377085a87f6634f59698f86e3f490097a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Thu, 1 Oct 2026 16:22:35 +0000
Subject: [PATCH 05/69] Fix localhost linter (#46251)

linter therapist

Co-authored-by: iaada <iaada@users.noreply.github.com>
---
 Content.Shared/Shuttles/Components/ShuttleComponent.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Content.Shared/Shuttles/Components/ShuttleComponent.cs b/Content.Shared/Shuttles/Components/ShuttleComponent.cs
index 3d128bf505..ddb0608610 100644
--- a/Content.Shared/Shuttles/Components/ShuttleComponent.cs
+++ b/Content.Shared/Shuttles/Components/ShuttleComponent.cs
@@ -14,7 +14,6 @@ public sealed partial class ShuttleComponent : Component
     /// <summary>
     /// Thrust gets multiplied by this value if it's for braking.
     /// </summary>
-    [DataField]
     public const float BrakeCoefficient = 1.5f;
 
     /// <summary>
@@ -23,7 +22,6 @@ public sealed partial class ShuttleComponent : Component
     [DataField]
     public float BaseMaxLinearVelocity = 60f;
 
-    [DataField]
     public const float MaxAngularVelocity = 4f;
 
     /// <summary>

From 6a8d5454a04c93e02711d8c41ed2dea6cd1c4aec Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Thu, 1 Oct 2026 18:09:36 +0000
Subject: [PATCH 06/69] Partial weapons meta.json cleanup (#46248)

* cleanup projectiles & makeshift battery meta.json

* partial weapons meta.json cleanup

* but who is the real lazy one here

it is me

it was always me

* missed you

* fix pirate revolver header fields

* lecter/xl8 delay indentation

* blunderbuss header indentation

* tabs + more misses
---
 .../Boxes/anti_materiel.rsi/meta.json         |   40 +-
 .../Boxes/caseless_rifle.rsi/meta.json        |   46 +-
 .../Boxes/light_rifle.rsi/meta.json           |   58 +-
 .../Ammunition/Boxes/magnum.rsi/meta.json     |   88 +-
 .../Ammunition/Boxes/pistol.rsi/meta.json     |   58 +-
 .../Guns/Ammunition/Boxes/rifle.rsi/meta.json |   82 +-
 .../Casings/ammo_casing.rsi/meta.json         |    4 +-
 .../Casings/anomalous_casing.rsi/meta.json    |   34 +-
 .../Casings/capgun_casing.rsi/meta.json       |    4 +-
 .../Casings/large_casing.rsi/meta.json        |    4 +-
 .../Casings/rocket_shell.rsi/meta.json        |    4 +-
 .../Casings/shotgun_shell.rsi/meta.json       |    4 +-
 .../Explosives/explosives.rsi/meta.json       |    4 +-
 .../CaselessRifle/10x24.rsi/meta.json         |    4 +-
 .../caseless_pistol_mag.rsi/meta.json         |    4 +-
 .../Magazine/Dart/darts.rsi/meta.json         |    4 +-
 .../Grenade/grenade_cartridge.rsi/meta.json   |    4 +-
 .../LightRifle/light_rifle_box.rsi/meta.json  |    4 +-
 .../LightRifle/light_rifle_mag.rsi/meta.json  |    4 +-
 .../Magazine/LightRifle/maxim.rsi/meta.json   |    4 +-
 .../Magazine/LightRifle/pk_box.rsi/meta.json  |    4 +-
 .../Magnum/magnum_smg_mag.rsi/meta.json       |    4 +-
 .../pistol_high_capacity_mag.rsi/meta.json    |    4 +-
 .../Magazine/Pistol/pistol_mag.rsi/meta.json  |    4 +-
 .../Magazine/Pistol/smg_mag.rsi/meta.json     |    4 +-
 .../Pistol/smg_mag_top_mounted.rsi/meta.json  |    4 +-
 .../Magazine/Shotgun/m12.rsi/meta.json        |    4 +-
 .../light_rifle_speed_loader.rsi/meta.json    |    4 +-
 .../Magnum/magnum_speed_loader.rsi/meta.json  |    4 +-
 .../Basic/kinetic_accelerator.rsi/meta.json   |   16 +-
 .../Weapons/Guns/Basic/oilgun.rsi/meta.json   |  104 +-
 .../Guns/Basic/spraynozzle.rsi/meta.json      |   38 +-
 .../Weapons/Guns/Basic/staves.rsi/meta.json   | 1060 ++++++++---------
 .../Weapons/Guns/Basic/tilegun.rsi/meta.json  |   74 +-
 .../Weapons/Guns/Basic/wands.rsi/meta.json    |  158 +--
 .../Battery/advancedlasergun.rsi/meta.json    |   16 +-
 .../Battery/antiquelasergun.rsi/meta.json     |  156 +--
 .../Guns/Battery/behonker_eye.rsi/meta.json   |   22 +-
 .../Guns/Battery/disabler.rsi/meta.json       |   16 +-
 .../Guns/Battery/energy_shotgun.rsi/meta.json |   52 +-
 .../Guns/Battery/laser_cannon.rsi/meta.json   |   14 +-
 .../Guns/Battery/laser_retro.rsi/meta.json    |  140 +--
 .../Guns/Battery/makeshift.rsi/meta.json      |   78 +-
 .../Battery/practice_disabler.rsi/meta.json   |   16 +-
 .../Weapons/Guns/Battery/taser.rsi/meta.json  |  166 +--
 .../Guns/Battery/tesla_gun.rsi/meta.json      |   12 +-
 .../Weapons/Guns/Bow/bow.rsi/meta.json        |   92 +-
 .../Guns/Cannons/pie_cannon.rsi/meta.json     |   46 +-
 .../Cannons/pneumatic_cannon.rsi/meta.json    |   52 +-
 .../Guns/Cannons/syringe_gun.rsi/meta.json    |   38 +-
 .../Weapons/Guns/HMGs/minigun.rsi/meta.json   |    8 +-
 .../Weapons/Guns/LMGs/l6.rsi/meta.json        |   14 +-
 .../Launchers/pirate_cannon.rsi/meta.json     |   32 +-
 .../Guns/Launchers/rocket.rsi/meta.json       |   58 +-
 .../Guns/Launchers/xb_mlr.rsi/meta.json       |   42 +-
 .../meta.json                                 |   24 +-
 .../Weapons/Guns/Pistols/N1984.rsi/meta.json  |    2 +-
 .../Weapons/Guns/Pistols/cobra.rsi/meta.json  |    2 +-
 .../Weapons/Guns/Pistols/debug.rsi/meta.json  |   50 +-
 .../Weapons/Guns/Pistols/mk58.rsi/meta.json   |    2 +-
 .../Weapons/Guns/Pistols/soaker.rsi/meta.json |   50 +-
 .../Weapons/Guns/Pistols/viper.rsi/meta.json  |    2 +-
 .../Guns/Pistols/water_pistol.rsi/meta.json   |   58 +-
 .../Guns/Projectiles/arrows.rsi/meta.json     |   56 +-
 .../Guns/Projectiles/magic.rsi/meta.json      |  278 ++---
 .../Guns/Projectiles/meteor.rsi/meta.json     |   14 +-
 .../Projectiles/projectiles.rsi/meta.json     | 1048 ++++++++--------
 .../Projectiles/projectiles2.rsi/meta.json    |  248 ++--
 .../Projectiles/projectiles_tg.rsi/meta.json  |  120 +-
 .../Guns/Projectiles/water_shot.rsi/meta.json |   24 +-
 .../Guns/Projectiles/xeno_toxic.rsi/meta.json |   24 +-
 .../Guns/Revolvers/chimp.rsi/meta.json        |   66 +-
 .../Guns/Revolvers/deckard.rsi/meta.json      |   78 +-
 .../Guns/Revolvers/inspector.rsi/meta.json    |    2 +-
 .../Guns/Revolvers/mateba.rsi/meta.json       |    2 +-
 .../Revolvers/pirate_revolver.rsi/meta.json   |   16 +-
 .../Weapons/Guns/Rifles/XL8.rsi/meta.json     |   60 +-
 .../Weapons/Guns/Rifles/lecter.rsi/meta.json  |   60 +-
 .../Weapons/Guns/SMGs/atreides.rsi/meta.json  |    2 +-
 .../Weapons/Guns/SMGs/briefcase.rsi/meta.json |   50 +-
 .../Weapons/Guns/SMGs/drozd.rsi/meta.json     |   74 +-
 .../Weapons/Guns/SMGs/wt550.rsi/meta.json     |  306 ++---
 .../Guns/Shotguns/blunderbuss.rsi/meta.json   |   14 +-
 .../Guns/Shotguns/flaregun.rsi/meta.json      |   16 +-
 .../Shotguns/flaregun_security.rsi/meta.json  |   14 +-
 .../Guns/Shotguns/hm_pistol.rsi/meta.json     |    3 +-
 .../Shotguns/improvised_shotgun.rsi/meta.json |   50 +-
 .../Weapons/Guns/Shotguns/sawn.rsi/meta.json  |    2 +-
 .../Guns/Shuttles/kinetic.rsi/meta.json       |   48 +-
 .../Guns/Shuttles/launcher.rsi/meta.json      |   54 +-
 .../Guns/Shuttles/pirate_cannon.rsi/meta.json |    6 +-
 .../Guns/Snipers/flintlock.rsi/meta.json      |   38 +-
 .../Weapons/Guns/Snipers/musket.rsi/meta.json |   54 +-
 .../Guns/Turrets/sentry_turret.rsi/meta.json  |  182 +--
 .../Guns/Turrets/turrets.rsi/meta.json        |   46 +-
 .../Guns/Turrets/xenoturret.rsi/meta.json     |  126 +-
 .../Throwable/throwing_star.rsi/meta.json     |   60 +-
 .../Objects/Weapons/pflash.rsi/meta.json      |   54 +-
 98 files changed, 3249 insertions(+), 3250 deletions(-)

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json
index 942f06d0b8..baf58ca08c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi/meta.json
@@ -1,23 +1,23 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json
index 1cde5f0678..8f46861f50 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "practice"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "practice"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
index f20e7373ce..e01dd5961e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json
@@ -1,32 +1,32 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "incendiary"
-    },
-    {
-      "name": "practice"
-    },
-    {
-      "name": "uranium"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
index 1a54a4b636..8eb00cb3c9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json
@@ -1,47 +1,47 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "capbase"
-    },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "mag-cap-1"
-    },
-    {
-      "name": "mag-cap-2"
-    },
-    {
-      "name": "mag-cap-3"
-    },
-    {
-      "name": "incendiary"
-    },
-    {
-      "name": "practice"
-    },
-    {
-      "name": "uranium"
-    },
-    {
-      "name": "piercing"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "capbase"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-cap-1"
+        },
+        {
+            "name": "mag-cap-2"
+        },
+        {
+            "name": "mag-cap-3"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        },
+        {
+            "name": "piercing"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
index 1dbd2630ee..62f305fc35 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json
@@ -1,32 +1,32 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "incendiarydisplay"
-    },
-    {
-      "name": "incendiary"
-    },
-    {
-      "name": "practice"
-    },
-    {
-      "name": "uranium"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "incendiarydisplay"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
index b6e5c821cc..b90618b4cc 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json
@@ -1,44 +1,44 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f, modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base-big"
-    },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "mag-big-1"
-    },
-    {
-      "name": "mag-big-2"
-    },
-    {
-      "name": "mag-big-3"
-    },
-    {
-      "name": "incendiary"
-    },
-    {
-      "name": "practice"
-    },
-    {
-      "name": "uranium"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-big"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-big-1"
+        },
+        {
+            "name": "mag-big-2"
+        },
+        {
+            "name": "mag-big-3"
+        },
+        {
+            "name": "incendiary"
+        },
+        {
+            "name": "practice"
+        },
+        {
+            "name": "uranium"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
index eb50004240..39f5c40eab 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/meta.json
index 8a12710b11..25732e481c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/anomalous_casing.rsi/meta.json
@@ -1,20 +1,20 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base-spent"
-    },
-    {
-      "name": "overlay"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-spent"
+        },
+        {
+            "name": "overlay"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json
index af7e9d94a1..ab32b32939 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/capgun_casing.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy, recolored by Alekshhh",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/0b3ab17dbad632ddf738b63900ef8df1926bba47/icons/obj/ammo.dmi, modified by Topy, recolored by Alekshhh",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
index af362ad53a..d4be83ad8c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/large_casing.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/8a848cde3e8610455f77704e861e5a06315a3b0e/icons/obj/ammo.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/8a848cde3e8610455f77704e861e5a06315a3b0e/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
index d1b38434cb..21f261d1df 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
index a7aa232dec..a588dad419 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi, improvised ammo from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, uranium ammo is a modification of the slug sprite by Boaz1111",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
index 0d91035a83..de2925856b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi,  ball, glassshot and grapeshot Made by Alekshhh (Github) for ss1, emp made by TheShuEd (github), cleanade made by southbridge-fur (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi,  ball, glassshot and grapeshot Made by Alekshhh (Github) for ss1, emp made by TheShuEd (github), cleanade made by southbridge-fur (github)",
     "states": [
         {
             "name": "baton"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
index 2f89a1e026..e8c3f7da65 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
index e78af4ebce..c491c3f4ed 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
index 4e74806f27..b42d228b65 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/meta.json
index 32d2f5b7f0..bdd4433b25 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Grenade/grenade_cartridge.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "created by TheShuEd (github) for Space Station 14",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "created by TheShuEd (github) for Space Station 14",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
index 2f89a1e026..e8c3f7da65 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
index 6095aa7d98..ca86e46cc8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/pull/1602/commits/3e6cfea9d468508a7f64ad5543c3b22479cb465f , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
index eb84050ce4..c2b649e764 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/maxim.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
index ead16b8ad0..0c3ffabcb2 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/pk_box.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/ammo.dmi",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/ammo.dmi",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
index dbf98bdf55..7f4a648178 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
index 1bab5b591e..b8c17a71f8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), base-icon made via base combined with mag-5 by SlamBamActionman (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github), base-icon made via base combined with mag-5 by SlamBamActionman (github)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
index ad008dad90..c3f65b284f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
index ad008dad90..c3f65b284f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
index ead6df3a37..7554176ac4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
index eaa0f484ad..d9096aa54d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json
index 4b014c993e..9a5871560e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
index ba3886eb43..b19b286e22 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/pull/1684/commits/19e51caef09e78ca1122d26455b539ff5968d334, https://github.com/tgstation/tgstation/blob/master/icons/obj/weapons/guns/ammo.dmi, inhands by TiniestShark",
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
index 3aac7e3788..3b0f9766f3 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, wield, and belt equip sprites by RiceMar1244",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon by RiceMar1244 based on tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57; inhand, wield, and belt equip sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "icon"
@@ -39,7 +39,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/oilgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/oilgun.rsi/meta.json
index c4ee7878aa..021f935e7f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/oilgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/oilgun.rsi/meta.json
@@ -1,55 +1,55 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "created by Samuka-C (github), flame taken from Objects/Tools/welder_experimental.rsi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "created by Samuka-C (github), flame taken from Objects/Tools/welder_experimental.rsi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "flame",
-      "delays": [
-        [
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "mag-4"
-    },
-    {
-      "name": "mag-5"
-    },
-    {
-      "name": "reloading",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "flame",
+            "delays": [
+                [
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "reloading",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/spraynozzle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/spraynozzle.rsi/meta.json
index 5995a4227f..86926a463e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/spraynozzle.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/spraynozzle.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/f7337f1aa9efdcc1403ca4771d638e0634074537",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
index a5edb3afe4..e376a97573 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json
@@ -1,533 +1,533 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering. Generic unshaded layers added by electro.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "animation",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering. Generic unshaded layers added by electro.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "healing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "door",
-      "delays": [
-        [
-          2,
-          2,
-          2,
-          2
-        ]
-      ]
-    },
-	{
-      "name": "staff-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "animation-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "healing-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "door-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ]
-      ]
-    },
-	{
-      "name": "staff-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "animation-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "healing-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ],
-        [
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1,
-          0.2,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "door-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ],
-        [
-          2,
-          2,
-          2,
-          2
-        ]
-      ]
-    },
-	{
-      "name": "change",
-      "delays": [
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "nothing",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "chaos",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-	{
-      "name": "change-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "chaos-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ]
-      ]
-    },
-	{
-      "name": "change-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ],
-        [
-          0.4,
-          0.4,
-          0.4,
-          0.4,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "chaos-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ],
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "staff-inhand-right-unshaded",
-      "directions": 4
-    },
-    {
-      "name": "staff-inhand-left-unshaded",
-      "directions": 4
-    },
-    {
-      "name": "nothing-unshaded"
-    }
-  ]
+    "states": [
+        {
+            "name": "animation",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "healing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.2,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "door",
+            "delays": [
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ]
+            ]
+        },
+        {
+            "name": "staff-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "animation-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "healing-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "door-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ]
+            ]
+        },
+        {
+            "name": "staff-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "animation-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "healing-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "door-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ],
+                [
+                    2,
+                    2,
+                    2,
+                    2
+                ]
+            ]
+        },
+        {
+            "name": "change",
+            "delays": [
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "nothing",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "chaos",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "change-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "chaos-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "change-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ],
+                [
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4,
+                    0.4
+                ]
+            ]
+        },
+        {
+            "name": "chaos-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ],
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "staff-inhand-right-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "staff-inhand-left-unshaded",
+            "directions": 4
+        },
+        {
+            "name": "nothing-unshaded"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/tilegun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/tilegun.rsi/meta.json
index a9711a6798..096494bb76 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/tilegun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/tilegun.rsi/meta.json
@@ -1,40 +1,40 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "created by Samuka-C (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "created by Samuka-C (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-1"
-    },
-    {
-      "name": "mag-2"
-    },
-    {
-      "name": "mag-3"
-    },
-    {
-      "name": "mag-4"
-    },
-    {
-      "name": "mag-5"
-    },
-    {
-      "name": "mag-6"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
index 59d423baac..4cf92c970e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json
@@ -1,82 +1,82 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "death-effect",
-      "delays": [
-        [
-          0.3,
-          0.3
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "/tg/station at https://github.com/tgstation/tgstation/commit/270acce4f551253d8ac75de19236b8b4be598f7f. edited by mirrorcult to allow layering",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "poly-effect",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "fire-effect",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "death"
-    },
-    {
-      "name": "poly"
-    },
-    {
-      "name": "fire"
-    },
-	{
-      "name": "door-effect"
-    },
-    {
-      "name": "door"
-    },
-    {
-      "name": "nothing"
-    },
-	{
-      "name": "wand-inhand-left",
-	  "directions": 4
-    },
-    {
-      "name": "wand-inhand-right",
-	  "directions": 4
-    },
-    {
-      "name": "locker"
-    },
-    {
-      "name": "locker-effect"
-    },
-    {
-      "name": "locker-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "locker-inhand-left",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "death-effect",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "poly-effect",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fire-effect",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "death"
+        },
+        {
+            "name": "poly"
+        },
+        {
+            "name": "fire"
+        },
+        {
+            "name": "door-effect"
+        },
+        {
+            "name": "door"
+        },
+        {
+            "name": "nothing"
+        },
+        {
+            "name": "wand-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wand-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "locker"
+        },
+        {
+            "name": "locker-effect"
+        },
+        {
+            "name": "locker-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "locker-inhand-left",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
index 907ff1d8ea..7802014614 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json
@@ -36,13 +36,13 @@
             "name": "inhand-right",
             "directions": 4
         },
-		{
-			"name": "equipped-BELT",
-			"directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
-		}
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
index 9be9dcf63b..6ac7712eaf 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
@@ -1,80 +1,80 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "icon by RiceMar1244 based on icon taken from tg station at commit https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57, edited by GaussiArson",
-  "size": {
-    "x": 32,
-    "y": 32
-	},
-	"states": [
-		{
-			"name": "icon"
-		},
-		{
-			"name": "base"
-		},
-		{
-			"name": "mag-unshaded-0"
-		},
-		{
-			"name": "mag-unshaded-1"
-		},
-		{
-			"name": "mag-unshaded-2"
-		},
-		{
-			"name": "mag-unshaded-3"
-		},
-		{
-			"name": "mag-unshaded-4"
-		},
-		{
-			"name": "inhand-left-0",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-0",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-1",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-1",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-2",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-2",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-3",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-3",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		},
-		{
-			"name": "equipped-BELT",
-			"directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
-		}
-	]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon by RiceMar1244 based on icon taken from tg station at commit https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57, edited by GaussiArson",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/behonker_eye.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/behonker_eye.rsi/meta.json
index 3abd022f8a..c71e3f57fb 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/behonker_eye.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/behonker_eye.rsi/meta.json
@@ -1,14 +1,14 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (github)",
-  "size": {
-    "x": 32,
-    "y": 32
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-      "states": [
-    {
-      "name": "base"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
index 9f297bde4f..4493cbdc0d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json
@@ -69,13 +69,13 @@
         {
             "name": "inhand-right-4"
         },
-		{
-			"name": "equipped-BELT",
-			"directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
-		}
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
index 9ffc003082..8a9dbaa047 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json
@@ -7,31 +7,31 @@
         "y": 32
     },
     "states": [
-		{
-			"name": "icon"
-		},
-		{
-			"name": "base"
-		},
-		{
-			"name": "mag-unshaded-1"
-		},
-		{
-			"name": "mag-unshaded-2"
-		},
-		{
-			"name": "mag-unshaded-3"
-		},
-		{
-			"name": "mag-unshaded-4"
-		},
-  	 	{
-   		   	"name": "equipped-BACKPACK",
-   		   	"directions": 4
- 	   	},
- 	   	{
-		"name": "equipped-SUITSTORAGE",
-		"directions": 4
-		}
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+        "name": "equipped-SUITSTORAGE",
+        "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
index acbd06c270..c2b82cf935 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "icon"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json
index daa6e45138..46269aed37 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi/meta.json
@@ -1,72 +1,72 @@
 {
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
-	"states": [
-		{
-			"name": "icon"
-		},
-		{
-			"name": "base"
-		},
-		{
-			"name": "mag-unshaded-0"
-		},
-		{
-			"name": "mag-unshaded-1"
-		},
-		{
-			"name": "mag-unshaded-2"
-		},
-		{
-			"name": "mag-unshaded-3"
-		},
-		{
-			"name": "mag-unshaded-4"
-		},
-		{
-			"name": "inhand-left-0",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-0",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-1",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-1",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-2",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-2",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left-3",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right-3",
-			"directions": 4
-		},
-		{
-			"name": "inhand-left",
-			"directions": 4
-		},
-		{
-			"name": "inhand-right",
-			"directions": 4
-		}
-	]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/125c975f1b3bf9826b37029e9ab5a5f89e975a7e",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-0",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-1",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-2",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-3",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
index dabe44dce0..ec35f66bd8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json
@@ -1,49 +1,49 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b6831dab1e1a74c0d91f2229adb87abbb089d31, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111.",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-	{
-		"name": "icon"
-	},
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-unshaded-1"
-	},
-	{
-		"name": "mag-unshaded-2"
-	},
-	{
-		"name": "mag-unshaded-3"
-	},
-	{
-		"name": "mag-unshaded-4"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-	{
-	  "name": "equipped-BELT",
-	  "directions": 4
-	}
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
index 2b4b762ca2..0b0b25cfb1 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json
@@ -69,13 +69,13 @@
         {
             "name": "inhand-right-4"
         },
-		{
-			"name": "equipped-BELT",
-			"directions": 4
-		},
-		{
-			"name": "equipped-SUITSTORAGE",
-			"directions": 4
-		}
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
index 08eb87f871..9b12571188 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json
@@ -1,86 +1,86 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-unshaded-0",
-      "delays": [
-        [
-          0.3,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-1"
-    },
-    {
-      "name": "mag-unshaded-2"
-    },
-    {
-      "name": "mag-unshaded-3"
-    },
-    {
-      "name": "mag-unshaded-4"
-    },
-    {
-      "name": "taser0-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "taser0-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "taser1-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "taser1-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "taser2-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "taser2-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "taser3-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "taser3-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "taser4-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "taser4-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "mag-unshaded-4"
+        },
+        {
+            "name": "taser0-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "taser0-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "taser1-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "taser1-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "taser2-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "taser2-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "taser3-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "taser3-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "taser4-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "taser4-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
index 9bdcbea1a6..b61ff3b155 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/tesla_gun.rsi/meta.json
@@ -19,13 +19,13 @@
             "directions": 4
         },
         {
-          "name": "mag-unshaded-0",
-          "delays": [
-            [
-              0.3,
-              0.3
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
             ]
-          ]
         },
         {
             "name": "mag-unshaded-1"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json
index 71e01e8b14..29aa8c6c54 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Bow/bow.rsi/meta.json
@@ -1,49 +1,49 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "unwielded"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, equipped-BACKPACK and wielded sprites added by mirrorcult",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "unwielded-arrow"
-    },
-	{
-      "name": "unwielded-plunger"
-    },
-    {
-      "name": "wielded"
-    },
-    {
-      "name": "wielded-arrow"
-    },
-	{
-      "name": "wielded-plunger"
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "unwielded"
+        },
+        {
+            "name": "unwielded-arrow"
+        },
+        {
+            "name": "unwielded-plunger"
+        },
+        {
+            "name": "wielded"
+        },
+        {
+            "name": "wielded-arrow"
+        },
+        {
+            "name": "wielded-plunger"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json
index 1509c2c975..c4da1a4f6a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/pie_cannon.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at dc9cef40447ee86c2b9fff9f690385cd63b655fa, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "piecannon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at dc9cef40447ee86c2b9fff9f690385cd63b655fa, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "piecannon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json
index 002adee87c..783ec412c6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/pneumatic_cannon.rsi/meta.json
@@ -1,29 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at b2e5316993806b1524ab81237b1735b0591df2a2, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation at b2e5316993806b1524ab81237b1735b0591df2a2, backpack sprite by peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "tank"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "tank"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
index c1d454e0ec..7adf303a62 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13 at f91dfe2e0dba1b7a8b9a0fa18251340920979a62, held sprite by ScarKy0",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-right",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13 at f91dfe2e0dba1b7a8b9a0fa18251340920979a62, held sprite by ScarKy0",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "syringe_gun"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "syringe_gun"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
index fc09537d25..bda45063e1 100644
--- a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/meta.json
@@ -28,10 +28,10 @@
             "name": "base",
             "delays": [
                 [
-                0.1,
-                0.1,
-                0.1,
-                0.1
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
                 ]
             ]
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
index 953ebd6302..5a6b488332 100644
--- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/237d8f7894617007d75c71d5d9feb4354c78debd/icons/obj/guns/lmg.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "icon"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/meta.json
index 63324dd23e..bf54a782f4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi/meta.json
@@ -6,21 +6,21 @@
         "x": 32,
         "y": 32
     },
-      "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
index bcccc7a561..3932b6f7d9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json
@@ -7,34 +7,34 @@
         "y": 32
     },
     "states": [
-	{
-		"name": "base"
-	},
-	{
-		"name": "mag-0"
-	},
-	{
-		"name": "mag-1"
-	},
-	{
-		"name": "inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "inhand-right",
-		"directions": 4
-	},
-	{
-		"name": "rocket0-inhand-left",
-		"directions": 4
-	},
-	{
-		"name": "rocket0-inhand-right",
-		"directions": 4
-	},
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    }
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rocket0-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "rocket0-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/xb_mlr.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/xb_mlr.rsi/meta.json
index d67f58f526..aefe6e1a6b 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/xb_mlr.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/xb_mlr.rsi/meta.json
@@ -7,26 +7,26 @@
         "y": 32
     },
     "states": [
-	{
-		"name": "mlr"
-	},
-	{
-		"name": "mag-1"
-	},
-    {
-        "name": "mag-2"
-    },
-    {
-		"name": "mag-3"
-	},
-    {
-		"name": "mag-4"
-	},
-    {
-		"name": "mag-5"
-	},
-    {
-		"name": "mag-6"
-	}
+        {
+            "name": "mlr"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/xenoborg_guided_missile_launcher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/xenoborg_guided_missile_launcher.rsi/meta.json
index fb1405c936..10ad53cc28 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Launchers/xenoborg_guided_missile_launcher.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/xenoborg_guided_missile_launcher.rsi/meta.json
@@ -7,17 +7,17 @@
         "y": 32
     },
     "states": [
-		{
-			"name": "base"
-		},
-		{
-			"name": "mag-1"
-		},
-		{
-			"name": "mag-2"
-		},
-		{
-			"name": "mag-3"
-		}
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
index 748eb1de0e..6f5fc91109 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json
@@ -31,7 +31,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
index 3ef8cec9bd..91e0aa9d4f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json
@@ -28,7 +28,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json
index e58e219a87..02e5ab3059 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "swept",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "swept",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base"
-    },
-    {
-      "name": "mag-0"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
index 4e40f6e842..299a9e6c64 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json
@@ -31,7 +31,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/soaker.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/soaker.rsi/meta.json
index 8652914b03..2b41d2e1df 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/soaker.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/soaker.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "detail1"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "detail2"
-    },
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "detail1"
+        },
+        {
+            "name": "detail2"
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
index 270c54ea50..0d01eef669 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json
@@ -34,7 +34,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/water_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/water_pistol.rsi/meta.json
index d6261bf9dc..dde322e9d5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Pistols/water_pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/water_pistol.rsi/meta.json
@@ -1,32 +1,32 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "display"
-    },
-    {
-      "name": "detail"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "display"
+        },
+        {
+            "name": "detail"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json
index f5f474b960..a1efe4b6a6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/arrows.rsi/meta.json
@@ -1,31 +1,31 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "tail"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, sprites modified and cut into layers by mirrorcult",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "rod"
-    },
-    {
-      "name": "tip"
-    },
-    {
-      "name": "solution1"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "tail"
+        },
+        {
+            "name": "rod"
+        },
+        {
+            "name": "tip"
+        },
+        {
+            "name": "solution1"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
index 7c2c9abe17..b7076c621f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/magic.rsi/meta.json
@@ -1,142 +1,142 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Tgstation at https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "magicm",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Tgstation at https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "magicm_green",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-	{
-      "name": "magicm_yellow",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-	{
-      "name": "magicm_red",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-	{
-      "name": "magicm_cyan",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "spell",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "ice"
-    },
-    {
-      "name": "declone"
-    },
-    {
-      "name": "bluespace",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "chronobolt"
-    },
-    {
-      "name": "arcane_barrage"
-    },
-    {
-      "name": "fireball",
-      "delays": [
-        [
-          0.095,
-          0.095,
-          0.095,
-          0.095,
-          0.095
-        ]
-      ]
-    },
-    {
-      "name": "spellcard"
-    },
-    {
-      "name": "blastwave",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "infernoshot",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "cryoshot"
-    }
-  ]
+    "states": [
+        {
+            "name": "magicm",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "magicm_green",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "magicm_yellow",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "magicm_red",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "magicm_cyan",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "spell",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "ice"
+        },
+        {
+            "name": "declone"
+        },
+        {
+            "name": "bluespace",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "chronobolt"
+        },
+        {
+            "name": "arcane_barrage"
+        },
+        {
+            "name": "fireball",
+            "delays": [
+                [
+                    0.095,
+                    0.095,
+                    0.095,
+                    0.095,
+                    0.095
+                ]
+            ]
+        },
+        {
+            "name": "spellcard"
+        },
+        {
+            "name": "blastwave",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "infernoshot",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "cryoshot"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
index 458a44a86f..364c0db123 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
@@ -3,13 +3,13 @@
     "license": "CC-BY-SA-3.0",
     "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi",
     "size": {
-      "x": 32,
-      "y": 32
+        "x": 32,
+        "y": 32
     },
     "states": [
-      {
-        "name": "large"
-      }
+        {
+            "name": "large"
+        }
     ]
-  }
-  
+}
+
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
index a02cf9fbfc..0eaca3b024 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
@@ -1,527 +1,527 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d, debug sprites by slarticodefast(GitHub), _xeno_fire sprites by august-sun(Github), xenoborg sprites recolored by Samuka-C (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bolt"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d, debug sprites by slarticodefast(GitHub), _xeno_fire sprites by august-sun(Github), xenoborg sprites recolored by Samuka-C (github).",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "muzzle_debug"
-    },
-    {
-      "name": "debug"
-    },
-    {
-      "name": "impact_debug"
-    },
-    {
-      "name": "muzzle_bullet"
-    },
-    {
-      "name": "muzzle_u_laser",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "u_laser",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_u_laser",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_beam_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_beam_heavy2",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_beam_xenoborg",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_beam_xenoborg_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "laser_pointer",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_heavy2",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_xenoborg",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_xenoborg_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_beam_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_beam_heavy2",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_beam_xenoborg",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_beam_xenoborg_heavy",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_omni",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_omni",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_omni",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_blue",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam_blue",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "impact_blue",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_laser",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_laser_pointer",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "beam",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "impact_laser",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "impact_laser_pointer",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-      "name": "muzzle_xray",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "xray",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "impact_xray",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-     "name": "impact_xeno_fire",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-     "name": "beam_xeno_fire",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    },
-    {
-     "name": "muzzle_xeno_fire",
-      "delays": [
-        [
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002,
-          0.060000002
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "bolt"
+        },
+        {
+            "name": "muzzle_debug"
+        },
+        {
+            "name": "debug"
+        },
+        {
+            "name": "impact_debug"
+        },
+        {
+            "name": "muzzle_bullet"
+        },
+        {
+            "name": "muzzle_u_laser",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "u_laser",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_u_laser",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_beam_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_beam_heavy2",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_beam_xenoborg",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_beam_xenoborg_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "laser_pointer",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_heavy2",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_xenoborg",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_xenoborg_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_beam_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_beam_heavy2",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_beam_xenoborg",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_beam_xenoborg_heavy",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_omni",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_omni",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_omni",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_blue",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_blue",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "impact_blue",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_laser",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_laser_pointer",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "impact_laser",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "impact_laser_pointer",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_xray",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "xray",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "impact_xray",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "impact_xeno_fire",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "beam_xeno_fire",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        },
+        {
+            "name": "muzzle_xeno_fire",
+            "delays": [
+                [
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06,
+                    0.06
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
index be81679c97..ab35a05890 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
@@ -1,127 +1,127 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111, cleanade made by Southbridge_fur (github), crossbowbolt made by Entvari(github), mechadermis-missle-base and mechadermis-missle-unshaded made by AftrLite (GitHub)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "buckshot"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a, ball made by brainfood1183 (Github) for ss14, the uranium sprite is a modified version of the buckshot pellet by Boaz1111, cleanade made by Southbridge_fur (github), crossbowbolt made by Entvari(github), mechadermis-missle-base and mechadermis-missle-unshaded made by AftrLite (GitHub)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "buckshot-flare"
-    },
-    {
-      "name": "depleted-uranium"
-    },
-    {
-      "name": "ball"
-    },
-    {
-      "name": "bullet",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "rubber",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "practice",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "uranium",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "piercing",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "frag"
-    },
-    {
-      "name": "grenade",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "slug"
-    },
-    {
-      "name": "smallfrag"
-    },
-    {
-      "name": "spark",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "grapeshot"
-    },
-    {
-      "name": "shard"
-    },
-    {
-      "name": "cleanade",
-      "delays": [
-        [
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "mechadermis-missile-base"
-    },
-    {
-      "name": "mechadermis-missile-unshaded",
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "crossbowbolt"
-    }
-  ]
+    "states": [
+        {
+            "name": "buckshot"
+        },
+        {
+            "name": "buckshot-flare"
+        },
+        {
+            "name": "depleted-uranium"
+        },
+        {
+            "name": "ball"
+        },
+        {
+            "name": "bullet",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "rubber",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "practice",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "uranium",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "piercing",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "frag"
+        },
+        {
+            "name": "grenade",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "slug"
+        },
+        {
+            "name": "smallfrag"
+        },
+        {
+            "name": "spark",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "grapeshot"
+        },
+        {
+            "name": "shard"
+        },
+        {
+            "name": "cleanade",
+            "delays": [
+                [
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "mechadermis-missile-base"
+        },
+        {
+            "name": "mechadermis-missile-unshaded",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "crossbowbolt"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
index 872a5ab721..eeb0f18f68 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json
@@ -1,63 +1,63 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac, modified by chromiumboy.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "omnilaser"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac, modified by chromiumboy.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "omnilaser_flash"
-    },
-    {
-      "name": "omnilaser_greyscale"
-    },
-    {
-      "name": "impact_bullet",
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "impact_laser_blue",
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "impact_laser_greyscale",
-      "delays": [
-        [
-          0.05,
-          0.05,
-          0.05,
-          0.05
-        ]
-      ]
-    },
-    {
-      "name": "heavylaser"
-    },
-    {
-      "name": "heavylaser_flash"
-    },
-    {
-      "name": "ice"
-    }
-  ]
+    "states": [
+        {
+            "name": "omnilaser"
+        },
+        {
+            "name": "omnilaser_flash"
+        },
+        {
+            "name": "omnilaser_greyscale"
+        },
+        {
+            "name": "impact_bullet",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "impact_laser_blue",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "impact_laser_greyscale",
+            "delays": [
+                [
+                    0.05,
+                    0.05,
+                    0.05,
+                    0.05
+                ]
+            ]
+        },
+        {
+            "name": "heavylaser"
+        },
+        {
+            "name": "heavylaser_flash"
+        },
+        {
+            "name": "ice"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
index d9b9aa1361..d8c80a1fd6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/water_shot.rsi/meta.json
@@ -1,14 +1,14 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    }
-  ]
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
index 3e99c62878..60a66569c5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xeno_toxic.rsi/meta.json
@@ -1,14 +1,14 @@
 {
-  "version": 1,
-  "license": "CC-BY-NC-4.0",
-  "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/obj/items/projectiles.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "xeno_toxic"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/obj/items/projectiles.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "xeno_toxic"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
index 02697b6d5e..3ddb3d7700 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json
@@ -1,36 +1,36 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-unshaded-1"
-    },
-    {
-      "name": "mag-unshaded-2"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-	{
-	  "name": "equipped-BELT",
-	  "directions": 4
-	},
-	{
-	  "name": "equipped-SUITSTORAGE",
-	  "directions": 4
-	}
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
index fb84e5e63c..aa6a494393 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json
@@ -1,42 +1,42 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mag-unshaded-0"
-    },
-    {
-      "name": "mag-unshaded-1"
-    },
-    {
-      "name": "mag-unshaded-2"
-    },
-    {
-      "name": "mag-unshaded-3"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-	{
-	  "name": "equipped-BELT",
-	  "directions": 4
-	},
-	{
-	  "name": "equipped-SUITSTORAGE",
-	  "directions": 4
-	}
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-unshaded-0"
+        },
+        {
+            "name": "mag-unshaded-1"
+        },
+        {
+            "name": "mag-unshaded-2"
+        },
+        {
+            "name": "mag-unshaded-3"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
index 1faecd06b3..f047ba9b54 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json
@@ -25,7 +25,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
index 1faecd06b3..f047ba9b54 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json
@@ -25,7 +25,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
index 3cdd175e71..aaa9c5d5c9 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/b1d5664161441b32f599a986e4fb8393cfd87324/icons/obj/guns/projectile/artwork_revolver.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/b1d5664161441b32f599a986e4fb8393cfd87324/icons/obj/guns/projectile/artwork_revolver.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "inhand-left",
@@ -25,7 +25,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json
index 9aad06372d..9d70e105f4 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json
@@ -18,48 +18,48 @@
         },
         {
             "name": "mag-0",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-1",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-2",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-3",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-4",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index d2d6aaa217..a5cda2a04c 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -18,48 +18,48 @@
         },
         {
             "name": "mag-0",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-1",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-2",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-3",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-4",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "inhand-left",
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
index df17b6ce6a..2ffaaf8fad 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json
@@ -34,7 +34,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/briefcase.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/briefcase.rsi/meta.json
index 3aaf214aae..7ff4b8c375 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/briefcase.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/briefcase.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "briefcase base made by ps3moira (github) and modified by MissKay1994(github), weapon states by MissKay1994(github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon-muzzle"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "briefcase base made by ps3moira (github) and modified by MissKay1994(github), weapon states by MissKay1994(github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left-muzzle",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-muzzle",
-      "directions": 4
-    },
-    {
-      "name": "bolt-open"
-    },
-    {
-      "name": "base"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon-muzzle"
+        },
+        {
+            "name": "inhand-left-muzzle",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-muzzle",
+            "directions": 4
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "base"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
index 08577a04fe..91204686a5 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-	"version": 1,
-	"license": "CC-BY-SA-3.0",
-	"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, all sprites minus suppressor heavily edited by Emisse for SS14. Magazine state sprites by RedBookcase on Github.",
-	"size": {
-		"x": 32,
-		"y": 32
-	},
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, all sprites minus suppressor heavily edited by Emisse for SS14. Magazine state sprites by RedBookcase on Github.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "icon"
@@ -18,48 +18,48 @@
         },
         {
             "name": "mag-0",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-1",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-2",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-3",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "mag-4",
-			"delays": [
-			[
-			0.5,
-			0.5
-			]
-		]
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
         },
         {
             "name": "suppressor"
diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
index f5a433a323..ca1c0cfa8e 100644
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json
@@ -1,156 +1,156 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/e1a3cbe9ba2e6e29b7f1cad1bb456b390aac936d/icons/obj/guns/projectile.dmi, backpack sprite by Peptide (copy of Atreides), and sprite modification by Jaсkal 298, backpack sling sprite edited by Boaz1111, Inhands modified by Seam_Lesss (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "base-unshaded",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-0",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-0",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-1",
-      "delays": [
-          [
-            0.1,
-            0.3
-          ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-1",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-2",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-2",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-3",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-3",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-4",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-4",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-5",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "mag-unshaded-5",
-      "delays": [
-        [
-          0.1,
-          0.3
-        ]
-      ]
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-	{
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "base-unshaded",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-0",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-0",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-1",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-1",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-2",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-2",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-3",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-3",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-4",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-4",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-5",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "mag-unshaded-5",
+            "delays": [
+                [
+                    0.1,
+                    0.3
+                ]
+            ]
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
index b3ab88b772..8fae4539b0 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/blunderbuss.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183(Github) inspired by an image created by rezierré#5003 (Discord), wield sprites by RiceMar1244",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "icon"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
index 4384076149..deb560388a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "base"
@@ -25,7 +25,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
index 04abe1a4e0..8271b66c27 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi/meta.json
@@ -1,11 +1,11 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi and edited",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi and edited",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
     "states": [
         {
             "name": "base"
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
index 9fd38ac1fe..0e0345b2d8 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/hm_pistol.rsi/meta.json
@@ -7,7 +7,6 @@
         "y": 32
     },
     "states": [
-
         {
             "name": "icon"
         },
@@ -26,7 +25,7 @@
             "name": "equipped-BELT",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
index e02409519d..5492be7059 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/ at commit fb2d71495bfe81446159ef528534193d09dd8d34, back sprite modified by Flareguy",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "equipped-SUITSTORAGE",
-      "directions": 4
-    },
-    {
-      "name": "ishotgunstep1"
-    },
-    {
-      "name": "ishotgunstep2"
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        },
+        {
+            "name": "ishotgunstep1"
+        },
+        {
+            "name": "ishotgunstep2"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
index 048169e75b..79c91f0b1f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json
@@ -17,7 +17,7 @@
             "name": "equipped-BACKPACK",
             "directions": 4
         },
-		{
+        {
             "name": "equipped-SUITSTORAGE",
             "directions": 4
         }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/meta.json
index 537e6f8538..25f6910f1a 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shuttles/kinetic.rsi/meta.json
@@ -7,29 +7,29 @@
         "y": 64
     },
     "states": [
-    {
-        "name": "ptk-800"
-    },
-    {
-        "name": "mag-1"
-    },
-    {
-        "name": "mag-2"
-    },
-    {
-        "name": "mag-3"
-    },
-    {
-        "name": "mag-4"
-    },
-    {
-        "name": "mag-5"
-    },
-    {
-        "name": "mag-6"
-    },
-    {
-        "name": "mag-7"
-    }
+        {
+            "name": "ptk-800"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        },
+        {
+            "name": "mag-7"
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/meta.json
index 75a018b665..69b0016d3f 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shuttles/launcher.rsi/meta.json
@@ -7,32 +7,32 @@
         "y": 64
     },
     "states": [
-    {
-        "name": "exp-320g"
-    },
-    {
-        "name": "exp-2100g"
-    },
-    {
-        "name": "mag-1"
-    },
-    {
-        "name": "mag-2"
-    },
-    {
-        "name": "mag-3"
-    },
-    {
-        "name": "mag-4"
-    },
-    {
-        "name": "mag-5"
-    },
-    {
-        "name": "mag-6"
-    },
-    {
-        "name": "mag-7"
-    }
+        {
+            "name": "exp-320g"
+        },
+        {
+            "name": "exp-2100g"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "mag-5"
+        },
+        {
+            "name": "mag-6"
+        },
+        {
+            "name": "mag-7"
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/meta.json
index 7219f4626a..1d34b539c7 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi/meta.json
@@ -7,8 +7,8 @@
         "y": 64
     },
     "states": [
-    {
-        "name": "base"
-    }
+        {
+            "name": "base"
+        }
     ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
index 4686afa13f..f6264e0dc6 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json
@@ -1,22 +1,22 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pato Grone for ss14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Pato Grone for ss14",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
index dfb10fde50..1eee39aa20 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json
@@ -1,30 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by Pato Grone for SS14, Wielded states by Jonathan Argo",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "inhand-right",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Pato Grone for SS14, Wielded states by Jonathan Argo",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-        "name": "wielded-inhand-right",
-        "directions": 4
-    },
-    {
-      "name": "base"
-    }
-  ]
+    "states": [
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "wielded-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
index e41d098cbe..64ca662326 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/sentry_turret.rsi/meta.json
@@ -1,94 +1,94 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/04b0e91bac8989d27a504124a0f636b41098d016/icons/obj/turrets.dmi. Modified by chromiumboy.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base",
-      "directions": 8
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/blob/04b0e91bac8989d27a504124a0f636b41098d016/icons/obj/turrets.dmi. Modified by chromiumboy.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "base_shadow",
-      "directions": 8
-    },
-    {
-      "name": "stun",
-      "directions": 8
-    },
-    {
-      "name": "lethal",
-      "directions": 8
-    },
-    {
-      "name": "destroyed",
-      "directions": 8
-    },
-    {
-      "name": "support"
-    },
-    {
-      "name": "cover_closed"
-    },
-    {
-      "name": "cover_open"
-    },
-    {
-      "name": "cover_opening",
-      "delays": [
-        [
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07
-        ]
-      ]
-    },
-    {
-      "name": "cover_closing",
-      "delays": [
-        [
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07,
-          0.07
-        ]
-      ]
-    },
-    {
-      "name": "cover_light_on"
-    },
-    {
-      "name": "panel"
-    }
-  ]
+    "states": [
+        {
+            "name": "base",
+            "directions": 8
+        },
+        {
+            "name": "base_shadow",
+            "directions": 8
+        },
+        {
+            "name": "stun",
+            "directions": 8
+        },
+        {
+            "name": "lethal",
+            "directions": 8
+        },
+        {
+            "name": "destroyed",
+            "directions": 8
+        },
+        {
+            "name": "support"
+        },
+        {
+            "name": "cover_closed"
+        },
+        {
+            "name": "cover_open"
+        },
+        {
+            "name": "cover_opening",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_closing",
+            "delays": [
+                [
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07,
+                    0.07
+                ]
+            ]
+        },
+        {
+            "name": "cover_light_on"
+        },
+        {
+            "name": "panel"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
index f43c2ccd56..cb8439ca5d 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json
@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/42e0275d860551197687c571c689c270ff423288",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "syndie_off",
-      "directions": 8
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/42e0275d860551197687c571c689c270ff423288",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "syndie_lethal",
-      "directions": 8
-    },
-    {
-      "name": "syndie_broken"
-    },
-    {
-      "name": "syndie_stun",
-      "directions": 8
-    }
-  ]
+    "states": [
+        {
+            "name": "syndie_off",
+            "directions": 8
+        },
+        {
+            "name": "syndie_lethal",
+            "directions": 8
+        },
+        {
+            "name": "syndie_broken"
+        },
+        {
+            "name": "syndie_stun",
+            "directions": 8
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
index d897db0280..a4b9977868 100644
--- a/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Turrets/xenoturret.rsi/meta.json
@@ -1,65 +1,65 @@
 {
-  "version": 1,
-  "license": "CC-BY-NC-4.0",
-  "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/Xeno/acidturret.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "acid_turret",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-NC-4.0",
+    "copyright": "https://github.com/tgstation/TerraGov-Marine-Corps/blob/f90afeb849db243c8613dbc4defd040aff689b72/icons/Xeno/acidturret.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "acid_turret",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json
index a3800109c5..cdece14dbb 100644
--- a/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Throwable/throwing_star.rsi/meta.json
@@ -1,33 +1,33 @@
 {
-  "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created for SS14 by deltanedas (github), festive by Alekshhh (Github), Inhands by TiniestShark (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created for SS14 by deltanedas (github), festive by Alekshhh (Github), Inhands by TiniestShark (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "festive"
-    },
-    {
-      "name": "inhand-left-festive",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right-festive",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "festive"
+        },
+        {
+            "name": "inhand-left-festive",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right-festive",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json b/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json
index c7b536cf6e..f29ce53ea1 100644
--- a/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/pflash.rsi/meta.json
@@ -1,30 +1,30 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f349b842c84f500399bd5673e5e34a6bc45b001a",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "off"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f349b842c84f500399bd5673e5e34a6bc45b001a",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "on"
-    },
-    {
-      "name": "on-unlit"
-    },
-    {
-      "name": "flashing",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "off"
+        },
+        {
+            "name": "on"
+        },
+        {
+            "name": "on-unlit"
+        },
+        {
+            "name": "flashing",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }

From 8efb13db225ed3ef264b2da18453ac1d33da6207 Mon Sep 17 00:00:00 2001
From: Xale <73114897+XaleMCY@users.noreply.github.com>
Date: Thu, 1 Oct 2026 18:20:10 +0000
Subject: [PATCH 07/69] TimedSpawner can spawn objects in containers (#46212)

* TimedSpawner can spawn objects in containers

* Hatch ducks and chickens into containers

* Update Content.Server/Spawners/EntitySystems/SpawnerSystem.cs

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
---
 Content.Server/Spawners/Components/TimedSpawnerComponent.cs | 6 ++++++
 Content.Server/Spawners/EntitySystems/SpawnerSystem.cs      | 5 ++++-
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml         | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index a96060f74b..9b7d14bedd 100644
--- a/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -51,6 +51,12 @@ public sealed partial class TimedSpawnerComponent : Component, ISerializationHoo
     [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
     public TimeSpan NextFire = TimeSpan.Zero;
 
+    /// <summary>
+    /// Determines whether to allow spawning entities in the spawner's container, or if they should always be outside.
+    /// </summary>
+    [DataField]
+    public bool AllowContainerPlacement = false;
+
     void ISerializationHooks.AfterDeserialization()
     {
         if (MinimumEntitiesSpawned > MaximumEntitiesSpawned)
diff --git a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
index bcbfdb626e..710672f17c 100644
--- a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs
@@ -49,7 +49,10 @@ public sealed partial class SpawnerSystem : EntitySystem
         for (var i = 0; i < number; i++)
         {
             var entity = _random.Pick(component.Prototypes);
-            SpawnAtPosition(entity, coordinates);
+            if (component.AllowContainerPlacement)
+                SpawnNextToOrDrop(entity, uid);
+            else
+                SpawnAtPosition(entity, coordinates);
         }
     }
 }
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index b5c777fcb6..db09880ffa 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -357,6 +357,7 @@
     - MobChicken1
     - MobChicken2
     intervalSeconds: 20
+    allowContainerPlacement: true
   - type: TimedDespawn #delete the egg after the chicken spawns
     lifetime: 21
 
@@ -813,6 +814,7 @@
       - MobDuckWhite
       - MobDuckBrown
       intervalSeconds: 20
+      allowContainerPlacement: true
     - type: TimedDespawn #delete the egg after the chicken spawns
       lifetime: 21
 

From 161a1024038ebaa70eb8f1d218bad4b010cb5ce5 Mon Sep 17 00:00:00 2001
From: Mehnix <56132549+Mehnix@users.noreply.github.com>
Date: Thu, 1 Oct 2026 18:47:20 +0000
Subject: [PATCH 08/69] Purchasable Slime Cubes (#46247)

* Cube

* typo

* Attribute better

* Neutral slimes

They'll fight back if attacked. Same as monkeys.

* update from comments

Consolidated slimes
Reordered cube entries
corporate unification, Drymate stock +2.5%

* appropriate formatting

* Update slimes.yml

Slime Housecleaning
---
 .../Catalog/Cargo/cargo_livestock.yml         |  13 ++
 .../Prototypes/Entities/Mobs/NPCs/slimes.yml  | 160 ++++++++----------
 .../Entities/Objects/Misc/monkeycube.yml      |  31 +++-
 .../Objects/Specific/rehydrateable.yml        |  12 ++
 .../Recipes/Lathes/Packs/animal_cubes.yml     |   1 +
 .../Recipes/Lathes/rehydrateable.yml          |   5 +
 .../Objects/Misc/monkeycube.rsi/box_slime.png | Bin 0 -> 410 bytes
 .../Objects/Misc/monkeycube.rsi/meta.json     |   8 +-
 .../Misc/monkeycube.rsi/wrapper_slime.png     | Bin 0 -> 244 bytes
 9 files changed, 138 insertions(+), 92 deletions(-)
 create mode 100644 Resources/Textures/Objects/Misc/monkeycube.rsi/box_slime.png
 create mode 100644 Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_slime.png

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 008a6baa71..edcc1587e3 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -144,6 +144,19 @@
   category: cargoproduct-category-name-livestock
   group: market
 
+- type: cargoProduct
+  id: LivestockSlimeCube
+  icon:
+    sprite: Objects/Misc/monkeycube.rsi
+    state: box_slime
+  product: SlimeCubeBox
+  container:
+    entity: WrappedParcel
+    containerId: contents
+  cost: 2000
+  category: cargoproduct-category-name-livestock
+  group: market
+
 - type: cargoProduct
   id: LivestockMouse
   icon:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
index d396969dc5..62e93484ec 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: basic slime
-  id: BaseMobAdultSlimes
-  parent: [ BaseMobSlimes, SimpleMobBase, MobCombat, BaseSlicingRefinableButchering, MobNightVision, BaseMobDestructible ]
   abstract: true
+  parent: [ BaseMobSlimes, SimpleMobBase, MobCombat, BaseSlicingRefinableButchering, MobNightVision, BaseMobDestructible ]
+  id: BaseMobAdultSlimes
+  name: basic slime
   description: It looks so much like jelly. I wonder what it tastes like?
   components:
   - type: Sprite
@@ -104,43 +104,58 @@
   - type: Speech
     speechVerb: Slime
     speechSounds: Slime
+    allowedEmotes: ['Squish']
   - type: TypingIndicator
     proto: slime
 
 - type: entity
-  name: basic slime
-  id: MobAdultSlimes
-  parent: BaseMobAdultSlimes
   abstract: true
+  parent: BaseMobAdultSlimes
+  id: MobAdultSlimes
+  name: basic slime
   description: It looks so much like jelly. I wonder what it tastes like?
   components:
   - type: ReplacementAccent
     accent: slimes
   - type: GhostTakeoverAvailable
   - type: GhostRole
+    prob: 0.05
     makeSentient: true
     name: ghost-role-information-slimes-name
     description: ghost-role-information-slimes-description
     rules: ghost-role-information-nonantagonist-rules
     raffle:
       settings: short
-  - type: Speech
-    speechVerb: Slime
-    speechSounds: Slime
-    allowedEmotes: ['Squish']
-  - type: TypingIndicator
-    proto: slime
   - type: NpcFactionMember
     factions:
     - SimpleNeutral
   - type: HTN
     rootTask:
       task: SimpleHostileCompound
+  - type: NPCRetaliation
+    attackMemoryLength: 10
+
+- type: entity
+  abstract: true
+  id: BaseAdultSlimesAngry
+  name: base angry slime
+  components:
+  - type: NpcFactionMember
+    factions:
+      - SimpleHostile
+  - type: GhostRole
+    prob: 1
+    description: ghost-role-information-angry-slimes-description
+    rules: ghost-role-information-angry-slimes-rules
+    mindRoles:
+    - MindRoleGhostRoleTeamAntagonist
+    raffle:
+      settings: short
 
 - type: entity
-  name: blue slime
-  id: MobAdultSlimesBlue
   parent: MobAdultSlimes
+  id: MobAdultSlimesBlue
+  name: blue slime
   components:
   - type: DamageStateVisuals
     states:
@@ -150,95 +165,62 @@
         Base: blue_adult_slime_dead
 
 - type: entity
-  name: blue slime
-  parent: MobAdultSlimesBlue
+  parent: [ BaseAdultSlimesAngry, MobAdultSlimesBlue ]
   id: MobAdultSlimesBlueAngry
+  name: blue slime
   suffix: Angry
-  components:
-    - type: NpcFactionMember
-      factions:
-        - SimpleHostile
-    - type: GhostRole
-      description: ghost-role-information-angry-slimes-description
-      rules: ghost-role-information-angry-slimes-rules
-      mindRoles:
-      - MindRoleGhostRoleTeamAntagonist
-      raffle:
-        settings: short
 
 - type: entity
-  name: green slime
   parent: MobAdultSlimes
   id: MobAdultSlimesGreen
-  components:
-    - type: Sprite
-      layers:
-      - map: [ "enum.DamageStateVisualLayers.Base" ]
-        state: green_adult_slime
-    - type: DamageStateVisuals
-      states:
-        Alive:
-          Base: green_adult_slime
-        Dead:
-          Base: green_adult_slime_dead
-    - type: MeleeWeapon
-      damage:
-        types:
-          Blunt: 6
-          Caustic: 1
-          Poison: 4
-
-- type: entity
   name: green slime
-  parent: MobAdultSlimesGreen
-  id: MobAdultSlimesGreenAngry
-  suffix: Angry
   components:
-    - type: NpcFactionMember
-      factions:
-        - SimpleHostile
-    - type: GhostRole
-      description: ghost-role-information-angry-slimes-description
-      rules: ghost-role-information-angry-slimes-rules
-      mindRoles:
-      - MindRoleGhostRoleTeamAntagonist
-      raffle:
-        settings: short
+  - type: Sprite
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: green_adult_slime
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: green_adult_slime
+      Dead:
+        Base: green_adult_slime_dead
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 6
+        Caustic: 1
+        Poison: 4
+
+- type: entity
+  parent: [ BaseAdultSlimesAngry, MobAdultSlimesGreen ]
+  id: MobAdultSlimesGreenAngry
+  name: green slime
+  suffix: Angry
 
 - type: entity
-  name: yellow slime
   parent: MobAdultSlimes
   id: MobAdultSlimesYellow
+  name: yellow slime
   components:
-    - type: Sprite
-      layers:
-      - map: [ "enum.DamageStateVisualLayers.Base" ]
-        state: yellow_adult_slime
-    - type: DamageStateVisuals
-      states:
-        Alive:
-          Base: yellow_adult_slime
-        Dead:
-          Base: yellow_adult_slime_dead
-    - type: MeleeWeapon
-      damage:
-        types:
-          Blunt: 6
-          Caustic: 4
+  - type: Sprite
+    layers:
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
+      state: yellow_adult_slime
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: yellow_adult_slime
+      Dead:
+        Base: yellow_adult_slime_dead
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 6
+        Caustic: 4
 
 - type: entity
-  name: yellow slime
-  parent: MobAdultSlimesYellow
+  parent: [ BaseAdultSlimesAngry, MobAdultSlimesYellow ]
   id: MobAdultSlimesYellowAngry
+  name: yellow slime
   suffix: Angry
-  components:
-    - type: NpcFactionMember
-      factions:
-        - SimpleHostile
-    - type: GhostRole
-      description: ghost-role-information-angry-slimes-description
-      rules: ghost-role-information-angry-slimes-rules
-      mindRoles:
-      - MindRoleGhostRoleTeamAntagonist
-      raffle:
-        settings: short
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index 03f9e320ab..2d64569869 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -2,7 +2,7 @@
   parent: BoxCardboard
   name: monkey cube box
   id: MonkeyCubeBox
-  description: Drymate brand monkey cubes. Just add water!
+  description: Drymate® brand monkey cubes. Just add water!
   components:
   - type: EntityTableContainerFill
     containers:
@@ -92,7 +92,7 @@
   name: monkey cube box
   suffix: Syndicate
   id: SyndicateSpongeBox
-  description: Drymate brand monkey cubes. Just add water!
+  description: Drymate® brand monkey cubes. Just add water!
   components:
   - type: EntityTableContainerFill
     containers:
@@ -112,3 +112,30 @@
   - type: SpawnItemsOnUse
     items:
       - id: SyndicateSponge
+
+- type: entity
+  parent: BaseWrappedCube
+  id: SlimeCubeWrapped
+  name: slime cube
+  description: Unwrap this to get a slime cube.
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: SlimeCube
+  - type: Sprite
+    state: wrapper_slime
+
+- type: entity
+  parent: MonkeyCubeBox
+  id: SlimeCubeBox
+  name: slime cube box
+  description: Condensed slimes in a cube. Just add water! Drymate® is not responsible for undue hostility from inappropriate fluid application.
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase:
+        id: SlimeCubeWrapped
+        amount: 8
+  - type: Sprite
+    sprite: Objects/Misc/monkeycube.rsi
+    state: box_slime
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index 866dd85542..6a995a858f 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -159,6 +159,18 @@
     possibleSpawns:
     - MobCockroach
 
+- type: entity
+  parent: RehydratableAnimalCube
+  id: SlimeCube
+  name: slime cube
+  description: Just add water, carefully, they're sensitive to it.
+  components:
+  - type: Rehydratable
+    possibleSpawns:
+    - MobAdultSlimesYellow
+    - MobAdultSlimesBlue
+    - MobAdultSlimesGreen
+
 - type: entity
   parent: RehydratableAnimalCube
   id: SpaceCarpCube
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml
index 1a1cd50ae7..0c4fbf2ea1 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/animal_cubes.yml
@@ -10,6 +10,7 @@
   - MothroachCube
   - MouseCube
   - CockroachCube
+  - SlimeCube
 
 - type: latheRecipePack
   id: HostileCubesStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
index fd0303352c..bfd0e0791e 100644
--- a/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
+++ b/Resources/Prototypes/Recipes/Lathes/rehydrateable.yml
@@ -57,6 +57,11 @@
   materials:
     Biomass: 16
 
+- type: latheRecipe
+  parent: BaseCubeRecipe
+  id: SlimeCube
+  result: SlimeCube
+
 - type: latheRecipe
   parent: BaseCubeRecipe
   id: SpaceCarpCube
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/box_slime.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/box_slime.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a40b129801d263046a1a3c2b05cb5419410c9f1
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$R7pfZR9J=Wl|N6yKp2M~jGsWGkxnKKCIsT(!rq80I^!UI2?s|9KZOi3BeSME
zi-Rd4aUki`Hjwfa>R?)X*!KS5Lek%Mx%cjQ`u47cDpjg%bNYi$+#ht}P4=jnf&mU%
zhX5?y1pv>tZ`%85Ey#i|tSjvLbvk$dabqN+RJi`c08i&HIKhZ_|1}+(h)4^%53TsL
zdnSbfX;+f**Z7n1qg%>Q64*Pb13w**LE-mI%$zBcp<l|_l?jAiL?W<s7u>m*f(U>U
zj07;iY97e81{6CGdJzB(yD7}A-+~03)B~G$APb&3Q(;^LK04k95JWZ-C=<y8>qJYS
zNW=u3WJjlXH4lWt)v%iaJoF-^wi^j#!FeY<3)YcPx`rlET_^3pWa!uOTAS@c5lnUk
zLGx$S?pZPL=e?VNjRf*UbUr%&o_5cQ6PYSis%&k(0iDgkGAfSSvH$=807*qoM6N<$
Eg3-RNrvLx|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
index 8520a51e1b..4556f352d2 100644
--- a/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/monkeycube.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. box_kobold, box_variant and wrapper_kobold are edited versions of the raw sprites by Ubaser.",
+  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. box_kobold, box_variant, wrapper_kobold, and wrapper_slime are edited versions of the raw sprites by Ubaser. box_slime made by ketufaispikinut.",
   "size": {
     "x": 32,
     "y": 32
@@ -16,6 +16,9 @@
     {
       "name": "box_variant"
     },
+    {
+      "name": "box_slime"
+    },
     {
       "name": "cube"
     },
@@ -24,6 +27,9 @@
     },
     {
       "name": "wrapper_kobold"
+    },
+    {
+      "name": "wrapper_slime"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_slime.png b/Resources/Textures/Objects/Misc/monkeycube.rsi/wrapper_slime.png
new file mode 100644
index 0000000000000000000000000000000000000000..5329bfbeb6fd4e0a5cbd4b5b95f664559137f44f
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2z=
zUN+=9Y{0{MLI1L63*TPXl1KA&)S|Dik@RU(DCOW?QnJz6K<`r0mWcj-m&?UYXSqU`
zTOVNLD{%PCkZ72=(YXGO7dtb9VXp1AIuGWj|EA7u*dSrpI3wX?!pRRWy)T{cJ0N!Z
z{)ZcXUT3@RV1Kd3q1^C6gXgwpuhnn0S1@%*y$pY2rF|^#%)X{YvK>;K48N9czjSap
r1G~qwYxUvP)(;riEe<f&vsW-Dve-x~HgBE{bUA~ktDnm{r-UW|3x{5;

literal 0
HcmV?d00001


From 5fa5ac38536405f2b94dcf3a3d10d83216629978 Mon Sep 17 00:00:00 2001
From: SnappingOpossum <snappingopossum@outlook.com>
Date: Thu, 1 Oct 2026 18:53:39 +0000
Subject: [PATCH 09/69] Fix immovable rod spawning and convert them to use
 EntityTables (#46264)

* Move immovable rods to entity tables + fix them spawning

* Review

* Missed some whitespace.
---
 .../Components/ImmovableRodRuleComponent.cs   | 10 ++---
 .../StationEvents/Events/ImmovableRodRule.cs  | 34 +++++++--------
 .../Prototypes/GameRules/meteorswarms.yml     | 43 +++++++------------
 3 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/Content.Server/StationEvents/Components/ImmovableRodRuleComponent.cs b/Content.Server/StationEvents/Components/ImmovableRodRuleComponent.cs
index b115ac5b59..dba3c407f6 100644
--- a/Content.Server/StationEvents/Components/ImmovableRodRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/ImmovableRodRuleComponent.cs
@@ -1,14 +1,14 @@
 using Content.Server.StationEvents.Events;
-using Content.Shared.Storage;
-using Robust.Shared.Prototypes;
+using Content.Shared.EntityTable.EntitySelectors;
 
 namespace Content.Server.StationEvents.Components;
 
 [RegisterComponent, Access(typeof(ImmovableRodRule))]
 public sealed partial class ImmovableRodRuleComponent : Component
 {
-    ///     List of possible rods and spawn probabilities.
+    /// <summary>
+    /// List of possible rods and spawn probabilities.
     /// </summary>
-    [DataField]
-    public List<EntitySpawnEntry> RodPrototypes = new();
+    [DataField(required: true)]
+    public EntityTableSelector RodPrototypes = default!;
 }
diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
index ca2e06520c..6dd3d3bd9c 100644
--- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs
+++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs
@@ -1,11 +1,9 @@
-using System.Linq;
 using System.Numerics;
 using Content.Server.ImmovableRod;
 using Content.Server.StationEvents.Components;
 using Content.Server.Weapons.Ranged.Systems;
+using Content.Shared.EntityTable;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Storage;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Spawners;
 
 namespace Content.Server.StationEvents.Events;
@@ -18,33 +16,33 @@ public sealed partial class ImmovableRodRule : StationEventSystem<ImmovableRodRu
 {
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private GunSystem _gun = default!;
-    [Dependency] private IPrototypeManager _prototypeManager = default!;
+    [Dependency] private EntityTableSystem _entityTable = default!;
 
-    protected override void Started(Entity<ImmovableRodRuleComponent, GameRuleComponent> ent, ref GameRuleStartedEvent args)
+    protected override void Started(Entity<ImmovableRodRuleComponent, GameRuleComponent> rule, ref GameRuleStartedEvent args)
     {
-        base.Started(ent, ref args);
+        base.Started(rule, ref args);
 
-        var protoName = EntitySpawnCollection.GetSpawns(ent.Comp1.RodPrototypes).First();
-
-        var proto = _prototypeManager.Index<EntityPrototype>(protoName);
-
-        if (proto.TryComp<ImmovableRodComponent>(out var rod, EntityManager.ComponentFactory) &&
-            proto.TryComp<TimedDespawnComponent>(out var despawn, EntityManager.ComponentFactory))
+        foreach (var protoName in _entityTable.GetSpawns(rule.Comp1.RodPrototypes))
         {
+            var proto = ProtoMan.Index(protoName);
+
+            if (!proto.TryComp<ImmovableRodComponent>(out var rodComp, Factory) ||
+                !proto.TryComp<TimedDespawnComponent>(out var despawn, Factory))
+            {
+                Sawmill.Error($"Invalid immovable rod prototype: {protoName}");
+                continue;
+            }
+
             if (!Station.TryFindRandomTile(out _, out _, out _, out var targetCoords))
                 return;
 
-            var speed = RobustRandom.NextFloat(rod.MinSpeed, rod.MaxSpeed);
+            var speed = RobustRandom.NextFloat(rodComp.MinSpeed, rodComp.MaxSpeed);
             var angle = RobustRandom.NextAngle();
             var direction = angle.ToVec();
             var mapCoords = _transform.ToMapCoordinates(targetCoords);
             var spawnCoords = mapCoords.Offset(-direction * speed * despawn.Lifetime / 2);
             var rodUid = Spawn(protoName, spawnCoords);
-            _gun.ShootProjectile(ent, direction, Vector2.Zero, rodUid, speed: speed);
-        }
-        else
-        {
-            Sawmill.Error($"Invalid immovable rod prototype: {protoName}");
+            _gun.ShootProjectile(rodUid, direction, Vector2.Zero, rule, speed: speed);
         }
     }
 }
diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml
index 9904034abc..34e378b4ae 100644
--- a/Resources/Prototypes/GameRules/meteorswarms.yml
+++ b/Resources/Prototypes/GameRules/meteorswarms.yml
@@ -212,34 +212,21 @@
     earliestStart: 30
     minimumPlayers: 25
   - type: ImmovableRodRule
-    rodPrototypes:
-    - id: ImmovableRodKeepTilesStill
-      prob: 0.94
-      orGroup: rodProto
-    - id: ImmovableRodMop
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodShark
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodClown
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodBanana
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodHammer
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodThrongler
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodGibstick
-      prob: 0.0075
-      orGroup: rodProto
-    - id: ImmovableRodWeh
-      prob: 0.0075
-      orGroup: rodProto
+    rodPrototypes: !type:GroupSelector
+      children:
+      - id: ImmovableRodKeepTilesStill
+        weight: 94
+      - !type:GroupSelector
+        weight: 6
+        children:
+        - id: ImmovableRodMop
+        - id: ImmovableRodShark
+        - id: ImmovableRodClown
+        - id: ImmovableRodBanana
+        - id: ImmovableRodHammer
+        - id: ImmovableRodThrongler
+        - id: ImmovableRodGibstick
+        - id: ImmovableRodWeh
 
 - type: entity
   parent: MeteorSwarm

From 50e2cca98f8beba1a959a2e3d8a2643a0bf4157f Mon Sep 17 00:00:00 2001
From: ThatGuyUSA <thatguyusa123@gmail.com>
Date: Thu, 1 Oct 2026 19:20:33 +0000
Subject: [PATCH 10/69] Clown spiders reparenting fix (#46242)

* ummm uhh boilerplate

* now they walk!

* oops

* line

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Entities/Mobs/NPCs/Spiders/base.yml       |  21 +++++---------
 .../Entities/Mobs/NPCs/Spiders/clown.yml      |   6 ++--
 .../Entities/Mobs/NPCs/Spiders/guard.yml      |   2 +-
 .../Entities/Mobs/NPCs/Spiders/hunter.yml     |   2 +-
 .../Entities/Mobs/NPCs/Spiders/midwife.yml    |   2 +-
 .../Entities/Mobs/NPCs/Spiders/nurse.yml      |   2 +-
 .../Entities/Mobs/NPCs/Spiders/tarantula.yml  |   2 +-
 .../Entities/Mobs/NPCs/Spiders/wizard.yml     |   2 +-
 .../Prototypes/Entities/Mobs/NPCs/pets.yml    |   2 +-
 .../Animals/Spiders/clownspider.rsi/meta.json |  26 ++++++++++++++++++
 .../Spiders/clownspider.rsi/moving.png        | Bin 0 -> 6765 bytes
 11 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/moving.png

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/base.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/base.yml
index b0fca66a4c..57047b38b9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/base.yml
@@ -67,6 +67,13 @@
     emoteSounds: UnisexArachnid
   - type: TypingIndicator
     proto: spider
+  - type: SpriteMovement
+    movementLayers:
+      movement:
+        state: moving
+    noMovementLayers:
+      movement:
+        state: idle
   - type: Tag
     tags:
     - DoorBumpOpener
@@ -91,19 +98,6 @@
         Cold: -0.03
         Shock: -0.03
 
-- type: entity
-  abstract: true
-  parent: MobSpiderBase
-  id: MobSpiderAnimated
-  components:
-  - type: SpriteMovement
-    movementLayers:
-      movement:
-        state: moving
-    noMovementLayers:
-      movement:
-        state: idle
-
 - type: entity
   parent: [SolutionWeapon, SolutionTiny]
   id: SolutionVenomSpider
@@ -118,7 +112,6 @@
 # Angry MobSpiderAngryBase; should not be used
 - type: entity
   abstract: true
-  parent: MobSpiderBase
   id: MobSpiderAngryBase
   components:
   - type: NpcFactionMember
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/clown.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/clown.yml
index a5892f54c6..2263059f5f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/clown.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/clown.yml
@@ -9,7 +9,7 @@
     drawdepth: Mobs
     sprite: Mobs/Animals/Spiders/clownspider.rsi
     layers:
-    - map: ["enum.DamageStateVisualLayers.Base"]
+    - map: ["enum.DamageStateVisualLayers.Base", "movement"]
       state: idle
   - type: ToolRefinable
     refineResult:
@@ -66,8 +66,6 @@
 
 # Angry Clown Spider
 - type: entity
-  parent:
-  - MobSpiderAngryBase
-  - MobGiantSpiderClown
+  parent: [ MobSpiderAngryBase, MobGiantSpiderClown ]
   id: MobGiantSpiderClownAngry
   suffix: Angry
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/guard.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/guard.yml
index 891dd79697..e128fb34a2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/guard.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/guard.yml
@@ -1,6 +1,6 @@
 # Guard Spider
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderGuard
   name: guard spider
   description: A stockier spider that stands its ground and blocks escape routes with webs.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/hunter.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/hunter.yml
index 445489329d..d48b03aff2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/hunter.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/hunter.yml
@@ -1,6 +1,6 @@
 # Hunter Spider
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderHunter
   name: hunter spider
   description: An aggressive, fast-moving variety of giant spider.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/midwife.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/midwife.yml
index d1093e8c85..85107a79d8 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/midwife.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/midwife.yml
@@ -1,6 +1,6 @@
 # Midwife Spider
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderMidwife
   name: midwife spider
   description: Skittering and watchful; it seems to tend to egg sacs and cocoons.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/nurse.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/nurse.yml
index 42383a8bff..fd7ca19c0f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/nurse.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/nurse.yml
@@ -1,6 +1,6 @@
 # Nurse Spider
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderNurse
   name: nurse spider
   description: A pallid, unsettling spider that oozes something caustic.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/tarantula.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/tarantula.yml
index 283ee0fc6a..edd32d84b9 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/tarantula.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/tarantula.yml
@@ -1,6 +1,6 @@
 # Tarantula Spider
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderTarantula
   name: tarantula
   description: Widely considered to be the worse thing in existence.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/wizard.yml b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/wizard.yml
index d5c6a97e62..091e930849 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/wizard.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/Spiders/wizard.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: MobSpiderAnimated
+  parent: MobSpiderBase
   id: MobGiantSpiderWizard
   name: wizard spider
   suffix: Wizard
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
index 5b0e999487..3c153dde3f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -717,7 +717,7 @@
     predicted: true
 
 - type: entity
-  parent: [ BaseUniquePet, MobSpiderAnimated ]
+  parent: [ BaseUniquePet, MobSpiderBase ]
   id: MobSpiderShiva
   name: Shiva
   description: The first defender of the station.
diff --git a/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/meta.json b/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/meta.json
index 158fac9f7c..0d81974251 100644
--- a/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/meta.json
@@ -13,6 +13,32 @@
         {
             "name": "idle",
             "directions": 4
+        },
+        {
+            "name": "moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/moving.png b/Resources/Textures/Mobs/Animals/Spiders/clownspider.rsi/moving.png
new file mode 100644
index 0000000000000000000000000000000000000000..254788518a6f782d959a735f69839624f71f60e9
GIT binary patch
literal 6765
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
bjG$V5S|&Unl~n`&e+1mueyCNY;Slvd5sMIm

literal 0
HcmV?d00001


From 2f7692cc7381f42f390d6c3e1ae6c1097d678a1d Mon Sep 17 00:00:00 2001
From: ThatGuyUSA <thatguyusa123@gmail.com>
Date: Thu, 1 Oct 2026 20:01:15 +0000
Subject: [PATCH 11/69] Service Cyborg module touch up (#46081)

* service borg rework, needs some touch ups still

* condensed all tools into 1 hand, added swabs, rearranged somethings too

* IGNORE THAT SORRYgit add -A !

* ok the RSI is fixed

* ok this time it should be all greem

* removed redundant DNASubstanceTrace

* removed utensil whitelist in exchange for dinnerware tags, added dehydrated support too

* Push

* condensed all tools into 1 hand, added swabs, rearranged somethings too

* IGNORE THAT SORRYgit add -A !

* fixed merge conflicts

* ermm..

* ok this time it should be all greem

* removed utensil whitelist in exchange for dinnerware tags, added dehydrated support too

* Push

* missed a few things when updating

* tags

* more tags, more icons

* new icons

* removed stuff that wasn't part of the PR

* tag pruning and module generic-i-sized

* 1 space

* linter fix

* removed inline stuff

* ok this time, surely

* ok SURELY

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---
 .../Locale/en-US/robotics/borg_modules.ftl    |   5 +
 .../Consumable/Drinks/drinks-cartons.yml      |  33 ++-
 .../Consumable/Drinks/drinks_special.yml      |   4 +
 .../Objects/Consumable/Food/Baked/bagel.yml   |  10 +-
 .../Objects/Consumable/Food/Baked/bread.yml   |  46 ++--
 .../Objects/Consumable/Food/Baked/cake.yml    |  32 ++-
 .../Consumable/Food/Baked/donkpocket.yml      |   2 +
 .../Objects/Consumable/Food/Baked/misc.yml    |  77 +++++-
 .../Consumable/Food/Containers/bowl.yml       |   1 +
 .../Consumable/Food/Containers/condiments.yml |  22 +-
 .../Consumable/Food/Containers/plate.yml      |   5 +
 .../Objects/Consumable/Food/breakfast.yml     |   3 +
 .../Objects/Consumable/Food/burger.yml        |  34 ++-
 .../Entities/Objects/Consumable/Food/egg.yml  |   9 +-
 .../Objects/Consumable/Food/frozen.yml        |  11 +-
 .../Objects/Consumable/Food/ingredients.yml   |  32 ++-
 .../Objects/Consumable/Food/meals.yml         |  16 ++
 .../Entities/Objects/Consumable/Food/meat.yml |  42 ++--
 .../Objects/Consumable/Food/noodles.yml       |  16 +-
 .../Objects/Consumable/Food/skewer.yml        |   3 +-
 .../Objects/Consumable/Food/snacks.yml        |   3 +
 .../Entities/Objects/Consumable/Food/soup.yml |   6 +
 .../Entities/Objects/Consumable/Food/taco.yml |   6 +-
 .../Entities/Objects/Materials/materials.yml  |   1 +
 .../Entities/Objects/Misc/monkeycube.yml      |   4 +
 .../Entities/Objects/Misc/utensils.yml        |   8 +-
 .../Objects/Specific/Hydroponics/tools.yml    |  11 +
 .../Objects/Specific/Medical/disease.yml      |   4 +
 .../Specific/Robotics/borg_modules.yml        | 228 +++++++++++++-----
 .../Entities/Objects/Tools/bucket.yml         |   2 +-
 .../Recipes/Lathes/Packs/robotics.yml         |   5 +-
 .../Recipes/Lathes/robot_modules.yml          |  13 +-
 Resources/Prototypes/borg_types.yml           |   6 +-
 Resources/Prototypes/tags.yml                 |  25 +-
 ...gardening-module.png => botany-module.png} | Bin
 .../actions_borg.rsi/cooking-module.png       | Bin 0 -> 596 bytes
 .../actions_borg.rsi/harvesting-module.png    | Bin 849 -> 0 bytes
 .../Actions/actions_borg.rsi/meta.json        |   8 +-
 .../actions_borg.rsi/musical-module.png       | Bin 493 -> 467 bytes
 .../Specific/Hydroponics/seeds.rsi/meta.json  |   3 +
 .../seeds.rsi/seed-produce-icon.png           | Bin 0 -> 830 bytes
 .../placeholder.rsi/icon-dinnerware.png       | Bin 0 -> 880 bytes
 .../placeholder.rsi/icon-food-platter.png     | Bin 0 -> 713 bytes
 .../placeholder.rsi/icon-raw-ingredients.png  | Bin 0 -> 990 bytes
 .../Kitchen/placeholder.rsi/meta.json         |  20 ++
 .../{icon-gardening.png => icon-botany.png}   | Bin
 .../Robotics/borgmodule.rsi/icon-cooking.png  | Bin 0 -> 492 bytes
 .../borgmodule.rsi/icon-harvesting.png        | Bin 208 -> 0 bytes
 .../Robotics/borgmodule.rsi/meta.json         |  14 +-
 Resources/migration.yml                       |   4 +
 50 files changed, 615 insertions(+), 159 deletions(-)
 rename Resources/Textures/Interface/Actions/actions_borg.rsi/{gardening-module.png => botany-module.png} (100%)
 create mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/cooking-module.png
 delete mode 100644 Resources/Textures/Interface/Actions/actions_borg.rsi/harvesting-module.png
 create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/seed-produce-icon.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-dinnerware.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-food-platter.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-raw-ingredients.png
 create mode 100644 Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/meta.json
 rename Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/{icon-gardening.png => icon-botany.png} (100%)
 create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-cooking.png
 delete mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png

diff --git a/Resources/Locale/en-US/robotics/borg_modules.ftl b/Resources/Locale/en-US/robotics/borg_modules.ftl
index 0590bf13fd..612fcc3dab 100644
--- a/Resources/Locale/en-US/robotics/borg_modules.ftl
+++ b/Resources/Locale/en-US/robotics/borg_modules.ftl
@@ -16,4 +16,9 @@ borg-slot-modules-empty = Modules
 borg-slot-powercell-empty = Powercells
 borg-slot-inflatable-door-empty = Inflatable Door
 borg-slot-inflatable-wall-empty = Inflatable Wall
+borg-slot-dining-ware-empty = Empty platter
+borg-slot-seed-produce-empty = Produce and seeds
+borg-slot-pen-empty = Pens
+borg-slot-gardening-tools-empty = Gardening tools
+borg-slot-ingredients-empty = Ingredients
 borg-slot-xenoborg-crystal-empty = Xenoborg crystals
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 52e7a98b46..61bd18f808 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -9,6 +9,9 @@
     closeable: true
     closeSound:
       collection: bottleCloseSounds
+  - type: Tag
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -17,7 +20,8 @@
   suffix: Full
   components:
   - type: Tag
-    tags: []
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -26,6 +30,9 @@
   components:
   - type: Item
     size: Normal
+  - type: Tag
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -34,7 +41,8 @@
   suffix: Full
   components:
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -82,7 +90,8 @@
       - ReagentId: JuiceLime
         Quantity: 60
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   parent: DrinkCartonBase
@@ -104,7 +113,8 @@
       - ReagentId: JuiceOrange
         Quantity: 60
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   parent: DrinkCartonBase
@@ -126,7 +136,8 @@
       - ReagentId: JuiceTomato
         Quantity: 60
   - type: Tag
-    tags: []
+    tags:
+    - Ingredient
 
 - type: entity
   parent: DrinkCartonBaseFull
@@ -162,7 +173,8 @@
       - ReagentId: Cream
         Quantity: 60
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseFull]
@@ -214,7 +226,8 @@
       - ReagentId: Milk
         Quantity: 120
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   parent: DrinkCartonNormalBase
@@ -236,7 +249,8 @@
       - ReagentId: MilkSoy
         Quantity: 120
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 - type: entity
   parent: [DrinkBaseMaterialPlastic, DrinkCartonNormalBase]
@@ -259,7 +273,8 @@
       - ReagentId: MilkOat
         Quantity: 120
   - type: Tag
-    tags: [ ]
+    tags:
+    - Ingredient
 
 # Large cartons
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 1c20831194..7833d17206 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -205,6 +205,10 @@
     inHandsMaxFillLevels: 2
   - type: FitsInDispenser
     solution: drink
+  - type: Tag
+    tags:
+    - Dinnerware
+    - Trash
 
 # Weird empty shakes
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
index cacdaa6102..bc98b85a37 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bagel.yml
@@ -20,6 +20,9 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 10
+  - type: Tag
+    tags:
+    - Bread
 
 - type: entity
   parent: FoodBagelBase
@@ -60,9 +63,6 @@
     state: bagel-cottondough
   - type: Edible
     requiresSpecialDigestion: true
-  - type: Tag
-    tags:
-    - ClothMade
   - type: Solution
     solution:
       reagents:
@@ -70,3 +70,7 @@
         Quantity: 5
       - ReagentId: Fiber
         Quantity: 5
+  - type: Tag
+    tags:
+    - Bread
+    - ClothMade
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index bbe082b399..1344689d53 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -35,6 +35,7 @@
   - type: Tag
     tags:
     - Bread
+    - Ingredient
     - Slice
   - type: Solution
     solution:
@@ -95,8 +96,9 @@
       amount: 8
   - type: Tag
     tags:
-    - Fruit
     - Bread
+    - FinishedMeal
+    - Fruit
 # Tastes like bread, banana, nut.
 
 - type: entity
@@ -114,8 +116,9 @@
     - state: banana-slice
   - type: Tag
     tags:
-    - Fruit
     - Bread
+    - FinishedMeal
+    - Fruit
     - Slice
 
 - type: entity
@@ -139,8 +142,9 @@
       amount: 8
   - type: Tag
     tags:
-    - ClothMade
     - Bread
+    - ClothMade
+    - FinishedMeal
   - type: Solution
     solution:
       reagents:
@@ -166,8 +170,9 @@
     - state: cotton-slice
   - type: Tag
     tags:
-    - ClothMade
     - Bread
+    - ClothMade
+    - Ingredient
     - Slice
   - type: Solution
     solution:
@@ -287,8 +292,10 @@
         Quantity: 4
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - FinishedMeal
+    - Ingredient
+    - Meat
 # Tastes like bread, meat.
 
 - type: entity
@@ -315,8 +322,8 @@
         Quantity: 0.5
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - Meat
     - Slice
 
 - type: entity
@@ -420,8 +427,8 @@
         Quantity: 10
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - Meat
 
 - type: entity
   name: sausage bread slice
@@ -445,8 +452,9 @@
         Quantity: 1.25
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - FinishedMeal
+    - Meat
     - Slice
 
 - type: entity
@@ -477,8 +485,8 @@
         Quantity: 4
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - Meat
 # Tastes like bread, cobwebs.
 
 - type: entity
@@ -505,8 +513,9 @@
         Quantity: 0.5
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - FinishedMeal
+    - Meat
     - Slice
 
 - type: entity
@@ -584,8 +593,9 @@
         Quantity: 4
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - FinishedMeal
+    - Meat
 # Tastes like bread, acid.
 
 - type: entity
@@ -612,8 +622,9 @@
         Quantity: 0.5
   - type: Tag
     tags:
-    - Meat
     - Bread
+    - FinishedMeal
+    - Meat
     - Slice
 
 # Other than bread/slice:
@@ -679,6 +690,7 @@
     tags:
     - Bread
     - ClothMade
+    - FinishedMeal
   - type: Clothing
     equippedPrefix: baguette-cotton
   - type: Item
@@ -737,8 +749,9 @@
   - type: Tag
     tags:
     - Bread
-    - Slice
     - ClothMade
+    - Ingredient
+    - Slice
   - type: Solution
     solution:
       reagents:
@@ -956,10 +969,11 @@
     baseSprintSpeed : 3
   - type: Tag
     tags:
-    - VimPilot
-    - DoorBumpOpener
     - Bread
+    - DoorBumpOpener
+    - FinishedMeal
     - Meat
+    - VimPilot
   - type: CanEscapeInventory
     baseResistTime: 2
   - type: Puller
@@ -991,6 +1005,7 @@
   - type: Tag
     tags:
     - ReptilianFood
+    - FinishedMeal
   - type: FlavorProfile
     flavors:
     - nutribrick
@@ -1017,6 +1032,7 @@
   - type: Tag
     tags:
     - ClothMade
+    - FinishedMeal
   - type: Item
     size: Small
     storedOffset: -1,0
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index fc968d40d3..aa376d3c1b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -77,6 +77,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -103,6 +104,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -174,6 +176,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Vegetable
   - type: Item
     inhandVisuals:
@@ -212,8 +215,9 @@
   - type: Tag
     tags:
     - Cake
-    - Vegetable
+    - FinishedMeal
     - Slice
+    - Vegetable
   - type: Item
     inhandVisuals:
       left:
@@ -244,6 +248,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -269,6 +274,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Meat
     - Slice
   - type: Item
@@ -346,6 +352,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -371,6 +378,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -403,6 +411,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -428,6 +437,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -460,6 +470,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -485,6 +496,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -531,6 +543,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     heldPrefix: lemoon
@@ -563,6 +576,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -664,6 +678,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -690,6 +705,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -720,6 +736,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -745,6 +762,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Meat
     - Slice
   - type: Item
@@ -785,6 +803,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -817,6 +836,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -846,6 +866,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -866,6 +887,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
@@ -1093,8 +1115,9 @@
   - type: Tag
     tags:
     - VimPilot
-    - DoorBumpOpener
     - Cake
+    - DoorBumpOpener
+    - FinishedMeal
   - type: CanEscapeInventory
     baseResistTime: 2
   - type: Puller
@@ -1173,6 +1196,7 @@
     energy: 2.5
   - type: Tag
     tags:
+    - FinishedMeal
     - Slice
   - type: FoodSequenceElement
     entries:
@@ -1197,6 +1221,7 @@
     tags:
     - Cake
     - ClothMade
+    - FinishedMeal
   - type: Solution
     solution:
       reagents:
@@ -1223,6 +1248,7 @@
     tags:
     - Cake
     - ClothMade
+    - FinishedMeal
     - Slice
   - type: Solution
     solution:
@@ -1273,6 +1299,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
   - type: Item
     inhandVisuals:
@@ -1314,6 +1341,7 @@
   - type: Tag
     tags:
     - Cake
+    - FinishedMeal
     - Fruit
     - Slice
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
index bf8955a4fb..e6e26a20e5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -18,6 +18,7 @@
   - type: Tag
     tags:
     - DonkPocket
+    - FinishedMeal
     - Meat
 
 # Donkpocket
@@ -336,6 +337,7 @@
     tags:
     - ClothMade
     - DonkPocket
+    - FinishedMeal
 
 - type: entity
   name: warm moth-pocket
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index b92faf1224..6fd3aa15bc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -35,6 +35,9 @@
       - sweet
   - type: Item
     size: Tiny
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: berry muffin
@@ -55,6 +58,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
@@ -76,6 +80,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
@@ -88,6 +93,7 @@
     state: muffin-bluecherry
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
@@ -107,6 +113,9 @@
         Quantity: 1
       - ReagentId: CocoaPowder
         Quantity: 1
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: banana muffin
@@ -127,6 +136,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 # Buns
@@ -139,6 +149,9 @@
   components:
   - type: Sprite
     state: bun-honey
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: hotcross bun
@@ -148,6 +161,9 @@
   components:
   - type: Sprite
     state: bun-hotcross
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: meat bun
@@ -157,6 +173,10 @@
   components:
   - type: Sprite
     state: bun-meat
+  - type: Tag
+    tags:
+    - FinishedMeal
+    - Meat
 
 # Cookies
 
@@ -168,6 +188,9 @@
   components:
   - type: Sprite
     state: COOKIE!!!
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: oatmeal cookie
@@ -177,6 +200,9 @@
   components:
   - type: Sprite
     state: cookie-oatmeal
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: raisin cookie
@@ -188,6 +214,7 @@
     state: cookie-raisin
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
@@ -198,6 +225,9 @@
   components:
   - type: Sprite
     state: cookie-sugar
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Nuggets
 
@@ -209,8 +239,9 @@
   components:
   - type: Tag
     tags:
-      - Nugget
-      - Meat
+    - FinishedMeal
+    - Nugget
+    - Meat
   - type: Sprite
     sprite: Objects/Consumable/Food/Baked/nuggets.rsi
     layers:
@@ -281,6 +312,7 @@
   - type: Appearance
   - type: Tag
     tags:
+    - FinishedMeal
     - Pancake
 
 - type: entity
@@ -333,8 +365,9 @@
       visible: false
   - type: Tag
     tags:
-    - Pancake
+    - FinishedMeal
     - Fruit
+    - Pancake
 
 - type: entity
   name: chocolate chip pancake
@@ -402,6 +435,9 @@
     layers:
       - state: tray
       - state: waffles
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: soy waffles
@@ -446,6 +482,10 @@
   components:
   - type: Sprite
     state: pretzel
+  - type: Tag
+    tags:
+    - Bread
+    - FinishedMeal
 
 - type: entity
   name: cannoli
@@ -455,6 +495,9 @@
   components:
   - type: Sprite
     state: cannoli
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: dumplings
@@ -477,6 +520,7 @@
       - bread
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -504,6 +548,9 @@
         Quantity: 0.05
       - ReagentId: Blackpepper
         Quantity: 0.05
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: cotton chèvre chaud
@@ -522,9 +569,6 @@
     state: chevrechaud-cotton
   - type: Edible
     requiresSpecialDigestion: true
-  - type: Tag
-    tags:
-    - ClothMade
   - type: Solution
     solution:
       reagents:
@@ -538,6 +582,10 @@
         Quantity: 0.1
       - ReagentId: Blackpepper
         Quantity: 0.1
+  - type: Tag
+    tags:
+    - ClothMade
+    - FinishedMeal
 
 - type: entity
   parent: [SolutionNormal, FoodBakedBase, BaseSlicingRefinableFood]
@@ -568,6 +616,9 @@
     refineResult:
     - id: FoodBakedBrownie
       amount: 8
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   name: brownie
@@ -594,6 +645,7 @@
         Quantity: 2
   - type: Tag
     tags:
+    - FinishedMeal
     - Slice
 
 - type: entity
@@ -628,6 +680,10 @@
     refineResult:
     - id: FoodBakedCannabisBrownie
       amount: 8
+  - type: Tag
+    tags:
+    - FinishedMeal
+    - Slice
 
 - type: entity
   parent: FoodBakedBase
@@ -656,6 +712,7 @@
         Quantity: 2
   - type: Tag
     tags:
+    - FinishedMeal
     - Slice
 
 - type: entity
@@ -679,6 +736,9 @@
           Quantity: 1
         - ReagentId: Vitamin
           Quantity: 1
+    - type: Tag
+      tags:
+      - FinishedMeal
 
 - type: entity
   parent: [SolutionSmall, FoodBakedBase]
@@ -729,6 +789,7 @@
   - type: Tag
     tags:
     - ClothMade
+    - FinishedMeal
   - type: Solution
     solution:
       reagents:
@@ -763,6 +824,9 @@
         Quantity: 37.5
       - ReagentId: Butter
         Quantity: 2.5
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 - type: entity
   parent: FoodBakedGrilledCheeseSandwich
@@ -783,6 +847,7 @@
   - type: Tag
     tags:
     - ClothMade
+    - FinishedMeal
   - type: Solution
     solution:
       reagents:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
index 8f71eebafa..42166321b9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -64,6 +64,7 @@
         acts: [ "Destruction" ]
   - type: Tag
     tags:
+    - Dinnerware
     - Trash
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
index adb9438e5f..78424bd6fe 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -20,6 +20,9 @@
   - type: SpaceGarbage
   - type: StaticPrice
     price: 0
+  - type: Tag
+    tags:
+    - Ingredient
 
 # Packets
 
@@ -387,6 +390,7 @@
   - type: Tag
     tags:
       - Coldsauce
+      - Ingredient
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -411,7 +415,8 @@
     state: bottle-enzyme
   - type: Tag
     tags:
-      - Enzyme
+    - Enzyme
+    - Ingredient
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -458,7 +463,8 @@
     state: bottle-hotsauce
   - type: Tag
     tags:
-      - Hotsauce
+    - Hotsauce
+    - Ingredient
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -483,7 +489,8 @@
     state: bottle-ketchup
   - type: Tag
     tags:
-      - Ketchup
+    - Ingredient
+    - Ketchup
 
 - type: entity
   parent: BaseFoodCondimentBottle
@@ -509,7 +516,8 @@
     state: bottle-ketchup
   - type: Tag
     tags:
-      - BBQsauce
+    - BBQsauce
+    - Ingredient
 
 # Shakers
 
@@ -569,7 +577,8 @@
     state: shaker-salt
   - type: Tag
     tags:
-      - SaltShaker
+    - Ingredient
+    - SaltShaker
 
 - type: entity
   parent: BaseFoodShaker
@@ -588,4 +597,5 @@
     state: shaker-pepper
   - type: Tag
     tags:
-      - PepperShaker
+    - Ingredient
+    - PepperShaker
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
index 1ee516e425..c22238bfde 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -40,6 +40,7 @@
         acts: [ "Destruction" ]
   - type: Tag
     tags:
+    - Dinnerware
     - Trash
   - type: SpaceGarbage
 
@@ -155,6 +156,7 @@
       - state: plate-plastic-inhand-right
   - type: Tag
     tags:
+    - Dinnerware
     - Trash
 
 - type: entity
@@ -175,6 +177,7 @@
       - state: plate-plastic-inhand-right
   - type: Tag
     tags:
+    - Dinnerware
     - Trash
 
 # Pie Tin
@@ -195,6 +198,7 @@
     storedOffset: 0,-3
   - type: Tag
     tags:
+    - Cookware
     - Trash
   - type: PhysicalComposition
     materialComposition:
@@ -219,6 +223,7 @@
     storedOffset: 0,-2
   - type: Tag
     tags:
+    - Cookware
     - Trash
   - type: PhysicalComposition
     materialComposition:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
index 49b8e9f937..79b1adcee6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/breakfast.yml
@@ -21,6 +21,9 @@
         Quantity: 15
       - ReagentId: Vitamin
         Quantity: 15
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Breakfasts
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
index 4b440ff51a..ad3480f9fb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
@@ -96,6 +96,9 @@
     sprite: Objects/Consumable/Food/burger.rsi
     shape:
     - 0,0,1,0
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Custom Burger Example
 
@@ -146,6 +149,7 @@
     state: appendix
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -186,6 +190,7 @@
         Quantity: 5
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -226,7 +231,7 @@
         Quantity: 5
   - type: Tag
     tags:
-    - Meat
+    - FinishedMeal
   - type: Item
     inhandVisuals:
       left:
@@ -259,6 +264,7 @@
     state: bearger
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -296,6 +302,7 @@
     state: bigbite
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like bun, silver, magic.
 
@@ -320,6 +327,7 @@
     state: brain
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like bun, brains.
 
@@ -347,6 +355,7 @@
       - cat
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -371,6 +380,7 @@
         Quantity: 10
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -413,6 +423,7 @@
         Quantity: 2
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -451,6 +462,7 @@
     state: clown
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -476,6 +488,7 @@
         Quantity: 10
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -498,6 +511,7 @@
     state: crab
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -567,6 +581,7 @@
         Quantity: 4
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -598,6 +613,7 @@
     state: chicken
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like bun, duck.
 
@@ -660,6 +676,7 @@
     state: fish
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like bun, fish.
 
@@ -699,6 +716,7 @@
         Quantity: 12
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 # Tastes like bun, HEAT.
@@ -745,8 +763,9 @@
         Quantity: 15
   - type: Tag
     tags:
-      - ClothMade
-      - Meat
+    - ClothMade
+    - FinishedMeal
+    - Meat
 # Tastes like bun, ectoplasm.
 
 - type: entity
@@ -763,6 +782,7 @@
     state: human
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -811,6 +831,7 @@
         Quantity: 5
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
 - type: entity
@@ -843,6 +864,7 @@
         Quantity: 5
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     size: Normal
@@ -905,6 +927,7 @@
     state: plain
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -938,6 +961,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -982,6 +1006,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -1100,6 +1125,7 @@
     state: superbite
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like bun, diabetes.
 
@@ -1155,6 +1181,7 @@
     state: x
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
   - type: Item
     inhandVisuals:
@@ -1198,5 +1225,6 @@
     state: mothroach
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
index 20ead4214c..252aa6f088 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml
@@ -8,8 +8,8 @@
   components:
   - type: Tag
     tags:
-      - Egg
-      - Meat
+    - Egg
+    - Meat
   - type: Edible
     trash:
     - Eggshells
@@ -124,3 +124,8 @@
     temperature: 344.0 # preserve temperature from the boiling step, TODO: Construction system that doesn't suck.
     heatCapacity: 15000
   - type: TemperatureDamage
+  - type: Tag
+    tags:
+    - Egg
+    - FinishedMeal
+    - Meat
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
index cb14b000cf..bb7976d692 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
@@ -13,6 +13,9 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 10
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Ice-cream
 
@@ -95,8 +98,9 @@
     - FoodFrozenPopsicleTrash
   - type: Tag
     tags:
-    - Fruit
     - Creamsicle
+    - FinishedMeal
+    - Fruit
 
 - type: entity
   name: berry creamsicle
@@ -115,8 +119,9 @@
     - FoodFrozenPopsicleTrash
   - type: Tag
     tags:
-    - Fruit
     - Creamsicle
+    - FinishedMeal
+    - Fruit
 
 - type: entity
   name: jumbo ice-cream
@@ -197,6 +202,7 @@
     - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
@@ -214,6 +220,7 @@
     - FoodFrozenSnowconeTrash
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 68aeee0bba..d8492d19ff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -63,6 +63,9 @@
     damage:
       types:
         Blunt: 0
+  - type: Tag
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -255,7 +258,7 @@
           True: {state: "salt-big_open"} # open
           False: {state: "salt-big"} # closed
   - type: Sprite
-    layers: 
+    layers:
     - state: salt-big
       map: ["enum.OpenableVisuals.Layer"]
   - type: Solution
@@ -282,7 +285,7 @@
           True: {state: "pepper-big_open"} # open
           False: {state: "pepper-big"} # closed
   - type: Sprite
-    layers: 
+    layers:
     - state: pepper-big
       map: ["enum.OpenableVisuals.Layer"]
   - type: Solution
@@ -348,7 +351,8 @@
         Quantity: 50
   - type: Tag
     tags:
-      - Mayo
+    - Ingredient
+    - Mayo
 
 # Baking
 
@@ -360,6 +364,9 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Food/ingredients.rsi
+  - type: Tag
+    tags:
+    - Ingredient
 
 # TODO Replace all nutriment in dough with something that is less metabolically efficient
 
@@ -373,6 +380,9 @@
     sourceSolution: food
     ignoreEmpty: true
     popup: spike-solution-mix
+  - type: Tag
+    tags:
+    - Ingredient
 
 - type: entity
   abstract: true
@@ -406,7 +416,7 @@
     state: dough-slice
   - type: Tag
     tags:
-    - Slice
+    - Ingredient
   - type: Solution
     solution:
       reagents:
@@ -422,7 +432,8 @@
     size: Small
     storedRotation: -45
   - type: Tag
-    tags: []
+    tags:
+    - Ingredient
 
 - type: entity
   parent: [FoodDoughBase, BaseSlicingRefinableFood]
@@ -550,6 +561,7 @@
   - type: Tag
     tags:
     - ClothMade
+    - Ingredient
   - type: Solution
     solution:
       reagents:
@@ -572,8 +584,9 @@
     state: cotton-dough-slice
   - type: Tag
     tags:
-    - Slice
     - ClothMade
+    - Ingredient
+    - Slice
   - type: Construction
     graph: DoughRopeCotton
     node: start
@@ -609,7 +622,8 @@
         Quantity: 5
   - type: Tag
     tags:
-     - ClothMade
+    - ClothMade
+    - Ingredient
 
 - type: entity
   name: raw pastry base
@@ -766,6 +780,7 @@
         Quantity: 2.5
   - type: Tag
     tags:
+    - Ingredient
     - Slice
 
 - type: entity
@@ -828,6 +843,7 @@
         Quantity: 15
   - type: Tag
     tags:
+    - Ingredient
     - Slice
   - type: FoodSequenceElement
     entries:
@@ -894,6 +910,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - Ingredient
     - Slice
 
 - type: entity
@@ -943,6 +960,7 @@
         Quantity: 6
   - type: Tag
     tags:
+    - Ingredient
     - Slice
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
index f6fd59e248..2e75a7b3c4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
@@ -20,6 +20,9 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 40 # Bonus for complete meal
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Meals
 
@@ -89,6 +92,7 @@
   - type: Tag
     tags:
     - CarrotFries
+    - FinishedMeal
   - type: Solution
     solution:
       reagents:
@@ -219,6 +223,7 @@
     state: eggplantparm
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 # Tastes like eggplant, cheese.
 
@@ -269,6 +274,7 @@
   - type: Tag
     tags:
     - CubanCarp
+    - FinishedMeal
     - Meat
 # Tastes like fish, batter, hot peppers.
 
@@ -288,6 +294,7 @@
     state: cornedbeef
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like meat, cabbage.
 
@@ -309,6 +316,7 @@
     state: bearsteak
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like meat, salmon.
 
@@ -329,6 +337,7 @@
     state: pigblanket
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like meat, butter.
 
@@ -362,6 +371,7 @@
         Quantity: 10
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like meat, smokey sauce.
 
@@ -380,6 +390,7 @@
     state: benedict
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like eggs, bacon, bun.
 
@@ -399,6 +410,7 @@
     state: omelette
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like egg, cheese.
 
@@ -419,6 +431,7 @@
     state: friedegg
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like egg, salt, pepper.
 
@@ -506,6 +519,7 @@
         Quantity: 1
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # tastes exotic
 
@@ -535,6 +549,7 @@
           Quantity: 5
     - type: Tag
       tags:
+      - FinishedMeal
       - Meat
 # What do Europeans eat instead of enchiladas? 25.4 millimeter-iladas.
 
@@ -569,6 +584,7 @@
         Quantity: 5
   - type: Tag
     tags:
+    - FinishedMeal
     - Fruit
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
index 7617a8ce3b..9b450a36e9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
@@ -48,6 +48,9 @@
   - type: PhysicalComposition
     materialComposition:
       Meaterial: 300
+  - type: Tag
+    tags:
+    - Meat
 
 - type: entity
   parent: FoodMeatBase
@@ -56,8 +59,8 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Perishable
     # raw meat rots in 5 minutes, get it into the freezer fast
     rotAfter: 300
@@ -129,8 +132,8 @@
       - fishy
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: fish
   - type: Solution
@@ -164,8 +167,8 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: bacon
   - type: Solution
@@ -294,9 +297,9 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - HighRiskItem
     - Meat
+    - Raw
   - type: Sprite
     state: corgi
   - type: Solution
@@ -364,8 +367,8 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     layers:
     - state: dragon
@@ -555,6 +558,10 @@
       right:
       - state: generic-pink-inhand-right
         color: "#934C64"
+  - type: Tag
+    tags:
+    - Meat
+    - Raw
 
 - type: entity
   parent: [SolutionTiny, FoodMeatBase]
@@ -564,8 +571,8 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: snake
   - type: Solution
@@ -598,8 +605,8 @@
       - acid
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: xeno
   - type: Solution
@@ -635,8 +642,8 @@
     - lostfriendship
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: rouny
   - type: Solution
@@ -676,6 +683,11 @@
       - state: tomato-inhand-left
       right:
       - state: tomato-inhand-right
+  - type: Tag
+    tags:
+    - Ingredient
+    - Meat
+    - Raw
 
 - type: entity
   parent: [FoodMeatBase, BaseSlicingRefinableFood]
@@ -687,8 +699,8 @@
     storedOffset: 0,1
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     sprite: Objects/Consumable/Food/salami.rsi
     state: salami
@@ -720,8 +732,8 @@
       - funny
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: clown
   - type: ToolRefinable
@@ -749,8 +761,8 @@
         Quantity: 3
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: meatball
   - type: Construction
@@ -767,8 +779,8 @@
   components:
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Sprite
     state: raw_patty
   - type: Construction
@@ -800,8 +812,8 @@
       - slimy
   - type: Tag
     tags:
-    - Raw
     - Meat
+    - Raw
   - type: Extractable
     juiceSolution:
       reagents:
@@ -846,6 +858,7 @@
   - type: Tag
     tags:
     - Meat
+    - Raw
   - type: Item
     size: Normal
     shape:
@@ -884,10 +897,11 @@
       - ReagentId: Iron
         Quantity: 10
   - type: StaticPrice
-    price: 3000 #It has so much Omnizin in it
+    price: 3000 #It has so much Omnizine in it
   - type: Tag
     tags:
     - Meat
+    - Raw
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
index ffdc81c2d2..1556fd46bc 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
@@ -17,6 +17,9 @@
       reagents:
       - ReagentId: Nutriment
         Quantity: 30
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Noodles
 
@@ -58,7 +61,8 @@
         Quantity: 5
   - type: Tag
     tags:
-    - Fruit # ???
+    - FinishedMeal
+    - Fruit # because tomatos are fruit
 # Tastes like pasta, tomato.
 
 - type: entity
@@ -112,6 +116,7 @@
         Quantity: 5
   - type: Tag
     tags:
+    - FinishedMeal
     - Meat
 # Tastes like pasta, meat.
 
@@ -129,6 +134,10 @@
       - meaty
   - type: Sprite
     state: spesslaw
+  - type: Tag
+    tags:
+    - FinishedMeal
+    - Meat
 # Tastes like pasta, meat.
 
 - type: entity
@@ -152,7 +161,10 @@
         Quantity: 45
       - ReagentId: Vitamin
         Quantity: 12
-# Tastes like pasta, tomato.
+  - type: Tag
+    tags:
+    - FinishedMeal
+# Tastes like pasta, oily, eggplant, and carrot.
 
 - type: entity
   parent: FoodNoodlesBase
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
index 3f0245a985..600f3d0e44 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
@@ -51,8 +51,9 @@
       path: /Audio/Weapons/bladeslice.ogg
   - type: Tag
     tags:
-    - Trash
+    - Cookware
     - Skewer
+    - Trash
   - type: Edible
     trash:
     - FoodKebabSkewer
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 92822c0f8b..08277b6de5 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -205,6 +205,7 @@
     tags:
     - Fruit # Seed of a fruit, you can yell at me
     - Pistachios # Added tag due to CrateServiceGetMore interaction with BountyFruit.
+    - FoodSnack
 
 - type: entity
   name: popcorn
@@ -244,6 +245,7 @@
   - type: Tag
     tags:
     - Fruit
+    - FoodSnack
 
 - type: entity
   parent: FoodSnackBase
@@ -281,6 +283,7 @@
     - FoodPacketSusTrash
   - type: Tag
     tags:
+    - FoodSnack
     - Meat
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
index 0b76315dd4..26c5783ed9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -594,6 +594,9 @@
         Quantity: 15
       - ReagentId: Vodka
         Quantity: 5
+  - type: Tag
+    tags:
+    - FinishedMeal
 
 # Soup
 
@@ -821,6 +824,7 @@
   - type: Tag
     tags:
     - ChiliBowl
+    - FinishedMeal
 
 
 - type: entity
@@ -855,6 +859,7 @@
   - type: Tag
     tags:
     - ChiliBowl
+    - FinishedMeal
 
 - type: entity
   name: chili con carnival
@@ -875,6 +880,7 @@
   - type: Tag
     tags:
     - ChiliBowl
+    - FinishedMeal
 
 - type: entity
   name: monkey's delight
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
index c0fd9a3510..b1129c6615 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
@@ -62,7 +62,8 @@
     storedOffset: 0,1
   - type: Tag
     tags:
-      - Meat
+    - FinishedMeal
+    - Meat
 
 - type: entity
   name: beef taco
@@ -199,4 +200,5 @@
     state: softtaco
   - type: Tag
     tags:
-      - Meat
+    - FinishedMeal
+    - Meat
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 32b5031547..26876f6401 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -108,6 +108,7 @@
         Quantity: 10
   - type: Tag
     tags:
+      - Ingredient
       - ClothMade
       - Gauze
       - RawMaterial
diff --git a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
index 2d64569869..238265041a 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
@@ -26,6 +26,9 @@
       path: /Audio/Effects/unwrap.ogg
   - type: Sprite
     sprite: Objects/Misc/monkeycube.rsi
+  - type: Tag
+    tags:
+    - WrappedCube
 
 - type: entity
   parent: BaseWrappedCube
@@ -41,6 +44,7 @@
   - type: Tag
     tags:
     - MonkeyCube
+    - WrappedCube
 
 - type: entity
   parent: MonkeyCubeBox
diff --git a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
index 2f390310df..aaf4fa0933 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/utensils.yml
@@ -20,6 +20,7 @@
     price: 0
   - type: Tag
     tags:
+    - Dinnerware
     - Plastic
     - Trash
   - type: MeleeWeapon
@@ -37,6 +38,7 @@
   components:
   - type: Tag
     tags:
+    - Dinnerware
     - Metal
   - type: Sprite
     state: fork
@@ -70,6 +72,7 @@
   components:
   - type: Tag
     tags:
+    - Dinnerware
     - Metal
   - type: Sprite
     state: spoon
@@ -126,10 +129,11 @@
     - Knife
   - type: Tag
     tags:
-    - Plastic
-    - Trash
+    - Dinnerware
     - Knife
+    - Plastic
     - ToyKnife
+    - Trash
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 3399ebd254..6f33d5cf5d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -4,6 +4,9 @@
   id: HydroponicsToolMiniHoe
   description: It's used for removing weeds or scratching your back.
   components:
+  - type: Tag
+    tags:
+    - BotanyTool
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/hoe.rsi
     state: icon
@@ -29,6 +32,9 @@
   id: HydroponicsToolClippers
   description: A tool used to take samples from plants.
   components:
+  - type: Tag
+    tags:
+    - BotanyTool
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/clippers.rsi
     state: icon
@@ -57,6 +63,9 @@
   - type: Tool
     qualities:
     - Slicing
+  - type: Tag
+    tags:
+    - BotanyTool
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/scythe.rsi
     state: icon
@@ -91,6 +100,7 @@
   - type: Tag
     tags:
     - BotanyHatchet
+    - BotanyTool
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
     state: icon
@@ -119,6 +129,7 @@
   - type: Tag
     tags:
     - BotanyShovel
+    - BotanyTool
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/spade.rsi
     state: icon
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index 7c90a82d7d..e0d26211de 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -11,6 +11,7 @@
     state: icon
   - type: Tag
     tags:
+    - BotanyTool
     - Recyclable
     - Trash
   - type: BotanySwab
@@ -30,6 +31,9 @@
     layers:
     - state: boxwide
     - state: swab
+  - type: Tag
+    tags:
+    - BotanyTool
   - type: BallisticAmmoProvider
     whitelist:
       components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 34e61f1a1b..fad5b03459 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -1134,12 +1134,12 @@
 
 - type: entity
   id: BorgModuleMusique
-  parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
+  parent: [ BaseBorgModule, BaseProviderBorgModule ]
   name: musique cyborg module
   components:
   - type: Sprite
     layers:
-    - state: service
+    - state: generic
     - state: icon-musique
   - type: ItemBorgModule
     hands:
@@ -1168,39 +1168,149 @@
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
 
 - type: entity
-  id: BorgModuleGardening
+  id: BorgModuleCooking
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: gardening cyborg module
+  name: cooking cyborg module
   components:
   - type: Sprite
     layers:
     - state: service
-    - state: icon-gardening
+    - state: icon-cooking
   - type: ItemBorgModule
     hands:
-    - item: HydroponicsToolMiniHoe
-    - item: HydroponicsToolSpade
-    - item: HydroponicsToolClippers
-    - item: Bucket
+    - hand:
+        emptyLabel: borg-slot-dining-ware-empty
+        emptyRepresentative: BorgModuleFoodPlatterPlaceholder
+        whitelist:
+          tags:
+          - Bread
+          - Cake
+          - ClothMade
+          - Cooked
+          - Cookware
+          - Dinnerware
+          - DonkPocket
+          - Donut
+          - Pie
+          - Pizza
+          - Soup
+          - FoodSnack
+          - FinishedMeal
+        blacklist:
+          tags:
+          - Ingredient
+          - Raw
+    - item: KitchenKnife
+    - item: RollingPin
+    - item: Beaker
+      hand:
+        emptyLabel: borg-slot-small-containers-empty
+        emptyRepresentative: BorgModuleDinnerwarePlaceholder
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - Dinnerware
+    - hand:
+        emptyLabel: borg-slot-ingredients-empty
+        emptyRepresentative: BorgModuleRawIngredientPlaceholder
+        whitelist:
+          tags:
+          - FoodSnack
+          - Fruit
+          - Ingredient
+          - Meat
+          - Packet
+          - Raw
+          - Vegetable
+          - WrappedCube
+          components:
+          - Produce
+          - Rehydratable # For butchering
+        blacklist:
+          tags:
+          - ChiliBowl
+          - Cooked
+          - Cookware
+          - Dinnerware
+          - Donut
+          - DonkPocket
+          - Pie
+          - Pizza
+          - Soup
+          - FoodSnack
+          - FinishedMeal
+
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: gardening-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: cooking-module }
 
 - type: entity
-  id: BorgModuleHarvesting
+  id: BorgModuleFoodPlatterPlaceholder
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/placeholder.rsi
+    state: icon-food-platter
+
+- type: entity
+  id: BorgModuleDinnerwarePlaceholder
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/placeholder.rsi
+    state: icon-dinnerware
+
+- type: entity
+  id: BorgModuleRawIngredientPlaceholder
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Kitchen/placeholder.rsi
+    state: icon-raw-ingredients
+
+- type: entity
+  id: BorgModuleBotany
   parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
-  name: harvesting cyborg module
+  name: botany cyborg module
   components:
   - type: Sprite
     layers:
     - state: service
-    - state: icon-harvesting
+    - state: icon-botany
   - type: ItemBorgModule
     hands:
-    - item: HydroponicsToolScythe
-    - item: HydroponicsToolHatchet
+    - hand:
+        emptyLabel: borg-slot-gardening-tools-empty
+        emptyRepresentative: HydroponicsToolMiniHoe
+        whitelist:
+          tags:
+          - BotanyTool
+    - hand:
+        emptyLabel: borg-slot-gardening-tools-empty
+        emptyRepresentative: HydroponicsToolClippers
+        whitelist:
+          tags:
+          - BotanyTool
+    - item: BorgDropper
+    - item: BorgBucket
     - item: PlantBag
+    - hand:
+        emptyLabel: borg-slot-seed-produce-empty
+        emptyRepresentative: BorgModuleSeedProducePlaceholder
+        whitelist:
+          components:
+          - Produce
+          - Seed
   - type: BorgModuleIcon
-    icon: { sprite: Interface/Actions/actions_borg.rsi, state: harvesting-module }
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: botany-module }
+
+- type: entity
+  id: BorgModuleSeedProducePlaceholder
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Hydroponics/seeds.rsi
+    state: seed-produce-icon
 
 - type: entity
   id: BorgModuleClowning
@@ -1282,18 +1392,18 @@
   name: operative cyborg module
   description: A module that comes with a crowbar, an Emag, an Access Breaker and a syndicate pinpointer.
   components:
-    - type: Sprite
-      layers:
-      - state: syndicate
-      - state: icon-syndicate
-    - type: ItemBorgModule
-      hands:
-      - item: Crowbar
-      - item: Emag
-      - item: AccessBreaker
-      - item: PinpointerSyndicateNuclear
-    - type: BorgModuleIcon
-      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
+  - type: Sprite
+    layers:
+    - state: syndicate
+    - state: icon-syndicate
+  - type: ItemBorgModule
+    hands:
+    - item: Crowbar
+    - item: Emag
+    - item: AccessBreaker
+    - item: PinpointerSyndicateNuclear
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
 
 - type: entity
   parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
@@ -1369,35 +1479,35 @@
   name: martyr cyborg module
   description: "A module that comes with an explosive you probably don't want to handle yourself."
   components:
-    - type: Sprite
-      layers:
-        - state: syndicateborgbomb
-        - state: icon-bomb
-    - type: ItemBorgModule
-      hands:
-      - item: SelfDestructSeq
-    - type: BorgModuleIcon
-      icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
-    - type: Item
-      inhandVisuals:
-        left:
-        - state: base-icon-inhand-left
-          color: "#FF0000"
-        - state: base-module-inhand-left
-          color: "#891417"
-        - state: base-part-inhand-left
-        - state: base-stripes-inhand-left
-          color: "#7B0F12"
-        right:
-        - state: base-icon-inhand-right
-          color: "#FF0000"
-        - state: base-module-inhand-right
-          color: "#891417"
-        - state: base-part-inhand-right
-        - state: base-stripes-inhand-right
-          color: "#7B0F12"
-    - type: StaticPrice
-      price: 2000
+  - type: Sprite
+    layers:
+    - state: syndicateborgbomb
+    - state: icon-bomb
+  - type: ItemBorgModule
+    hands:
+    - item: SelfDestructSeq
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: base-icon-inhand-left
+        color: "#FF0000"
+      - state: base-module-inhand-left
+        color: "#891417"
+      - state: base-part-inhand-left
+      - state: base-stripes-inhand-left
+        color: "#7B0F12"
+      right:
+      - state: base-icon-inhand-right
+        color: "#FF0000"
+      - state: base-module-inhand-right
+        color: "#891417"
+      - state: base-part-inhand-right
+      - state: base-stripes-inhand-right
+        color: "#7B0F12"
+  - type: StaticPrice
+    price: 2000
 
 # mothership module
 - type: entity
@@ -1895,8 +2005,8 @@
     energy: 1
   - type: Sprite
     layers:
-      - state: xenoborg_heavy
-      - state: icon-xenoborg-radioactive
+    - state: xenoborg_heavy
+    - state: icon-xenoborg-radioactive
   - type: BorgModuleWhitelist
     moduleBlacklist: &moduleWithSimpleOverlay
       tags:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
index a8a29ab367..541e3f0506 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -44,7 +44,7 @@
   parent: [SolutionHuge, Bucket]
   id: BorgBucket
   name: internal tank
-  description: The internal reservoir of a custodial cyborg, capable of holding a entire mop bucket worth of water.
+  description: The internal reservoir of a cyborg, twice the normal size of a bucket.
   components:
   - type: SolutionTransfer
     transferAmount: 240
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
index f482c07787..b6a93b3058 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml
@@ -11,11 +11,12 @@
 - type: latheRecipePack
   id: BorgModulesStatic
   recipes:
-  - BorgModuleTool
+  - BorgModuleArtistry
   - BorgModuleCable
   - BorgModuleFireExtinguisher
   - BorgModuleInflatable
-  - BorgModuleArtistry
+  - BorgModuleMusique
+  - BorgModuleTool
 
 - type: latheRecipePack
   id: BorgLimbsStatic
diff --git a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
index b9c3297aba..46c3b7a0d2 100644
--- a/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robot_modules.yml
@@ -24,8 +24,8 @@
 # Generic
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
-  id: BorgModuleTool
-  result: BorgModuleTool
+  id: BorgModuleArtistry
+  result: BorgModuleArtistry
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
@@ -44,8 +44,13 @@
 
 - type: latheRecipe
   parent: BaseBorgModuleRecipe
-  id: BorgModuleArtistry
-  result: BorgModuleArtistry
+  id: BorgModuleMusique
+  result: BorgModuleMusique
+
+- type: latheRecipe
+  parent: BaseBorgModuleRecipe
+  id: BorgModuleTool
+  result: BorgModuleTool
 
 # Cargo Modules
 
diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml
index 90e9e959bb..a69b7addf8 100644
--- a/Resources/Prototypes/borg_types.yml
+++ b/Resources/Prototypes/borg_types.yml
@@ -210,11 +210,9 @@
 
   defaultModules:
   - BorgModulePrying
-  - BorgModuleMusique
   - BorgModuleService
-  - BorgModuleClowning
-  - BorgModuleGardening
-  - BorgModuleHarvesting
+  - BorgModuleBotany
+  - BorgModuleCooking
   radioChannels:
   - Science
   - Service
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 9ec7ae7e03..70a1dc188f 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -149,6 +149,9 @@
 - type: Tag
   id: Bot # Targeting whitelist: ChameleonProjector
 
+- type: Tag
+  id: BotanyTool # For borg gardening module whitelisted module slot
+
 - type: Tag
   id: BotanyHatchet # Storage whitelist: ClothingBeltPlant. ItemMapper: ClothingBeltPlant
 
@@ -325,7 +328,7 @@
   id: CleanerGrenade # Storage whitelist: ClothingBeltJanitor. ItemMapper: ClothingBeltJanitor
 
 - type: Tag
-  id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth
+  id: ClothMade # SpecialDigestible: OrganMothStomach. Storage whitelist: FoodBoxCloth, BorgModuleCooking
 
 - type: Tag
   id: ClownMask # ConstructionGraph: Honker, BananaClownMask
@@ -363,6 +366,9 @@
 - type: Tag
   id: Cooked # MetamorphRecipe: FoodBurgerCheese, FoodBurgerChicken, FoodBurgerCrab, FoodBurgerDuck
 
+- type: Tag
+  id: Cookware # Storage whitelist: BorgModuleCooking
+
 - type: Tag
   id: CoordinatesDisk # Storage whitelist: DiskCase
 
@@ -458,6 +464,9 @@
 - type: Tag
   id: Diamond # CargoBounty: BountySalvageDiamond
 
+- type: Tag
+  id: Dinnerware # Storage whitelist: BorgModuleCooking
+
 - type: Tag
   id: Dice # Storage whitelist: BorgModuleService, DiceBag, BooksBag
 
@@ -565,6 +574,9 @@
 - type: Tag
   id: Figurine # Storage whitelist: BooksBag, BorgModuleService. CargoBounty: BountyFigurine
 
+- type: Tag
+  id: FinishedMeal # Storage whitelist: BorgModuleCooking
+
 - type: Tag
   id: FireAlarm # Used by AtmosAlarmableComponent for syncing devices.
 
@@ -620,7 +632,7 @@
   id: FreezerElectronics # ConstructionGraph: CrateFreezer, ClosetFreezer
 
 - type: Tag
-  id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit
+  id: Fruit # SpecialDigestible: OrganReptilianStomach. CargoBounty: BountyFruit. StorageWhitelist: BorgModuleCooking
 
 ## G ##
 
@@ -812,6 +824,9 @@
 - type: Tag #Drop this innate tool instead of deleting it.
   id: InnateDontDelete # Basically used as a bool for InnateToolComponent in InnateToolSystem. TODO remove
 
+- type: Tag
+  id: Ingredient # StorageWhitelist: BorgModuleCooking
+
 - type: Tag
   id: InstantDoAfters # Used by SharedDoAfterSystem for tagged entities to skip DoAfters (aghost). TODO remove
 
@@ -994,6 +1009,9 @@
 - type: Tag
   id: Mouse # CargoBounty: BountyMouse
 
+- type: Tag
+  id: Muffin #  StorageWhitelist: BorgModuleCooking
+
 - type: Tag
   id: Multitool # Storage whitelist: BaseClothingBeltEngineering. ItemMapper: BaseClothingBeltEngineering. ConstructionGraph: LogicGate
 
@@ -1583,6 +1601,9 @@
   id: WoodwindInstrument # even more like our atmos
                          # MachineBoard construction: DawInstrumentMachineCircuitboard
 
+- type: Tag
+  id: WrappedCube # StorageWhitelist: BorgModuleCooking
+
 - type: Tag
   id: Wrench # Storage whitelist: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical.
              # ItemMapper: BaseClothingBeltEngineering, ClothingBeltJanitor, ClothingBeltMedical
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/gardening-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/botany-module.png
similarity index 100%
rename from Resources/Textures/Interface/Actions/actions_borg.rsi/gardening-module.png
rename to Resources/Textures/Interface/Actions/actions_borg.rsi/botany-module.png
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/cooking-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/cooking-module.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a7d466c722a76b6ccd097e98207c804b2664f93
GIT binary patch
literal 596
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikd1AIbUjg5_gOa?wl1}R;Q6<Xp6658*K4KJ9<Hz_DhRAF=D;LPS`F=geQ
z#t&5WHTat^km4^1@(cct0vN8`nXwQk#aZAHSqwDpFbFdq&tH)O6qG1&jVKAuPb(=;
zEJ|evNX*PD(erZ+Q83jr)U(XVyJZJdvn@5kGtJXei-7~kVP%kFWMyCkvb=y;8p;Ow
zP=k>fEY1XE8!|F62mt9QAkJ)O0gGn=*&vVr#321J8qHD$U>HqcXJ7%UFfcMUU|aw(
z6{Lf80mP&!KsE?40nK3os|>QV0J5OE3=IrGvOebzc&PSYUjSsT_jGX#vGDJm+|9=#
z$m1G$D(B|U|L0@B-f}!W&&O!V_jw&HyZHZz1}Ld6m?E}-rS_NVg6IPU5y@2x#MlnJ
z<9+ar?L%HR!)zvL<`|I)yaju8IaQd?Zgw!ZVyPSHJgYjMWzE8~pW6&C+_`F(e!yz|
z?V}BhZ`SXZGH^3_%EmRB@iF`5_21K-U$LKAeJ;V{uS1i%Kl5dI9*JxJ5*(J<&ttr9
oS3X%-x1h@6`10+~1$MmGf44z&^>+KUO(1W0y85}Sb4q9e053PF2><{9

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/harvesting-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/harvesting-module.png
deleted file mode 100644
index 24e1c57f5ef5606be3c9ce96d7cc1e57a3279deb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 849
zcmV-X1FrmuP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000kR
z000kR0jNKxX#fBN14%?dR9J=WmrqR7U>L@qb=_7NuCsuQKS3ah&IB9`2uh+vPYN+1
z(SsgMycs<iuO^(l8n1d(BPJ$ZJRk{@aMB4#5G7({gSm||aBhSZ+SwL2-P(?JfE@JQ
zmbKsaetn<k*RNk&;9n2ZpF3W!H}yA)`h31j-ONV1xY)U?#l<>VBFG$NfTMC(1xPj0
zA`}ATC@I@j0f>Fe+EogOvxbi6x#G%fk3R|-*0U`F-itP{2^Pg2_RW23wfygUmed}!
zQv{m&%E5CysOBOtb-zT{0qn;JJQpb4Gzubc{Ja^d{VAlDQz)6WBT8+GCN5DR+l!GL
zSd(d}lGrW**}0vEDPqF==aKBrTfmWiCx|{9;%f<ABn%NqJ13S2Obqg>xu5O=ZfYGB
zt(91$!b%c_63FX3C#FRbLcbuB;J$Do2~v}UE&_U-=SG@@aGQelj_LOpqXdjN&kc!$
z`&<RMB0-ZvUIK+USH#O43VI0`abA1h0{``O)xI<Zo-?V=FNFYWdlc?^w=U;a_YCNx
z4mkbgARff<_2xd+yz)5)BQF+p5)kX@ac*smqVeQmB&HGwt_R^tx-_q#ksj@}MJd26
zeiP=r&ZT?6<Wv-djQ~LspjT*wEnzX=rJA1=dI(HB4Qq~<?tV3$wQ!U=F#2i~)l8M#
z-Vkp<s&^Lb6U){j@(JK(8bv4S$&z!rhXJ`tf@v<pDcfm`48E587QP43R_{fu-3M;E
zQM+QHD`D5b=0SxYJXn&2bJYoZZ3(zHjNC5GiBKSfmKqPn_;GOW7;O=G1!$aiYJ)=P
z1dGxs8kU#^aXNvaYr#xDH&cdr@v0zL0&R!9cx%=mQ7D0-%PhJd9z(ce3CuLDnk&)p
zw+0{t1l=SEMT_J}<2QUGf~v_1nTAdLoPFG^$dTsI{Kf*7*d>{Sw60|3<%Hqq0g1#`
zktX5)96-xK4}wi$bl*FG;j15X2-u;gVrfoDE9KbyI6CLLuy|%gCNb2LJqPyu#bnQ4
b&Hl$v@55#6VK{iP00000NkvXXu0mjfrks4O

diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
index c8eb0928e8..1d95ce8135 100644
--- a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
+++ b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -95,10 +95,7 @@
             "name":"musical-module"
         },
         {
-            "name":"gardening-module"
-        },
-        {
-            "name":"harvesting-module"
+            "name":"botany-module"
         },
         {
             "name":"clowning-module"
@@ -106,6 +103,9 @@
         {
             "name":"adv-clowning-module"
         },
+        {
+            "name":"cooking-module"
+        },
         {
             "name":"syndicate-weapon-module"
         },
diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/musical-module.png b/Resources/Textures/Interface/Actions/actions_borg.rsi/musical-module.png
index c611269ddfe3b71b30951a072fc9eae6e4928f32..899009338002324446ad1e4e4e13e8c3621501a9 100644
GIT binary patch
delta 441
zcmV;q0Y?7q1JeVLB!2;OQb$4nuFf3k0004vNkl<ZScUCZJ92|C5Piv{^rYBvlXJ*t
zu<5Csjv^=E9Gt)fol~U`IRiRJ8b(EiJ}Ep>Bv_Ed$1ajLqZvsE?eg??wE%w|clJOC
z@qG=WQc7djbhL3P<*LSo5RMZM9nXNrr&S%0QW__E4gdf)+kaIZz}KfU>^smli`&f7
z1m)X1`^?Kge%zaW@%k~z0V4X{H<kgVl<8-O-QbsuK`AxJ?0s)$vvnE~p{!~U5r_!+
z%X4pyuNejyeT6a5HYiSKWNE^#nZtlr1NQk5(M1Q5kuqNcZG$XLP@K+DhP!)k2xg$H
z>d84`5eDX9F@Fuj!p<R!Ghia31Dz+bG;wms;tZIGu#g}3PQ<YLhBBbPaEJk=6tcsv
zH>cOyd1EYlvJ5z92mXfiF#zBaIo<a|7;w%G{P}UrOo<qlfwHO%3qzTY(?(Flglb?Y
z>v7uf>17O26%nV65WP5<QxS362+_+Jy!C+H?7BeT4Km!^XzL)lCgij+^_JuvxMfu=
jgt*#|iN?);&HnKNnZD_JFI3kL00000NkvXXu0mjfRI$!{

delta 467
zcmV;^0WAL01MLHlB!3BTNLh0L01sgR01sgSs6VG^0004>Nkl<ZScPL?80ml!nPY5h
z{GT3{o;`aOZZDhxvm7W%Q_F$&pg4jB&1DP>e3CSE0LTuQBQP8Q20S7(bpXSs=O|oE
z2Yh)$bvsoX1sHDEf50k7Fa+G2W#R0dwU5bi0GlK;!dy~A;D75&AvoJ6M~LA_$1Rc_
z@awq%&|ES@fLoj!>~mO1xc3{991@g=08nga;Tr~<3N@^12my*i044?t4N`LoRYCyd
z`<;d7NwOFQs1gE4ro1D&jG#&gPy(oy21o_keax8VQY!?67h|{dZ7hTam43gT|3NaB
z$|1lk|AFC^mwy0?nAkR;B|H!@aJ*wPm)H=1<@v8KzhVu6zYl?-F#QdN7)<TeG)O3b
z0Iqrfy90nOMK1qQT#p0@g#g&%ZY=tV2?6BtA0~zlkbR3!j1a&Y0-!t(3k6&yA1DNn
zeTz#B0}z`AKxIER089PIzQra+EFh^x1dd}AwE|eh@Js?qT0~$UqN&9uMhYM)1m0#M
zLIIouc(9A%1(dc4U)jM}Z}5r{3kFxK7}Q>;SH}bf2E1!F3ILD6-P1Hg`pf_T002ov
JPDHLkV1f&LwU__^

diff --git a/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/meta.json
index bd5d13d6df..fc120d1b48 100644
--- a/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/meta.json
@@ -16,6 +16,9 @@
     {
       "name": "seed"
     },
+    {
+      "name": "seed-produce-icon"
+    },
     {
       "name": "seed-alien1"
     },
diff --git a/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/seed-produce-icon.png b/Resources/Textures/Objects/Specific/Hydroponics/seeds.rsi/seed-produce-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..43cdf4d009c5fa74ec12f22dd4061d3f39f160f8
GIT binary patch
literal 830
zcmV-E1Ht@>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%_(?=TR9J=Wm0w6xaTLct*FR_s%rTu~DTU1y)dE9d38MMZi(t}Q4<SA%_!wv;
z^b#WBOHg116-hxak$>nRpTvwQ8CeXW{4*2QSUOQEb#u;N4|n%^%ey<7kL?TNu=6|j
ze9!rw-?<mkNaKHpl<1(n!y&4wPUG=RV`KpuFAXNllMGo#hoz-<0P5;$bZu#=9iJ~i
z|3HICwFtw9+B+P=;V>sWce^V9@c9Ceq7sG*D6m@Xy8elY54hbGsuHOnX#rNNT^)rM
zK3@Q<RVG%>g%BKXHe<5n3IKDN39ZU+Tj%#*K>t94KywdV1=V;%W2#mB+Rhd7^_4IH
zaVv`57A0iQh%$`2*LMEqVHd7~Y64$n`)`cLGYudBirp4T`->Cn-Va>`l<u`STMKvF
zyKp+denR$LoSkI2tdhn%FNhN}Q(%^sHP1Oit42L09)Y%d%gQJ(AA!>WM=sak4UGX%
zIPRzM^&BQkF6J^5{)rW+SGPta+cJ`kK!KKAi|1DxF<Ek1UkS51yH2s&LgBbyI76$V
zaNMuPjke4&+A^n`TUUYjJXIAgT(8j!<96)>Xf6Wa%#$Ag_!|zZ|BpQjiteB=RKai!
zjduHe>mWTP*;Jk{=H|62^7Caeox?wQbtRXck}QVScIdQ8hD9X(79=8Xvt<KdZz@Mx
zl<(~Kkxu~BoHMae?_l!QXNJ~x@P}h`2Zba_d+CzCiuL?ieRH(gvavUn|D9}6AUs|I
zk(lZ`PyvZ>qX?lYkduj2<pMw)mD2^DP605pu}$77EBD?l(HGj$Enr{Y0zG&)1+GI9
zfk+Iy$14+$>~^k@KOSE;$Z~)J79w&1fGWA^WFY`cTQTx><hU&XQQbkx*w=eN2a-P=
z!@Iegd1hmqrL7qA;TXT-<o7+xtZl<@p`(2qDJ#%s%a(eBQLzxojC(Tp@-YPQ@oWiL
z+lFY8dzNwmy}>BmK_PY8BmwX(DiP7FdyXWClDP9U(nv$WAMS841)$MuFaQ7m07*qo
IM6N<$g066MQUCw|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-dinnerware.png b/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-dinnerware.png
new file mode 100644
index 0000000000000000000000000000000000000000..e979f0101086aab32faa93b71deecffc6fa84fea
GIT binary patch
literal 880
zcmV-$1CRWPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&DoI2^R9J=Wl}%_AXBfwSo5ty6v&DoK(pj*6fwShrOFa}Vn<$AAP~xTPNiYXX
zFB-^63OS^O7Qv!D1}lOW5fOsKw3oVBql92U8A3Zbs06Yfsp+zt&30JacY0Xob#`Zx
zO+ciS{4X=_^Stx?fA8nOrZ)9|QZyR1{hn*7?tOs0H-P5mX5Z&p3cO2zzP>&?7!1mG
zp-^CSbaYLR`i&TLUYtl&$0mO03_I_cOa_2pFi4?LknOd!t{HHQub$sqsLoyZ`H!F*
z#J%z2@p#SpH9NS?@67m*=;5Q32Vy<u>jH2?96ivaRp%Z*S)x>W%~zjH%Giy&v2~4}
zT6^HZy_+_`<tHT$?EjeQr#VlbAJ0Yj_Ln)nj2;Hy<?}fJu3s6FOVK|tyef<@fMcvj
z+RL4u=GpS0!uS2V8K2Dp(A%~ZAp~Pad0Cd1vn>6U2B5LA5mk9x+JW%{@!SK~uMF9G
zq+Ob?rZFSK_-vLVdp|<hwlsgWn4-0{wW6=8)T1i(a$q%Qpq7LX^tNrKBm}?BX0b~`
znvdN6orZ=6W@i53+{wc=Yk2_r2ZjT8o0@EZFAg56$c@it5u$8%|IO5QM?y?aE%ItH
z1wc3)M$<Hs$)x<QtLHe$#5|vO_IZ{-0>ol58T|G32>aS2Og(x4z?p480`~NrX3WT7
z3qf}zR0etWH$s%;w~0i8!LLsNpoKpJz%-_rn3$~a=<4bM_c3%QbzQfwemBUz_DBV-
z8Vq@+aQn{Po>*=vRndMizd-M)Z!k?$`uPIrx^4rktgHZV?WZ9R1c3Hwizl|4Ud%5L
zJ$44(oDKlfGy@)hWHM<x#`%0+7PvKXiCsIk5ehYK2qKkU#QbxP6K4lyEEEb!5KYqp
z9sq!JI_)WTYvhuA_k(ei&##bJc>BL{n>%W0DT8|e;_<lM(b0irS-uc{FzS{MJb6D;
zx4EjS7=}SK8m$C~#bVUe)!B-opzC@~kd4SOHcgXav4{{t?tzMXKnM}AEDOUhB*?pv
z+qgRCdlOcJ6pKX^ML|{7ihj9V&NuGJvaD5&H?^t%jQ$0nP+{KuZ^XR-0000<MNUMn
GLSTYL6Q&mc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-food-platter.png b/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-food-platter.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f1b506c1b4c0197fcb21f1e674397ae86e65d47
GIT binary patch
literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%gGod|R9J=Wl+SC^a2Up)N+}_Y_Q$XxU8PW3b8-X0lMspwL@xuO2YcLI1goc=
z_Xi9VZyr}f56+9YgOs9PYQeQIiJ3(~8&m0QyQG95iHEdbGn>}Z2s-F<3U9yP=lSG)
z-xQc@uH&w3Hfwpg@AGmwpU+zy$3d25Y;A4L<mLAQ&}=rLX&SoS?#v#Z0OIjDh8_4P
z0Dq$co>eFmJT2h~uK<-w#nXMy0A6*x0R%y?B9RCLL6~_DJbeX`NCY%Zd$E`f!1{34
z`cmH<so!~Mhto8T&rdQVU1&E{EZ>qR{zFbRg4*^57SG*;|Kvpg0251si6znR_i_Km
zH}v~`Qe$FC68^p&{-ZacE0szkKk__p0YIyGp48ao%lL8liUc{Owmy;ImE1M#Rd<lO
z`V^ulj&vcL%>v^_Fbvi-?H6ejh=v&`yU($-x(?;z8v^1Cz90x#Vbka;`)D>)u$o5v
z+(7)3f>l)o07&gH_-F?Q9Tf{H29F=y!`X!nmR8qM+uj(w@ft$PK0<67-<6lBmRrc=
zip0a|?*t(avMgJ_2RkJ_x(+_m0bq9mgE_0A1Qru106>UMW3Re{W<y0LR~+$R82er@
z7zD?0z7YTbP!z>&DmLwlEAU0_=Tn@3O1Xx3$~NT^G<oYuVp-NcKL8+Kfh0+wD2g0#
zlXdACM9JRlo?HfX_zum6ii6z>dhF&@;S@zdk|a_iJ7AiouU@ZPfj|H}&qLRB*KTBT
zMVNz;oX+^5e+AC0y`3sp6h#<@0n;=|=Z`F*X_`J=*Wm;ir{wL|6GNSH3w8w<2Vxio
v0)YT1iaK(x*Xy~~hthR@Z17xj{Wtmv%X}#cu9G$=00000NkvXXu0mjfOb<D5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-raw-ingredients.png b/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/icon-raw-ingredients.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a99c71e06327c877276fca7b0e040f81f5b22af
GIT binary patch
literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&m`OxIR9J=WmQ73?Wf;eQ^Tp2cwL)>Xp}1Yx;$j;$>6&Uu8mS+>c+n;vH0nW(
zG3voY8?PEq9-4SjNs~q~9y~Q%4Aw-zRz+J^6AN_}SlBMIZh_*IWm%Yc=k-9Oth>ur
zN@`5_UnbA<J~RK{Jny_u2DY`W|5!@7g~7o=0J>hgU#{hje^s)+tE+3%0D8rW*ok#P
zWYb2Q0$5sFl6`%_f_VM9*Xu3Y!5aohCX+H6jc#~zDwUEq3Q=(jd_EtyJ=#L5cWN!S
zK90p=a-(mllGI8CrfII3uD|y8_ixto-vRusRPR*5oBRF#Edi*w1^Ij)0L!u%?y;~e
zfR-&Wzb*jNG&%e3*UZmf%MJI8kV@So0Dw>^R1jOMZMZoA`Fws$4gaYPj*pbX!y^O&
z0pjs^!Ae6z1F=|)Xf%p9JBhCA2qCCa1VRXQAAIb(kL88{yik5M{mKBjTn=}39NV_h
zt4yl=VWgDEl^kP<364B-tRhHJL8dzcz&E}Va_=3xv2B~t@hcqde|@cH;`u%nug+uJ
zHj1LGcEE9{(FI!lPF&YTaq=WnQyhNc)eRv^0t{BaCm(+3&|0p#Ho)mG&QLcqiJ~a9
z-Q5X*ZQH1-imIwC+YU}Xhv_xZygn2~LFBVc{5-^iFC8xnQF0JP+M5gFTsA|E=L+rj
z9wD^<Fw3rr?ybYMrcqTDDJ5o=frE;${y<YCx~`*oY6$K-z(DsgS<0tm2R{Aeec5>+
zKy7V(L4I!bGG~S+Xp<JoEiJU}iQu{}0Gg&D@>x_>W!}1qloG=*a9tO3d5)?bL4**5
z4?SMwSJZ*;&-UQ)c#BADYwJl*jo{P-SX^A>+~>U{e)y8aXdEf!YDZj`246jfVIYK9
zHQyNl!;9{%WAfWmMV%;`1I@v^SXi)VY-}pXU!F<R<ZokkJdVG8FJ|lQ{5Uv(<6LBB
z>=&BC9kh4s!(CpauBI9r9ZhROO37$^1a%?J++4Qu7G%0JTxjl=`|s&2$e->z#RK-6
z%17s)m9Fa&ZoBrQlDss{%E}4=2k*NRAq4n#A^)60Q50rp7Z5`5)Y~5x`IVf6=g$8`
zsI{HO9k&9Io=)+5Itxwk#>vkVfOnpIL~5FbZQF#~g8ceh0>dyE`tAZAj|UiMSF;}}
zB~QL}vg|1+I|n{UJS`&~dvI)<(XmUs9R64V2)r05_pEJg>;I|007<cKL&LXE*#H0l
M07*qoM6N<$f&yXF00000

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/meta.json b/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/meta.json
new file mode 100644
index 0000000000..e094835dab
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Kitchen/placeholder.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Icons by ThatGuyUSA (github)",
+    "states": [
+        {
+            "name": "icon-dinnerware"
+        },
+        {
+            "name": "icon-raw-ingredients"
+        },
+        {
+            "name": "icon-food-platter"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-gardening.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-botany.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-gardening.png
rename to Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-botany.png
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-cooking.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-cooking.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c42c545b2bd6263121b6ebe715c45a10869fd6a
GIT binary patch
literal 492
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R
zXPJ|C%MPe!TWW-7ny0500|$`9${@wa%D@O@c>%FBlnru?1|u_AoC(M_WMpCx0Mb!F
zoY~F-7S95*LEuvvBf|@31dV1X15j!LI|B<)rGb&L0pkLQsURC!7eGv!0%U^#6VO~H
zu*x7y3m^-s%h138B&)6XUERis9i(`+r;B4qg!|ho8+nf?@UR9vPg~I5)YKFx!SO9Y
zWLpBqj0aLvtd=VX$4+FL^JvNB`64%`3Ec0R!jRl!_$^!dTISLz&K!-x4n2ZXf&#Kz
z1rB|x)n9Y@-J!X~dxLcJ4SGHVd#w!Ty2Nz<Ve>Vq-KM9xBeL@k_ZnKPRou(?-nQ)g
zA<rdK+_Tr(TRvZHzn{<M(7zMa_fP)kJSH)l`2(Z<Ph-CD;$5InWAJqKb6Mw<&;$S`
C|A6EG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png
deleted file mode 100644
index 43cbc45f00ad0c0c9b9a64c5859447278d03a367..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}U7jwEArY;~
z2@<S}6GVEN0u8v@q;}N*|M&m=eEa|Wr#Aom|MPRY#Xg`&{VofJn?WV+6O!e)EoaU9
zdeU%D^~dRrjiLPyy=Iy;Phc@_4!NjY)RUB;5_<To+rj_u<Nl-yOiD;|Sbp{O{mD6U
z!Yid#@V3okzVYZ>B5&Qc9mQJ;?rT8p6=Y!8_22JumA85U&{Yhcu6{1-oD!M<6cbbO

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index ee07e0614f..477cc67aeb 100644
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github), icon-xenoborg-laser3 and icon-xenoborg-shield by august-sun(github), Nanite gun module sprite made by YoungThugSS14 (Github), icon-artistry by Kittygyat, icon-xenoborg-radioactive by august-sun (github), icon-xenoborg-bio beck-thompson (github), icon-xenoborg-rocket beck-thompson (github), icon-xenoborg-construction made by ThatGuyUSA (github)",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icon-chem.png & icon-mining-adv.png created by mubururu_ (github) icon-inflatable.png made by FungiFellow (GitHub), Xenoborg modules sprites by Samuka-C (github), icon-xenoborg-laser3 and icon-xenoborg-shield by august-sun(github), Nanite gun module sprite made by YoungThugSS14 (Github), icon-artistry by Kittygyat, icon-xenoborg-radioactive by august-sun (github), icon-xenoborg-bio beck-thompson (github), icon-xenoborg-rocket beck-thompson (github), icon-xenoborg-construction and icon-cooking made by ThatGuyUSA (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -25,6 +25,9 @@
         {
             "name": "icon-artifacts"
         },
+        {
+            "name": "icon-botany"
+        },
         {
             "name": "icon-cables"
         },
@@ -46,6 +49,9 @@
         {
             "name": "icon-construction"
         },
+        {
+            "name": "icon-cooking"
+        },
         {
             "name": "icon-defib"
         },
@@ -58,9 +64,6 @@
         {
             "name": "icon-artistry"
         },
-        {
-            "name": "icon-gardening"
-        },
         {
             "name": "icon-gas-analyzer"
         },
@@ -70,9 +73,6 @@
         {
             "name": "icon-grappling-gun"
         },
-        {
-            "name": "icon-harvesting"
-        },
         {
             "name": "icon-light-replacer"
         },
diff --git a/Resources/migration.yml b/Resources/migration.yml
index ebce78f22a..4769ae0d12 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -1140,6 +1140,10 @@ AsimovCircuitBoard: CrewsimovCircuitBoard
 ClothingShoesTourist: ClothingShoesSandalsBlack
 ClothingShoesWizard: ClothingShoesSandalsBrown
 
+#2026-09-28
+BorgModuleGardening: BorgModuleBotany
+BorgModuleHarvesting: BorgModuleBotany
+
 # 2026-09-29
 WallMalign: WallSolid
 WallMalignIndestructible: WallSolid

From 7d9bf9169cc6764bdfb07c2510f05877544b38e1 Mon Sep 17 00:00:00 2001
From: Orvex07 <77834935+Orvex07@users.noreply.github.com>
Date: Fri, 2 Oct 2026 00:48:05 +0000
Subject: [PATCH 12/69] Fix: hide rotate verbs for inventory items (#46277)

mo need to spin stuff in your pockets -_-
---
 Content.Shared/Rotatable/RotatableSystem.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Shared/Rotatable/RotatableSystem.cs b/Content.Shared/Rotatable/RotatableSystem.cs
index 6a14151e50..8aa285a108 100644
--- a/Content.Shared/Rotatable/RotatableSystem.cs
+++ b/Content.Shared/Rotatable/RotatableSystem.cs
@@ -3,6 +3,7 @@ using Content.Shared.Input;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Verbs;
+using Robust.Shared.Containers;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
@@ -18,6 +19,7 @@ namespace Content.Shared.Rotatable;
 public sealed partial class RotatableSystem : EntitySystem
 {
     [Dependency] private ActionBlockerSystem _actionBlocker = default!;
+    [Dependency] private SharedContainerSystem _container = default!;
     [Dependency] private SharedInteractionSystem _interaction = default!;
     [Dependency] private SharedPopupSystem _popup = default!;
     [Dependency] private SharedTransformSystem _transform = default!;
@@ -62,6 +64,7 @@ public sealed partial class RotatableSystem : EntitySystem
         if (!args.CanAccess
             || !args.CanInteract
             || !args.CanComplexInteract
+            || _container.IsEntityInContainer(uid) // No point in rotating items in an inventory
             || Transform(uid).NoLocalRotation) // Good ol prototype inheritance, eh?
             return;
 

From 470a32f16e0ce7d173e58aab1ee6761f9b9c47c7 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Fri, 2 Oct 2026 01:50:27 +0000
Subject: [PATCH 13/69] Bugfix: Fix lathe material dupe from
 RefundCurrentRecipe + tiny sprite error (#46267)

* Fix lathe material dupe due to RefundCurrentRecipe

* scammed, comments while we're here

* once more, with feeling
---
 Content.Server/Lathe/LatheSystem.cs           |  22 ++++++++++++++++--
 .../Machines/biofabricator.rsi/inserting.png  | Bin 716 -> 655 bytes
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 1a14b07a08..510ccbc921 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -460,6 +460,12 @@ namespace Content.Server.Lathe
                 _materialStorage.TryChangeMaterialAmount(uid, mat, amount * delta);
         }
 
+        /// <summary>
+        /// Aborts the recipe currently printing, putting it back on the queue.
+        /// </summary>
+        /// <remarks>
+        /// Alters batch counts where possible instead of creating a new batch.
+        /// </remarks>
         public void AbortProduction(EntityUid uid, LatheComponent? component = null)
         {
             if (!Resolve(uid, ref component))
@@ -469,20 +475,32 @@ namespace Content.Server.Lathe
             {
                 if (component.Queue.Count > 0)
                 {
-                    // Batch abandoned while printing last item, need to create a one-item batch
                     var batch = component.Queue.First();
                     if (batch.Recipe != component.CurrentRecipe)
                     {
+                        // Batch on top doesn't match, create a new one to store the current recipe.
                         var newBatch = new LatheRecipeBatch(component.CurrentRecipe.Value, 0, 1);
                         component.Queue.AddFirst(newBatch);
                     }
                     else if (batch.ItemsPrinted > 0)
                     {
+                        // Partial batch in progress, remove from the printed count
                         batch.ItemsPrinted--;
                     }
+                    else
+                    {
+                        // Batch not yet started, add to the requested set.
+                        batch.ItemsRequested++;
+                    }
+                }
+                else
+                {
+                    // Nothing exists, create a new batch to save the current recipe.
+                    var newBatch = new LatheRecipeBatch(component.CurrentRecipe.Value, 0, 1);
+                    component.Queue.AddFirst(newBatch);
                 }
 
-                RefundCurrentRecipe(uid, component);
+                // Finally, clear the current recipe.
                 component.CurrentRecipe = null;
             }
             RemCompDeferred<LatheProducingComponent>(uid);
diff --git a/Resources/Textures/Structures/Machines/biofabricator.rsi/inserting.png b/Resources/Textures/Structures/Machines/biofabricator.rsi/inserting.png
index a5145b0bc83b764eadff84381d6a32e92dd98b8c..643a0fdea639266e3b87a6fed17a9646f97b9096 100644
GIT binary patch
literal 655
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VDj{IaSW-L
z^Y-?}yju<o$3E(Zs;{0qBXY)Pz7GsOahtXVO*!r~RU&f6sxu$>W*TqFHd5TV*w`Xm
z-cG&u!7Ts2|Mr?pGKU2JZ*)AS&ImLcXqArMF7AD{SH5nW6ej%g*~Un*b<<n7tnGUr
zFLvqcUAxLTijg{Ex89be|NXntu3S7v`=!CuefHZ<uj6|8&42f&!|%6;elD*4^kL=G
zoVert_hr|=|91ZO!+i{s7*Z8$|K5$U_gU(D^&VgJp=Xsxfd<d>`2D-a|Ag(o{?nDR
z?e{`n&QrLjyhc6f{=6q^?MlU4?)I11?6{J{`f=%%b#r2lnbiq7WU=#3PrVppcm3aQ
zmEG^zclKodxySHOv|z@z{5>DnIbK|?aL0VPVekJ(VjE_eFt?q0=;?8Me%m8olj(-N
z^Y>KF`COQ@Vvf9X^>&6m@=P-X5A-mku^7~UP-u{3Jj0RT#$XH;JZYYkTzsx^i;RWT
zEJk-{cCb2SbX6<{V4+EeFP^@+=bfJm$0Os`$EOv~2NZgT-I*R=dN)=q>`UUTb76tc
zG@VZ0ykqrGbJID&;4kNo7H^ERwYPgLqWJyCN4W*obvBC1cjBJTTeM{2-1+b2=I0+V
zdLX@#5toH_XI{R1clnI}*ZWL7rLB9+%N&8ez@-@3TYH12EGem)RJBZl^_`>^IL;Xu
aKKT1rCt7_i*j%Us67h8Pb6Mw<&;$UJ*B&qc

literal 716
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3`~ihE{-7;ac^gD^pkcJac!UCv2w-bCChyG
z{%Z*N!yt4j-PL1?$;w4n&e<<nw$RgARC5Yn_?zb5y&Orp)e3g*PR7Z{>ULMB9l!Qw
z_THyOH(L@nMr<*!ja3j~Sj-^7dO(B0jnROsA&{YmDFGxjqj&3q%ZKy6J}u9l&mZ->
zr1W>x)&6hMr~kJ-**aPN{`X(Y{xC;!-xB!nv3C2fuj{rxp3NO6{(IxM>)kI|E_{5R
zQevp5{Oj%0w<n*v82?&5x5{Gw%H?zSy);%$`E%#5B*V|wyYjw%K3u!|Rp_$(UtjX?
z&f;Z!tsZqb;78fta>=5?Wi37aN96trtve8!wxo6QzXz`zg6-H-{_ITd=UNds;kGsV
zgapm@W7#Sp_cawCpO^i8&{{!$-h$L!d@5HOTctFEosP}7-qx?;SflcjDFEgv41aF^
z++7$cpj>Dwa!iv0H2~1mx|N?$vD`W-q@8oc)ET?t_Fa?J(r*l8to_=z>w@RabtZ2Y
z&RMx#<Lg!HXFc}ji-QCF^xi!B*YMD6Nsi;HT<^ngy$_fD`j&sUE0EFj@0qE}`_Jhe
z{oX0jv%d)(+Gv)6BjA6UZik=o{b}jKAENY6+_7Lih#p5+bOD8Ib~vm3{P=q3`>Epg
xXZrb*twU;*zM0gha6T4c!5Y<IW0r2UuW*Zc?p<_G5tsrQJYD@<);T3K0RTrFB%=TT


From 3bce58629d2e8cc0ebc11f7111fb623099287d2c Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Fri, 2 Oct 2026 01:56:43 +0000
Subject: [PATCH 14/69] Add rear velocity compensation for projectile spells.
 (#46275)

* Allow projectile spells to set velocity inheritance

* dot product suggestions

* finish the damn comment

* little cleanup, a few comments, use the coeff

* magic system cleanup

* no default for structs

---------

Co-authored-by: themias <themias5@gmail.com>
---
 .../Magic/Events/ProjectileSpellEvent.cs      | 10 ++++++
 Content.Shared/Magic/SharedMagicSystem.cs     | 33 +++++++++++++++----
 .../Entities/Mobs/Player/dragon.yml           |  1 +
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Content.Shared/Magic/Events/ProjectileSpellEvent.cs b/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
index ae52f5934c..56611cc09e 100644
--- a/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
+++ b/Content.Shared/Magic/Events/ProjectileSpellEvent.cs
@@ -16,4 +16,14 @@ public sealed partial class ProjectileSpellEvent : WorldTargetActionEvent
     /// </summary>
     [DataField]
     public float ProjectileSpeed = 25f;
+
+    /// <summary>
+    /// A coefficient to adjust velocity by when shooting the opposite way you're moving.
+    /// </summary>
+    /// <remarks>
+    /// Useful for slow projectiles to prevent them from feeling sluggish.
+    /// A value of 0.5 increases projectile speed by 50% if shot directly behind you.
+    /// </remarks>
+    [DataField]
+    public float RearVelocityCompensation;
 }
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 5bc4fabe10..5fcc602514 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -27,6 +27,7 @@ using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Network;
+using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -65,9 +66,11 @@ public abstract partial class SharedMagicSystem : EntitySystem
     [Dependency] private SharedStunSystem _stun = default!;
     [Dependency] private TurfSystem _turf = default!;
     [Dependency] private SharedChargesSystem _charges = default!;
-    [Dependency] private ExamineSystemShared _examine= default!;
+    [Dependency] private ExamineSystemShared _examine = default!;
     [Dependency] private AliveHumanoidTargetSystem _target = default!;
 
+    [Dependency] private EntityQuery<PhysicsComponent> _physicsQuery;
+
     private static readonly ProtoId<TagPrototype> InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell";
 
     [SubscribeLocalEvent]
@@ -131,8 +134,8 @@ public abstract partial class SharedMagicSystem : EntitySystem
         args.Handled = true;
     }
 
-        /// <summary>
-    ///     Gets spawn positions listed on <see cref="InstantSpawnSpellEvent"/>
+    /// <summary>
+    /// Gets spawn positions listed on <see cref="InstantSpawnSpellEvent"/>
     /// </summary>
     /// <exception cref="ArgumentOutOfRangeException"></exception>
     private List<EntityCoordinates> GetInstantSpawnPositions(TransformComponent casterXform, MagicInstantSpawnData data)
@@ -140,7 +143,7 @@ public abstract partial class SharedMagicSystem : EntitySystem
         switch (data)
         {
             case TargetCasterPos:
-                return new List<EntityCoordinates>(1) {casterXform.Coordinates};
+                return new List<EntityCoordinates>(1) { casterXform.Coordinates };
             case TargetInFrontSingle:
             {
                 var directionPos = casterXform.Coordinates.Offset(casterXform.LocalRotation.ToWorldVec().Normalized());
@@ -265,14 +268,32 @@ public abstract partial class SharedMagicSystem : EntitySystem
         var xform = Transform(ev.Performer);
         var fromCoords = xform.Coordinates;
         var toCoords = ev.Target;
-        var userVelocity = _physics.GetMapLinearVelocity(ev.Performer);
+        _physicsQuery.TryComp(ev.Performer, out var userPhysics);
+        var userVelocity = _physics.GetMapLinearVelocity(ev.Performer, userPhysics, xform);
+
+        var userLocalVelocity = userPhysics?.LinearVelocity ?? Vector2.Zero;
 
         // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
         var fromMap = _transform.ToMapCoordinates(fromCoords);
         var ent = Spawn(ev.Prototype, fromMap);
         var direction = _transform.ToMapCoordinates(toCoords).Position -
                          fromMap.Position;
-        _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer, ev.ProjectileSpeed);
+
+        // Check for backwards velocity compensation.
+        var compensation = 0.0f;
+        if (ev.RearVelocityCompensation > 0.0f
+            && !MathHelper.CloseToPercent(userLocalVelocity.LengthSquared(), 0.0f)
+            && !MathHelper.CloseToPercent(direction.LengthSquared(), 0.0f))
+        {
+            var dotProduct = Vector2.Dot(direction, userLocalVelocity);
+            if (dotProduct < 0.0f)
+            {
+                // Get rearward component of user's local velocity, multiply it by our coefficient.
+                compensation += ev.RearVelocityCompensation * -dotProduct / direction.Length();
+            }
+        }
+
+        _gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer, ev.ProjectileSpeed + compensation);
     }
     // End Projectile Spells
     #endregion
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index ee884cce86..7921b7239c 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -288,6 +288,7 @@
     event: !type:ProjectileSpellEvent
       prototype: ProjectileDragonsBreath
       projectileSpeed: 5
+      rearVelocityCompensation: 1.0 # slow projectile, speed it up if shooting backwards
 
 - type: entity
   parent: Smoke

From fb9401cf6a1bb01d6fa6fc2ebf2b53678ae5cbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=81da?= <ss.adasts@gmail.com>
Date: Fri, 2 Oct 2026 02:09:40 +0000
Subject: [PATCH 15/69] EntityInsertConstructionGraphStep accepts an amount
 (#46268)

* commit

* self review

* x

* format

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Construction/ConstructionSystem.Initial.cs       |  7 ++++++-
 .../Steps/ArbitraryInsertConstructionGraphStep.cs    |  2 +-
 .../Steps/EntityInsertConstructionGraphStep.cs       | 12 +++++++++++-
 .../Steps/MaterialConstructionGraphStep.cs           |  2 --
 .../construction/ui/construction-menu-presenter.ftl  |  5 ++++-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs
index a6d6739e99..50b8046736 100644
--- a/Content.Server/Construction/ConstructionSystem.Initial.cs
+++ b/Content.Server/Construction/ConstructionSystem.Initial.cs
@@ -206,6 +206,7 @@ namespace Content.Server.Construction
                         break;
 
                     case ArbitraryInsertConstructionGraphStep arbitraryStep:
+                        var toFind = arbitraryStep.Amount;
                         foreach (var entity in new HashSet<EntityUid>(EnumerateNearby(user)))
                         {
                             if (!arbitraryStep.EntityValid(entity, EntityManager, Factory))
@@ -228,8 +229,12 @@ namespace Content.Server.Construction
                             else if (!_container.Insert(entity, GetContainer(arbitraryStep.Store)))
                                 continue;
 
-                            handled = true;
                             used.Add(entity);
+                            toFind--;
+                            if (toFind > 0)
+                                continue;
+
+                            handled = true;
                             break;
                         }
 
diff --git a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
index 27a5473a87..fa7744ced4 100644
--- a/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
@@ -24,7 +24,7 @@ namespace Content.Shared.Construction.Steps
             return new ConstructionGuideEntry
             {
                 Localization = "construction-presenter-arbitrary-step",
-                Arguments = new (string, object)[]{("name", stepName)},
+                Arguments = [("name", stepName), ("amount", Amount)],
                 Icon = Icon,
             };
         }
diff --git a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
index b609223c29..21338b773d 100644
--- a/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
@@ -3,7 +3,17 @@ namespace Content.Shared.Construction.Steps
     [ImplicitDataDefinitionForInheritors]
     public abstract partial class EntityInsertConstructionGraphStep : ConstructionGraphStep
     {
-        [DataField("store")] public string Store { get; private set; } = string.Empty;
+        /// <summary>
+        /// A container ID to store the entity in.
+        /// </summary>
+        [DataField]
+        public string Store { get; private set; } = string.Empty;
+
+        /// <summary>
+        /// How many of the entity is needed.
+        /// </summary>
+        [DataField]
+        public int Amount { get; private set; } = 1;
 
         public abstract bool EntityValid(EntityUid uid, IEntityManager entityManager, IComponentFactory compFactory);
     }
diff --git a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
index b1ae9cbdf7..8a9d7fa080 100644
--- a/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -13,8 +13,6 @@ namespace Content.Shared.Construction.Steps
         [DataField("material", required:true)]
         public ProtoId<StackPrototype> MaterialPrototypeId { get; private set; }
 
-        [DataField] public int Amount { get; private set; } = 1;
-
         public override void DoExamine(ExaminedEvent examinedEvent)
         {
             var material = IoCManager.Resolve<IPrototypeManager>().Index(MaterialPrototypeId);
diff --git a/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl b/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
index 7961461dd9..da89897997 100644
--- a/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
+++ b/Resources/Locale/en-US/construction/ui/construction-menu-presenter.ftl
@@ -5,5 +5,8 @@ construction-presenter-step-wrapper = {$step-number}. {$text}
 
 construction-presenter-tool-step = Use a {LOC($tool)}.
 construction-presenter-material-step = Add {$amount}x {LOC($material)}.
-construction-presenter-arbitrary-step = Add {LOC($name)}.
+construction-presenter-arbitrary-step = Add {$amount ->
+     [one]  {LOC($name)}.
+    *[many] {$amount}x {MAKEPLURAL(LOC($name))}.
+}
 construction-presenter-temperature-step = Heat to {$temperature}.

From c5b038bdc66ea820f862d145c7b82a190574a14b Mon Sep 17 00:00:00 2001
From: Rachel <60523642+11BelowStudio@users.noreply.github.com>
Date: Fri, 2 Oct 2026 11:19:57 +0000
Subject: [PATCH 16/69] 41452 arcade sign resprite (now with 300% less
 copyright infringement) (#45923)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* resolving #41452 with a totally original arcade sign

* moved the thingies around

* dangit, transparency didn't save earlier

* version with antennae, kinda like a >:╡ sorta face?

anyway I think this is the one I'll be going with.
---
 .../Structures/Wallmounts/signs.rsi/arcade.png | Bin 3126 -> 535 bytes
 .../Structures/Wallmounts/signs.rsi/meta.json  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/arcade.png
index 7cb18443529fbb6b7988d25d9e9bc151055e5cf0..a9cbc39927b83307ada351f4d74ab05c765604d7 100644
GIT binary patch
delta 510
zcmV<a0RjHD7?%W)BYy$jNkl<ZScUCZze~eF6#o1H3Q`DY>)_CCg?1~U&<>_s{{mgR
zcXZ39Q#Z%#f|K0^x3)qB2?3E71ce3!simL@u64R{N$$PmN~ME-5R$w1^1koh-97Gr
zzm7G|SgAK=%ObkFxlnR#a^%^38N2(rh|Q`N(d`cs_fN+o0DqXNL~L;6xqKO0+dK2;
z{KUfT<0sxG-}7(Tc6t3A@Dny;?*IUhGSa87FArxj*E*E})yM@}O_P1=#3Kd7k=u^T
zwv$3jfFN0xpSA!wcw8oaMSx5aCX)Mfrh(jsD%g%22rdYz{-q1xg6pPUfSdxWT2%JO
zrI)f(@kjyP{(m46tkpEhd6w6Q%BHH2tN@`{r`T}*+8F@!i_IciQ@aj?#Zm2~U<K%o
zXp!>FE<&AR6IZ0DMM%~Gt6IcSEt|O5#1*M_$A{O8@+eO!m3m`VIy^?o$WZ#U@%8Zz
zuXhzW8L?}iR7j)MH0L7|?NT8PAiC8ke{K!1rC6Q<xp&=an(&5`06FK+A<;IJNy4KE
z6Ug><#}8y|VF4T=XZMB^*p7>%T9))@r$CIL-SHEN6aGSo_~!m!`7R(cFddJOGBVnS
zOciX$6?cOO$eR&&G10|zJc9ppue=?t{A%`(AF)avT74X@fB*mh07*qoM6N<$f(M@a
ANdN!<

delta 3122
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
M07*qoM6N<$f=QSB00000

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 4833c7b814..755ab98ee3 100644
--- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign, direction_evac_glow made by moomoobeef based on existing direction_evac, 'arrivals' made by SlamBamActionman",
+    "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman, 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'direction_pods' derived by WarPigeon from existing directional signs., 'detective' derived by Soupkilove from existing security sign, direction_evac_glow made by moomoobeef based on existing direction_evac, 'arrivals' made by SlamBamActionman. 'arcade' derived by 11BelowStudio from earlier version by EmoGarbage404.",
     "states": [
         {
             "name": "ai"

From fbb81d73bfea8196616b23dc5ffa136692a014ad Mon Sep 17 00:00:00 2001
From: OxidisedGearz <108626116+OxidisedGearz@users.noreply.github.com>
Date: Fri, 2 Oct 2026 11:23:08 +0000
Subject: [PATCH 17/69] Fixes particle accelerator power level light sprites
 (#44402)

Fixes Particle Accelerator Lights

* Moves the purple lights on up-oriented power level 4 fuel chambers to line up with the base sprite.

* Removes a stray pixel on the blue light of right-oriented power level 3 fuel chambers.
---
 .../Generation/PA/fuel_chamber.rsi/unlitp2.png | Bin 746 -> 7353 bytes
 .../Generation/PA/fuel_chamber.rsi/unlitp3.png | Bin 706 -> 8399 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp2.png
index d10bee925a64505b9ecc4a9eb862697ba2acc0f9..b909267628a1395100c4c4a593bd6cd6d4e81e6b 100644
GIT binary patch
literal 7353
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
Z4L9VN&t6Od99cyJur{|ht2Xh8`wvHX67~Q9

delta 723
zcmV;^0xbQxIqC(FBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!vFvd!vV){sAK>D0)I(FK~#8N?V8C-13?gmt4CbG1x4aX(1YaehTeSzU%|YCc-MEx
zqxb?Yh=Mo4gP<4npa_b%Oxe{_lT4CH(j66g`=C<8<W&Dur+<3>jzC24fvJNUj&5zj
z_u~_MU0%V<Ze8$KJxMq_kC>TOd2DS-WnH`xfEZqwRXG<!2d@MmmWL~RrH6L{Tzo$A
zl^$LR@Nr{SJmFmj^y2IdP+Vlew>kw#AaQao;?uJnfzLg=Af?JwG)wFdAca(Ge%cC&
zKw^}UQsJ0pB7ZQg0@MXU-OUal(z^$~Dra*-2wY8Mh{i*16`+O!YHoG_?fmG;_Y<K5
z+6wy=llwa|m48<j-n<J8N>F34j3@x-V2J{7)`pA+zH|>cDUtR%1sYR8oXb73+#(%S
z0XF1@LEUVFil=vNnzy=+i|sT!K$Ro1R6<^SGC#+6+<!x0>(eJ%mw>EZls|lh%f%D2
z{*K}r0^l-;RL1&v*CtR5Ri=$BC)?5f5u~E2c;7IZ0waqR6+U4kfR980IBP+c^B~5f
z%@_%gTh84qCl}EcATOFcH=i)-fcLX&bIZwcj0E_;z4z)pKvDF^`h}_A=0ZeIkaMsE
zFM#z+pnq|YDL-+g_nYb<Sl<CuG1(a8R`sRL?$W_}0Zys_$JNZL>rd7oCMVo+3UCgV
zC;;bRi2`sAmM8${VEL1MK=Ht|+o4I(MzhIJ__YA-XNLLVN%8z3H&V$?BS*<5Q{`Wl
zK(Tmol5IXv`E>_uAMD{FG_CUBmVoQTF~~Vsv`hsMa<!-n4b$QD6)+FJWi8qQApM0%
zlZ~rp*pB%Upg&Z5M4SSggCz>UIas0qoP#9_z&TI=egFo+S=5TZ#X|r9002ovPDHLk
FV1nc+MxFow

diff --git a/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png b/Resources/Textures/Structures/Power/Generation/PA/fuel_chamber.rsi/unlitp3.png
index 2fee6e0daaafb2f7db4dc399f6a120edade6c2f6..72d01e37abaee373da182b49bc8c8b7d9351e5b4 100644
GIT binary patch
literal 8399
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

delta 683
zcmV;c0#yCaLBa))BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi
z!T<mc!T}X1N`L?W0#`{yK~#8N?V3SO!$1s0JymzmWhI1A1>ArgD=xtudH@c<f&*}X
z-hoT7V#f^tRR|$<S=dz_>ST;2X_Ji81ZF(*)X}6-7xkAtj(_batu;vEM$PrTo+$IR
zk%8GofX0tUlWaG)8WAG^8Gm$PZa5;!0}jUd;vh<Z(Mi4^!f}4#fEWQdM%#!B0WMnt
z3}7HDFE+3xz#7)hIaC5g0cJ|WEL;!xUgV2IQGlsdFb&%SmhS*x@L|3c!Dj_p=GJxy
zgbEss##ezxUw>Xt;PgCSB!U<Li2Xt!aM1Y0at@qgNK`e5Ze3-(9rpzOR$MvEMcf&{
zCG&tP_b`_Q>f9_uem#KF1Ez{9(0Fdc!FQZPfQ)ZbaQF=C43K6#k_mt@{q`~kTu%@6
zc@&!tZEJ5IaZZD`YNgMvhS~M&;|lKdFua2>EA%!Wtbch7><|b#46x9%j7L}kgwC#J
zPgDZzYWA=N;8t6{)5-&?8V(`iEC3l@*K`OGmIt)yx%m!DfX`=s!@+l0{Qzl|Ai@$r
zDFxCRDA9L>{#^j{s$J0kD)%0`4#8H>0e=M=PmLN}ec-hKY;d&4#7hC}u*6qhXf=~Z
z2WP_V&3_qC^*{PP1ES9Yvd(}OBmvAGElB{gM@#eqbdm<`TwOIZvD;`qmDGC+fX3T1
zLwa4+o*z&b3EOFH-s0$!UP7QeJn?y;l0qOo3P(=o9?*C7)-}!^pf*}%7Y<Dae9eYd
zSrFfF7C=LBtXv1q4`}%g{|qS2*Fz`zGa#iwvm{4L62R=yk_0e&v_vidzz=qA0=F;a
RCUXD)002ovPDHLkV1ktPAV>fJ


From 1dc586abed876a2006e8f98afe12a5807ab77d12 Mon Sep 17 00:00:00 2001
From: Jacktastic09 <244615355+s27jgould@users.noreply.github.com>
Date: Fri, 2 Oct 2026 12:20:20 +0000
Subject: [PATCH 18/69] Updated Solid Headband Sprites (#45482)

* Uploaded New Solid Headband equipped Sprites

* Actually Add the inhands (ooops)
---
 .../Hats/solidheadband.rsi/equipped-HELMET.png  | Bin 464 -> 593 bytes
 .../Head/Hats/solidheadband.rsi/inhand-left.png | Bin 468 -> 563 bytes
 .../Hats/solidheadband.rsi/inhand-right.png     | Bin 462 -> 546 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/equipped-HELMET.png
index 8d0b70fb48fb4da4e8242c4527c44717b17c036e..e843807acab349028b230440f183d447c164c203 100644
GIT binary patch
delta 569
zcmV-90>=H&1JMMKBYy%0Nkl<ZcmeF0%}vBG5QP^y;DG3W0=Pg29I2Hf9l(VG=m2q`
zghe0Hi!3XNJ&7Z&$Ak3bnXz|%-aJmZJ`MgC1Pm^KQ&R=pKRlg<UWhdlpaCDBU(SMJ
zH@A1w+{7lQp+R0j^*M=cDPtx;L;n7JPxaCm_Sfh86__40G=IpibaOrEuJ$w&@bUKg
zKO6&M3;2M-Yy@Dp2KA^TA|Qbn*iy?(K&i;qMoM|pdyy*=w#uKJ%?ThWBmnHz(D39<
zYiuRq5CUlKXlQu;9ro1fjsOM+>Clh>(patC9Ran2)xHY?YMJu-E)?K(vrBX3@lZg{
z$Y_2jV6=_r^M8f{az;k;Ljj|0JfAldkTWux9|{<4<N3UyfSi%h{7``RjhE&N1(X=_
zejf_(zTwh*MFsFJP9PcI;DBPB_yC(XM}j(lS^_@6r#7d6zlK!;NRs{-UteVTEUmk_
znC@DibG6bKJ*G8tKfS|VC4dKjZ*dwJo9}P{TfhgrKYtR`qYl6p@Bw`S;x&D&5<n7w
zyhui3&K^L|^bXegT_u1Yl86()Fy|#B?J@0rspldABovmCTv}ZHa+Z245>QIe`+X45
z`v&*+9}3vZVDG<orvU3hf&eRH-rk1-ylvDvPbk33n78+#0B;+$&Jzl-GUn}lD8SoB
zt@DHetTK#wdmjqueWQE({{sL3|Nmo>=?VY<00v1!K~w_(Sf2cWZQ#V-00000NkvXX
Hu0mjffoune

delta 439
zcmV;o0Z9JQ1keMJBYyw^b5ch_0Itp)=>Px$ib+I4RCr$Pnz0SSKnz962o#777=Q*g
zpk!7`Hh_i!*Z@&5LXeS+tSD0cMR&60e5xoh=kND_=j&Dr|8)zWe?<Vb6R_JKdpYy@
zxK)GO;!K^pSfq$qZ?=DKpZDwcEbru52ba1U5bQaJ)47)(+J9erYybQ8Qan%bA5?@A
zuwrCj`94R;R1)=E+ka@p9N@(Ori9A(+7N1=XJ=>v0D%;xh5({C;iZEK@FE|jFB1^O
z2`?Q?fEW2FeVKqLPI&2H0=&pa>B|H}al%Un6W~QYN?#@*iW6Qsm;f*GQTj3gQJnD7
z!321bkJ6V3h=1aQmkuVti+q&6Py*})1=-Z9_~CwD-nUqdTUcZ3ajQdC<Rup>CIO6H
zP*6c*7bWKG=u6UIFKF1y8TJe{0lB0x2|y2SxuY)ufYg>~B>;qI<{CHwSs@TWR%g+<
zm;jVi);cC2tF!1_OaMwMYaJ7i)md~dCIBUswT=nM>M$%i7ZZSz%38++WOWvuiwQtU
hWvycZvO0^-^#!ALia~ADuUh~B002ovPDHLkV1kf4zXSjP

diff --git a/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/inhand-left.png
index a667e3c1f4d31dbf86be91e0405b729429df983b..5c7e92dd7b6e245dafb3df81fdbf582932f24369 100644
GIT binary patch
delta 539
zcmV+$0_6SF1G5B>BYy$tNkl<ZcmeELJ5B^K3>~-u1)`)w6jU^D14_<H$qk_40Nenr
z5E2&vy^$<g(Ps0rN4w5jDLa#i{cJzK%oI6aCjXIu$px@b0aU=`3~&ofE&#p+xdpfd
zCTD<KU~&QQD=^&_NEJ^4QbuN*Qvn_wzqx<>v&6N=)47=|0Ds9|-`?pM!}q`g?l90E
z0CNH^F0Yo~@7<nI{f~eL+<t_-r#S&XyRS9c!_%|LHV_=aUBM0i%n3kllB^_;XFWsw
z1+NFA<l{mBg1*1LoZ&h;tZ;I9m=o~%@wOI@mll$jF6I)*J%=Csfdd=C#l7V)Cm>A@
zMWoMa=DmJ3*nir_g#dI5L%OE}w%o%XI2bK{Ew(NMNCKmYkNQg<hpw&!9146aYb4-U
zI^mT^36}~eF%*5B3W(m}QhiiFiJ|E0R6z6&m+GSeN(@C`rvjpPxKtk%P+}<hIu#JD
z!>#pD0j-Qhv!?>0b+ok}7X{#0t2GfT`_|Z|1mGkG!+-NMHzi6JtnX91+}w-+1mEH$
zCoKeIgLI5^t!8dUKus`Dn_lw65YS653Fu`m_0#A1y>d)3x0stM0577gi`VgV6Kcsb
zB|s-rn}CI#jtdg-MXJR$C7?E_w;f2RjS-T7+Tvk%@&urWk?{`z0RR6qUcYDn000I_
dL_t&o02KV$e1YM=NrC_X002ovPDHLkV1mSh?Mnav

delta 443
zcmV;s0Yv_@1k?kNBYyw^b5ch_0Itp)=>Px$j!8s8RCr$PnlWy|KoCXO7eGSDqNGC<
zsc6ClqLlQhITm$#%7_b)CRGYVmol=VNV$N~Ag#1TTzKc(%V@qE8vOU~n?LJfwhGRl
z%K82S0Wbm139tp62Y`nlTYxR#oB&(Ec>wqoU<<GXoD*ORIDZcSzXF4_z;eB5FCQnE
zHd-%DJ<Mbj6|>WN9^T&$mDYHC|M7X-{x;tM2{rnK0}!*5SslL4pAf?WVX=A$e?QF)
zD*DWV3qHN<S}`jXlSf;%m?(jIeBHzS!UfZ~YFpsHwz~TSq-Oxitf?~qwdt{R;4Ltg
zanw2lfFfyChkpsMS~-+&CICg!styxiwQ?xmOaO|cRUIb4YUNPAnE(_?t2#`8)ykoK
zGXW@)R&|&FtCd6fW&%(ot?DoVRx5|{%><xGijK?$<ySiq?&B#Pz~&5Np$Uki@ge5;
zT~M_55nup@p5u1`Nbe)$Bo784wm`fd(<jE7|7u6)P&5EqGdUo%_Yt4~ayC%<9Res_
lfzs<U0i`QYdVTi^xB?y}k3lG=kbM9E002ovPDHLkV1i79zybgO

diff --git a/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/solidheadband.rsi/inhand-right.png
index 5060aea6da8a4e818a7b852acc4db0f8c097d26d..95d394ecabae0e22177fe3e6e5d3ffa080225586 100644
GIT binary patch
delta 522
zcmV+l0`>jQ1EK_wBYy$cNkl<ZcmeF0Jx&8L5QP_RK!GUf5Cs(t+<=m^QgQ=mH~=?5
z5kleupf8f8Rg~SC+1UGIKco@a*q(Xw`FT_LylebV02((yCkMy@jT6ujXxspL3F-*w
z2sBPWN1$;7=vSb*BXH<=0XQVm+Or(s+3}nE$3M@!wakg=b$>bF`u47iBwZ2&I??OZ
z-~#abz3VP6ue>=Iorg~JdPSH39-f}}_W#*^d2=p0FX>FWEit12Qj(O^O175qq&Mjw
z(=`f!h3~H~XZ+t<cy$i~fF4PBsnGoA$J-`AB%SC+KYgHoC<Xzrcxcg<zPI`q1VEEe
zgebxDRsy{Q`hP9WqX0-^C0O&gNB<~*H8+<_n*ih@xz;?EE;+y=RQtFbQ2P#B{mB6q
zq1wmgfZBK1>Q4@^2-Q9=2h_g9R)2DUMX2_1IiR*3j`kx5M2XclUk<2kN2C3O9AI5D
zMT<w~m#Q5CfZ)E6{%6KY1~<Ok^bk4ggaJ?-5d@-mo_{mA?a2v#5&%TZ*>uTTlK_+y
zG<R+Rn49?2di`T(-T6mqgdNZ?-WL@qI(07fc==9Ue{7u_0B_#ZJR%TtEMe*Ia@TbO
zNX^q=ZV}{MD%=2;5?H$K<^h}v=pO(8|NnqCkG}u_00v1!K~w_(0Hc6`%wVIc00000
MNkvXXt^-0~f=K7@`Tzg`

delta 437
zcmZ3)a*la|ay<iMage(c!@6@aFBupZJ3L(+Ln`9l&NAdW<RIW`E-v75<dUDxnw&38
zNtyX?H?DcBdz3pPIaRT2nvzmQ;|UJ#u$wn0d{sZQ-FJrl@Bh-lXVT97&^NBDb7%Hw
zC}g)_I>z{5zJhy$a>5<PzJ@}EAEFO93Rrrq4+t9YG3;krC0H-fv;61Rl7PL@?2D3q
z>Do-uH<_vb>H6b$vl5!V+<EuyPT}^mCT=XjQ<eTcJh69vfBr=)m6$8dEmvQa+<jXV
z#wunrp**DPo%!nrzcZTCPKW9xW_E_kz7W^`!sz^K<KtCE3fnSPoSbq#`EZcrgiVPh
zxl#>&3~T+FE^sdR>d9cmSii-N(?PxAnmXePmJ7dB80IoW&1YF4?C^RrLkUwxtq`he
z6vY=={=B<m`un>UzeZKi`cu_h7uh_RS6DOGeUE=SYu^^eBJRic%h{63|4aSyl6;`~
zAw1B;DRj@|B;WX34I*b-e7f%bZGWYA^7AFOj4tzsvQigXrUZTSU<%rGyXDq1&L0f5
W%pHy?g-bRu0D-5gpUXO@geCystiwY9


From 368f8a631d2f1f9d4b03eb2685449a77ac927584 Mon Sep 17 00:00:00 2001
From: Rachel <60523642+11BelowStudio@users.noreply.github.com>
Date: Fri, 2 Oct 2026 13:58:45 +0000
Subject: [PATCH 19/69] Gave the QM a formal dress (#42949)

* QM now has a formal dress.

also fixed typo in the description of QM's formal suit.

* allows QM to equip their formal dress roundstart

* WHOOPS

* huh, the turtleneck had a typo too.

* QM formal dress lathe recipe

* supply -> cargo in desc of turtlenecks

this is to attempt to re-run the tests on git, they passed on my end, idk why they failed on git

* re-run tests pls

* fixing that typo to rerun tests

* This should resolve the merge conflict...

* fixing indentation

* okay this time for realsies

* Update meta.json

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Catalog/Fills/Lockers/dressers.yml        |   1 +
 .../Clothing/Uniforms/Jumpskirts/cargo.yml    |  11 +++++++
 .../Loadouts/Jobs/Cargo/quartermaster.yml     |   5 +++
 .../Loadouts/LoadoutGroups/loadout_groups.yml |   1 +
 .../Recipes/Lathes/Packs/clothing.yml         |   1 +
 .../Prototypes/Recipes/Lathes/clothing.yml    |   5 +++
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 1712 bytes
 .../equipped-INNERCLOTHING.png                | Bin 0 -> 1891 bytes
 .../Cargo/qmformaldress.rsi/icon.png          | Bin 0 -> 367 bytes
 .../Cargo/qmformaldress.rsi/inhand-left.png   | Bin 0 -> 666 bytes
 .../Cargo/qmformaldress.rsi/inhand-right.png  | Bin 0 -> 517 bytes
 .../Cargo/qmformaldress.rsi/meta.json         |  30 ++++++++++++++++++
 12 files changed, 54 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
index b164b49cd4..5d7827b347 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -92,6 +92,7 @@
         children:
         - id: ClothingHeadHatBeretQM
         - id: ClothingUniformJumpsuitQMFormal
+        - id: ClothingUniformJumpskirtQMFormalDress
         - id: ClothingUniformJumpsuitQMTurtleneck
         - id: ClothingUniformJumpskirtQMTurtleneck
         - id: ClothingHandsGlovesColorBrown
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml
index eb231c01d9..379497acfc 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/Jumpskirts/cargo.yml
@@ -30,3 +30,14 @@
     sprite: Clothing/Uniforms/Jumpskirts/Cargo/qmturtleskirt.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirts/Cargo/qmturtleskirt.rsi
+
+- type: entity
+  parent: [ClothingUniformBase, BaseCommandContraband]
+  id: ClothingUniformJumpskirtQMFormalDress
+  name: quartermaster's formal dress
+  description: Inspired by the quartermasters of militaries past, the perfect outfit for supplying a formal occasion.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi
diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
index 602b2d36fd..c36b83269c 100644
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -34,6 +34,11 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitQMFormal
 
+- type: loadout
+  id: QuartermasterFormalDress
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtQMFormalDress
+
 # Head
 - type: loadout
   id: QuartermasterHead
diff --git a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
index 6a8c26f755..be00d3ffbd 100644
--- a/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/LoadoutGroups/loadout_groups.yml
@@ -703,6 +703,7 @@
   - QuartermasterTurtleneck
   - QuartermasterTurtleneckSkirt
   - QuartermasterFormalSuit
+  - QuartermasterFormalDress
 
 - type: loadoutGroup
   id: QuartermasterNeck
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
index f8aa70d842..f224b95fe9 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/clothing.yml
@@ -20,6 +20,7 @@
   - ClothingUniformJumpsuitQMTurtleneck
   - ClothingUniformJumpskirtQMTurtleneck
   - ClothingUniformJumpsuitQMFormal
+  - ClothingUniformJumpskirtQMFormalDress
 
 - type: latheRecipePack
   id: ClothingCommand
diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml
index b82186ff38..3373e392ed 100644
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -524,6 +524,11 @@
   id: ClothingUniformJumpskirtQMTurtleneck
   result: ClothingUniformJumpskirtQMTurtleneck
 
+- type: latheRecipe
+  parent: BaseCommandJumpsuitRecipe
+  id: ClothingUniformJumpskirtQMFormalDress
+  result: ClothingUniformJumpskirtQMFormalDress
+
 ## RD
 
 - type: latheRecipe
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..63ab11cd69030dd18dad4da2db9d78a02042a0a5
GIT binary patch
literal 1712
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
GLSTYQcVR;S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eab7b3afa6f26397e2980a98ed7ef53e10466b4
GIT binary patch
literal 1891
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..90db145d44bc6b162978d3f1014800a505902d49
GIT binary patch
literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003tNkl<ZScUDA
zze@sP7{@=B!XYOdsL+&x4ULk{E&UDs1=ZexH8eQXR)Ou+)aW1JQgAp1N@GJJI0fG6
zdnm_2(6w~pQN(+pQ1E`1hv$7Cp7;CwctN31DE=dsWd%R^aY)DpUN<g+wT(?OnG6rN
z$E<JdvVT}h++1A-gKm?Zy>lj$39m2D9GFMad6Tk%gKm@6-jsL4V7sCNEucm*(V|$<
zaqmxXgka$6vMB*rkqxXCl4K2obWQ`nFPRaW&S_)~gK9y#rg#FvM?$n-10eXcU+xz!
zz!8FWXFBs!<vPRRkW{%oJ8O5QI6^E(K;P9FjRl_V1Mv2A8nK@3Ga3u}%i4jnyT{08
zhn3HF;Jdhm37E&T{YVGGuKb4B0>T;lC6jzUKl=r7XRlBw6bi+k;RCFoZ7Rx-&{Y5c
N002ovPDHLkV1jnoqk8}V

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fae0812a3d9c561eb78a34149ad7335157e66021
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007ENkl<Zc%1Fo
zze^io9LMo@T7@7H4x&&xG(tK!+A5(_7ncrMoy4Jte?SIB3Ocld&<wY93mHnm#W4k!
zrW`IUf}!Bz&|nb+A&H(w<e<=R2Xi68P=7p6tyjLU<+vx|;d38y7q~AdrIb=iDW#NB
zN-3r83eWT8Pv>{Sb}=JTnU>YXl=KR`x|kBFOv`pLbEWVFH!r19Nj%S!rJ0Nr+`NSA
zOEVeqJWoocQhVK0pXml)Pp0^>Kgz=wbCin<6x_Vb<>q4rH!tPl0+X}v`MBTY;A98b
zymY_4${P2pr~Gmpo{uMhbpS?U>x_&iIR5mChVQd?oG^_JSSY}D;E7Zp;4m;02Ovo2
zfX@W!9Pz5#T6ah~rpeFUGu>b!)ko6l4*X^1iJS+AfuT4_$7x;I)r5Ni#H%hMBJrx*
z^K(<i1;E9?&lW4(G;qWB+1NU5pZAX~Q>)eJA6ss(ZET&=@O{J7=Zp)m9eDRR!Qqk5
zSv>&Y=eO5g$Fq9C;gQd-rDuR~0k#9b`LG%5JP(WPEVS46ZpyfTzZv+f9&{BNmTZ%i
zXF$ki;P93S(m95QhY265w(k9q@!w#m;rk>Vr#o<c<=TNo1mME2C7aDcHVeQ@;9YAy
z7BjmOtlUTcN~^3k(=wD&N-3q3Qc5YMlu~z_jq!Qp-Xa#<ygYb3%HZH2<>CU5o=y=?
zqxULnOwPWg*=%y~eTTW+{H51t?X~!Au|18pIvBYPy{6Hf$Lmg`BUb>}9iK<80Nc~(
z$Q59F8XdU;Y)_*jS3oBl)9A<+a9iVZrPTlJH+J=O`>8?E#sB~S07*qoM6N<$f;jL+
A>i_@%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..347252ac7382335d51b81bb4aacac3fa3c15c511
GIT binary patch
literal 517
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU_9gL;uumf=k3k&UQCWM>>u8L
zV^;}_FjyGORrW&S>Q3+T7ld2*A1vgPwYj3pZ`V-r>IQR(=7he+iyNJlD!8u51g0ov
zSoLmM_p&E@EA##HsW&gSu8*JN_=nL229|`Z4z+x1m-p=C>mL1(Q>r^RZtYDm>ioSr
zIOm<5V!TD6*3(Hjc6T3q_#yPSPCkFV{t0nEr}O`}uBZ$@CO*sGJYpUHhnJNWH;NhW
zFfnX8r@N_Iuc|!#1xI7r`M-btmn&x7Tl%r}?-{P3dF@-jvM?MtFUoWs$N+Nx`mESp
zFKC*-g5m3gNh_u+E}ha@Rr%<3p@3@siiSRciWR(W-&b3^Zi&)e^G?J)n|~{#m6HqK
zK90c8ZCn{&V)m4?w&lt*eE3)+w}bDt-M!sRy)))8f+TnBsN<P4W!1^|y?#~q>pN$a
zKayO)bGvRq;MJm-vy;CcXSy=)V=?QJ%P%jkl$yTRKJVV1h3i|Vq}hLydH%k<Dbp?W
zVdQgOCs+WveA|$lV%L4`{*rCIXM8hyD{`f0&Yoc<8I%L0FK97r$WK}4y_(^++cUK-
wTtKCHPEgKyhNIgi{?u_}y<ujgt~Bc@_k!XG!Lw2tph#x$boFyt=akR{0CC>xnE(I)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/meta.json
new file mode 100644
index 0000000000..c78610c9f0
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirts/Cargo/qmformaldress.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/30892aa892a2be846592b068ab71c606e2f0c5b7, edited by emisse for ss14, monkey derivative made by brainfood1183 (github) for ss14 and edited by Ghagliiarghii (github), and QM derivatives edited by 11BelowStudio (github) based on QM formal suit sprites by Hanzdegloker",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-INNERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-INNERCLOTHING-monkey",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

From 9b33500ce2d681d382667c16b5ae4b31d0987478 Mon Sep 17 00:00:00 2001
From: deltaSpawn0040 <sydneygray64@protonmail.com>
Date: Fri, 2 Oct 2026 14:17:04 +0000
Subject: [PATCH 20/69] BananaHonk recipe requires alcohol because it is
 alcoholic (#45814)

---
 Resources/Prototypes/Recipes/Reactions/drinks.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 8e8706177a..085c32bf5a 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -185,8 +185,10 @@
       amount: 1
     Sugar:
       amount: 1
+    Vodka:
+      amount: 1
   products:
-    BananaHonk: 3
+    BananaHonk: 4
 
 - type: reaction
   id: BeepskySmash

From 1da75c08deaf57c1604e18961c168ca14d6a7312 Mon Sep 17 00:00:00 2001
From: ThatGuyUSA <thatguyusa123@gmail.com>
Date: Fri, 2 Oct 2026 14:30:37 +0000
Subject: [PATCH 21/69] Cleaned up wizard robes + Added new robes (#45076)

* osrs reference!

* outline is darker, fixed linter

* migration

* fauh

* paint!

* oops!!

* i forgot the migration, silly me

* Update hats.yml

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../VendingMachines/Inventories/magivend.yml  |  10 +-
 .../Entities/Clothing/Head/hats.yml           | 110 ++++++++++--------
 .../Entities/Clothing/OuterClothing/misc.yml  |  38 ++++--
 .../Markers/Spawners/Conditional/wizard.yml   |   2 +-
 .../Entities/Markers/Spawners/ghost_roles.yml |   2 +-
 Resources/Prototypes/Objectives/wizard.yml    |   2 +-
 .../Recipes/Cooking/meal_recipes.yml          |   2 +-
 .../Roles/Jobs/Fun/wizard_startinggear.yml    |   8 +-
 .../Hats/wizard_abyss.rsi/equipped-HELMET.png | Bin 0 -> 538 bytes
 .../Head/Hats/wizard_abyss.rsi/icon.png       | Bin 0 -> 358 bytes
 .../Hats/wizard_abyss.rsi/inhand-left.png     | Bin 0 -> 252 bytes
 .../Hats/wizard_abyss.rsi/inhand-right.png    | Bin 0 -> 252 bytes
 .../Head/Hats/wizard_abyss.rsi/meta.json      |  26 +++++
 .../equipped-HELMET-dog.png                   | Bin
 .../equipped-HELMET-hamster.png               | Bin
 .../equipped-HELMET.png                       | Bin
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 .../equipped-HELMET.png                       | Bin
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 .../equipped-HELMET.png                       | Bin
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING.png                | Bin 1959 -> 0 bytes
 .../equipped-OUTERCLOTHING-vox.png            | Bin 0 -> 657 bytes
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 1238 bytes
 .../Misc/wizard_abyss.rsi/icon.png            | Bin 0 -> 589 bytes
 .../Misc/wizard_abyss.rsi/inhand-left.png     | Bin 0 -> 478 bytes
 .../Misc/wizard_abyss.rsi/inhand-right.png    | Bin 0 -> 486 bytes
 .../Misc/wizard_abyss.rsi/meta.json           |  30 +++++
 .../equipped-OUTERCLOTHING-dog.png            | Bin
 .../equipped-OUTERCLOTHING-vox.png            | Bin
 .../equipped-OUTERCLOTHING.png                | Bin
 .../{wizard.rsi => wizard_blue.rsi}/icon.png  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../{wizard.rsi => wizard_blue.rsi}/meta.json |   0
 .../equipped-OUTERCLOTHING-vox.png            | Bin
 .../equipped-OUTERCLOTHING.png                | Bin
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 .../equipped-OUTERCLOTHING-vox.png            | Bin
 .../equipped-OUTERCLOTHING.png                | Bin 0 -> 2020 bytes
 .../icon.png                                  | Bin
 .../inhand-left.png                           | Bin
 .../inhand-right.png                          | Bin
 .../meta.json                                 |   0
 Resources/migration.yml                       |   6 +
 57 files changed, 165 insertions(+), 71 deletions(-)
 create mode 100644 Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/meta.json
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/equipped-HELMET-dog.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/equipped-HELMET-hamster.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/equipped-HELMET.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{wizardhat.rsi => wizard_blue.rsi}/meta.json (100%)
 rename Resources/Textures/Clothing/Head/Hats/{redwizard.rsi => wizard_red.rsi}/equipped-HELMET.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{redwizard.rsi => wizard_red.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{redwizard.rsi => wizard_red.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{redwizard.rsi => wizard_red.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{redwizard.rsi => wizard_red.rsi}/meta.json (100%)
 rename Resources/Textures/Clothing/Head/Hats/{violetwizard.rsi => wizard_violet.rsi}/equipped-HELMET.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{violetwizard.rsi => wizard_violet.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{violetwizard.rsi => wizard_violet.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{violetwizard.rsi => wizard_violet.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/Head/Hats/{violetwizard.rsi => wizard_violet.rsi}/meta.json (100%)
 delete mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING-vox.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/meta.json
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/equipped-OUTERCLOTHING-dog.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/equipped-OUTERCLOTHING-vox.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/equipped-OUTERCLOTHING.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{wizard.rsi => wizard_blue.rsi}/meta.json (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/equipped-OUTERCLOTHING-vox.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/equipped-OUTERCLOTHING.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{redwizard.rsi => wizard_red.rsi}/meta.json (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{violetwizard.rsi => wizard_violet.rsi}/equipped-OUTERCLOTHING-vox.png (100%)
 create mode 100644 Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/equipped-OUTERCLOTHING.png
 rename Resources/Textures/Clothing/OuterClothing/Misc/{violetwizard.rsi => wizard_violet.rsi}/icon.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{violetwizard.rsi => wizard_violet.rsi}/inhand-left.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{violetwizard.rsi => wizard_violet.rsi}/inhand-right.png (100%)
 rename Resources/Textures/Clothing/OuterClothing/Misc/{violetwizard.rsi => wizard_violet.rsi}/meta.json (100%)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
index 80bc263ac2..33bcb1e267 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
@@ -1,11 +1,13 @@
 - type: vendingMachineInventory
   id: MagiVendInventory
   startingInventory:
-    ClothingHeadHatWizard: 3
-    ClothingOuterWizard: 3
-    ClothingHeadHatRedwizard: 3
+    ClothingHeadHatWizardAbyss: 3
+    ClothingOuterWizardAbyss: 3
+    ClothingHeadHatWizardBlue: 3
+    ClothingOuterWizardBlue: 3
+    ClothingHeadHatWizardRed: 3
     ClothingOuterWizardRed: 3
-    ClothingHeadHatVioletwizard: 3
+    ClothingHeadHatWizardViolet: 3
     ClothingOuterWizardViolet: 3
     ClothingHeadHelmetWizardHelm: 3
     ClothingShoesSandalsBrown: 9
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 2d37fb5f02..35e7a68eb8 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -532,22 +532,6 @@
       HeadTop : HEAD
       HeadSide : HEAD
 
-- type: entity
-  parent: ClothingHeadHatWizardBase
-  id: ClothingHeadHatRedwizard
-  name: red wizard hat
-  description: A strange-looking red hat that most certainly belongs to a powerful magic-user.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/redwizard.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hats/redwizard.rsi
-  - type: Tag
-    tags:
-    - PetWearable
-    - ClothMade
-    - WhitelistChameleon
-
 - type: entity
   parent: [ClothingHeadBase, BaseFoldable]
   id: ClothingHeadHatSantahat
@@ -734,22 +718,6 @@
       - state: pompom-equipped-HELMET
         color: "#a60b0b"
 
-- type: entity
-  parent: ClothingHeadHatWizardBase
-  id: ClothingHeadHatVioletwizard
-  name: violet wizard hat
-  description: A strange-looking violet hat that most certainly belongs to a powerful magic-user.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/violetwizard.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hats/violetwizard.rsi
-  - type: Tag
-    tags:
-    - PetWearable
-    - ClothMade
-    - WhitelistChameleon
-
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatWarden
@@ -790,6 +758,48 @@
     slots:
     - Hair
 
+- type: entity
+  abstract: true
+  parent: [ ClothingHeadBase, BaseMagicalContraband ]
+  id: ClothingHeadHatWizardBase
+  components:
+  - type: WizardClothes
+
+- type: entity
+  parent: ClothingHeadHatWizardBase
+  id: ClothingHeadHatWizardAbyss
+  name: abyss wizard hat
+  description: A strange looking red-trimmed hat that most certainly belongs to a powerful magic-user.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/wizard_abyss.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/wizard_abyss.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - ClothMade
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingHeadHatWizardBase
+  id: ClothingHeadHatWizardBlue
+  name: blue wizard hat
+  description: A strange-looking blue hat that most certainly belongs to a powerful magic-user.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/wizard_blue.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/wizard_blue.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - CorgiWearable
+    - ClothMade
+    - Recyclable
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatWizardFake
@@ -806,30 +816,36 @@
       HeadTop : HEAD
       HeadSide : HEAD
 
-- type: entity
-  abstract: true
-  parent: [ ClothingHeadBase, BaseMagicalContraband ]
-  id: ClothingHeadHatWizardBase
-  components:
-  - type: WizardClothes
-
 - type: entity
   parent: ClothingHeadHatWizardBase
-  id: ClothingHeadHatWizard
-  name: wizard hat
-  description: A strange-looking blue hat that most certainly belongs to a powerful magic-user.
+  id: ClothingHeadHatWizardRed
+  name: red wizard hat
+  description: A strange-looking red hat that most certainly belongs to a powerful magic-user.
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hats/wizardhat.rsi
+    sprite: Clothing/Head/Hats/wizard_red.rsi
   - type: Clothing
-    sprite: Clothing/Head/Hats/wizardhat.rsi
+    sprite: Clothing/Head/Hats/wizard_red.rsi
+  - type: Tag
+    tags:
+    - PetWearable
+    - ClothMade
+    - WhitelistChameleon
+
+- type: entity
+  parent: ClothingHeadHatWizardBase
+  id: ClothingHeadHatWizardViolet
+  name: violet wizard hat
+  description: A strange-looking violet hat that most certainly belongs to a powerful magic-user.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/wizard_violet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/wizard_violet.rsi
   - type: Tag
     tags:
     - PetWearable
-    - CorgiWearable
     - ClothMade
-    - Recyclable
-    - HamsterWearable
     - WhitelistChameleon
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
index 2612bc8507..e7a050012a 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -189,31 +189,30 @@
   components:
   - type: WizardClothes
 
-# Is this wizard wearing a fanny pack???
 - type: entity
   parent: ClothingOuterWizardBase
-  id: ClothingOuterWizardViolet
-  name: violet wizard robes
-  description: A bizarre gem-encrusted violet robe that radiates magical energies.
+  id: ClothingOuterWizardAbyss
+  name: abyss wizard robes
+  description: A robe with a fashionable leather vest, it is crackling with runic energy.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_abyss.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/Misc/violetwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_abyss.rsi
   - type: Tag
     tags:
     - WhitelistChameleon
 
 - type: entity
   parent: ClothingOuterWizardBase
-  id: ClothingOuterWizard
-  name: wizard robes
+  id: ClothingOuterWizardBlue
+  name: blue wizard robes
   description: A bizarre gem-encrusted blue robe that radiates magical energies.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Misc/wizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_blue.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/Misc/wizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_blue.rsi
   - type: Tag
     tags:
     - CorgiWearable
@@ -226,9 +225,9 @@
   description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user.
   components:
   - type: Sprite
-    sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_red.rsi
   - type: Clothing
-    sprite: Clothing/OuterClothing/Misc/redwizard.rsi
+    sprite: Clothing/OuterClothing/Misc/wizard_red.rsi
   - type: Tag
     tags:
     - WhitelistChameleon
@@ -244,6 +243,21 @@
   - type: Clothing
     sprite: Clothing/OuterClothing/Misc/wizard_fake.rsi
 
+# Is this wizard wearing a fanny pack???
+- type: entity
+  parent: ClothingOuterWizardBase
+  id: ClothingOuterWizardViolet
+  name: violet wizard robes
+  description: A bizarre gem-encrusted violet robe that radiates magical energies.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Misc/wizard_violet.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Misc/wizard_violet.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingOuterBase
   id: ClothingOuterSkub
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
index 641da624ad..01670a54b8 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Conditional/wizard.yml
@@ -7,5 +7,5 @@
   - type: Sprite
     layers:
     - state: green
-    - sprite: Clothing/Head/Hats/wizardhat.rsi
+    - sprite: Clothing/Head/Hats/wizard_blue.rsi
       state: icon
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
index 969a240067..68908b7ab4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -378,5 +378,5 @@
     sprite: Markers/jobs.rsi
     layers:
     - state: green
-    - sprite: Clothing/Head/Hats/wizardhat.rsi
+    - sprite: Clothing/Head/Hats/wizard_blue.rsi
       state: icon
diff --git a/Resources/Prototypes/Objectives/wizard.yml b/Resources/Prototypes/Objectives/wizard.yml
index 7a2f1f1719..de4d7616d7 100644
--- a/Resources/Prototypes/Objectives/wizard.yml
+++ b/Resources/Prototypes/Objectives/wizard.yml
@@ -19,7 +19,7 @@
   components:
   - type: Objective
     icon:
-      sprite: Clothing/Head/Hats/wizardhat.rsi
+      sprite: Clothing/Head/Hats/wizard_blue.rsi
       state: icon
 
 - type: entity
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 829112bd29..b41403a9f0 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -348,7 +348,7 @@
   group: Savory
   solids:
     FoodBreadBun: 1
-    ClothingHeadHatWizard: 1
+    ClothingHeadHatWizardBlue: 1
 
 - type: microwaveMealRecipe
   id: RecipeSuperBiteBurger
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
index 9580f4e00e..286df95f80 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml
@@ -3,9 +3,9 @@
   id: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkBlue
-    head: ClothingHeadHatWizard
+    head: ClothingHeadHatWizardBlue
     back: ClothingBackpack # Wizard backpack?
-    outerClothing: ClothingOuterWizard
+    outerClothing: ClothingOuterWizardBlue
     shoes: ClothingShoesSandalsBrown
     id: WizardPDA
     ears: ClothingHeadsetAltWizard
@@ -18,7 +18,7 @@
   parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorRed
-    head: ClothingHeadHatRedwizard
+    head: ClothingHeadHatWizardRed
     outerClothing: ClothingOuterWizardRed
 
 - type: startingGear
@@ -26,7 +26,7 @@
   parent: WizardBlueGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorPurple
-    head: ClothingHeadHatVioletwizard
+    head: ClothingHeadHatWizardViolet
     outerClothing: ClothingOuterWizardViolet
 
 - type: chameleonOutfit
diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..61c4e846a27f0eebcc13e0156e4edb94adb02944
GIT binary patch
literal 538
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuXwsRhE&XX
zd&@Ad*+GEy!uu&cXH|>Z-mcu~9(6i>!xW>f?;SkPik)Pw;k<sqk1PG8lzv6x!HJ9h
ztB9*~{N%ZD_6#3qkKrr%=<IUM>%Y5a>1#U9TITpUFPu~8^i@H@juWxY&t~Nu5On?U
zD9Um6Ue<l<zTbJHyTvJJLPV6K>k@mhi5G7r|E!(t|F**^KJanInX~u*GDJ>W_}YrW
z;r6!K`#6tDoc+9Kz4@BA))C#tTrvUv&nhLZnKCl?rFO1+{UPl7_vez#f-jq8-h5px
zDEufe_B+F$W4~jRZ*7|!Ypyk;dTPu9<F4JscmB(ipPMvWe)a1b5!OvQulxVD8*P8L
zra&*?#iPUTqfhnP@A|eu(IewWaNW-9V!sNbH$QYifG_sCQfhyW#vKT=6no45qjlEa
z)>U??Chvl;zV5J_kXd|8;wsnv`R8A&m*k!4sXOzc?vTH&{ozZloi}5RkFDtVayim`
zzWX7d%#AvydC$$a#!fr^)abWwN7Mv|BRz8W=G>DHUCyWL{F`&(tbctBX>ZhBbUhRd
zCfQ9@ePG-Au!t#a&J8|e9_feI%aV*;*zXj%*_$5@$xWZk+8HoI)it=#zM%sFru|_1
Y`cVE}@x`gzfsxJN>FVdQ&MBb@0M~Z<ZvX%Q

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..659b6f313e0e2422c8a4901b5f4fff8de67092b1
GIT binary patch
literal 358
zcmV-s0h#`ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$AW1|)R9J=Wl(A97Fc3vQgjVdK2WnViMFda*1zgIgh8t1}paNY$<QN540X;B|
zz3CDdd9cPOtQDbNBH8}Zey_d_G#ZUYB}61dB--`YwZ;3shcO0P6IBKPfSEB2!<BY@
zwSh<oL1jX1fQZBxv&^;o{96aKsM;38_nUDXRmV`(0q;G$JAs*Nwkd;%M9vUvt;iW7
zBFkKpg`$=bk$gOd`Qj#d_%#oAFI03CyM*!0;<@{$)28n6?E(1719pCzS;0FXM<S$w
z%fZa(x(>{YX`0|dz<s99#Sk801pr(KVCE%g=@{o*8W+N9uPw42hzoBqtnR;ByQx16
zYuzViox|l{^{x!0Z;%>F3r2E<iwyi_sH9+{(P*T616a3#?6XBni~s-t07*qoM6N<$
Ef|YcZp8x;=

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5fd36cd816eb512c0d564668d0a7c90c9b46732
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB}@;
z2KUVj41s}x?(Xh3Ha7oHF#HFCjSR;%6P5#|IZJ~4g26%{VRNS0SAc?5o-U3d5v^~h
zo#i@Uz|oxiYQg*eM;6EO%f9a4a9ZLgU(=)xb7l_3BhNp6DLQB<6M5jK$<InhKOWtL
zqK0>K?|3Lwo`}D?C2CjX%jSQJwuQYryds`MvE_&IVf&1R<8LOr=Y5gc<lo$I@igad
o`~4hD;XXHhOm}oJbmXyQWLeK}{7X@UBG45Kp00i_>zopr04DBbo&W#<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..62530852dc44baf2dd41a7dd52f57b2bd176834d
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB}@;
z2KUVj41s}x?(Xh3Ha7oHF#HFCjSR;%6P5#|IZJ~4g26%{VRNS0SAc?5o-U3d5v^~h
z9ppNoz~el73-kZ~-N#+p_*_$`^M2xURrRgzPIKb;=z1t#N@jM_o#{nh*3v5JsSf<c
zZddx99cERU1Wj<!(>}cUlOk)tDWQnzT#79M_3E$gtdBT%NaSw^Tk<uoIBuR_n-8B^
nH2rrkbGo%pQT%)+!zV19vl))>ziay%=n4i;S3j3^P6<r_=(t_J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/meta.json
new file mode 100644
index 0000000000..b872bdc29e
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/wizard_abyss.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by ThatGuyUSA (github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-dog.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-dog.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET-dog.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET-hamster.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET-hamster.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET-hamster.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/wizardhat.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/wizard_blue.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/redwizard.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/redwizard.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/redwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/redwizard.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/wizard_red.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/equipped-HELMET.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/equipped-HELMET.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/equipped-HELMET.png
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/icon.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Head/Hats/violetwizard.rsi/meta.json
rename to Resources/Textures/Clothing/Head/Hats/wizard_violet.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644
index 5d1ce7594bfc623362fb0675656b1eb4ce644682..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1959
zcmV;Y2Uz%tP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000MWNkl<Zc%1E9
z+izUO8UM}YT)a*bp+Evl`5P*sN|hQgj`CPaE=qYqtb~Lr`qDt!7cODp9SERm1teAT
z4#}dvRg~OlRUr!WPauwuor_}|$Ghh;7aoph)|)uqGsnAoq{hD&uh-|y_sws<`R1FM
zpULuj^SGZut9GDjY!gtm165<2fT|s+8ruX^?LgJoCZK8uss?v?xY2HD0625#CF1h8
zVZqqg46gPI6VPb4^pX9|wa?AF9C_x+H^3M}qutb_Ai>zrG6B!yNYf0S=ON275JKR2
z9KH`{`=rQTpwVvW!_!SH-kt-c6qEjLP)hOnrMGRzmsaz39@z0P&Yo`$H4=>d<<2!E
zNdm?glu}@f0RYl8MHq(2vJ873c+AQEz#PzMxAeiO6S%b!0RW_w=w!EWJGlt}xW0G=
z*B7rKO;Zp;aD8zGNA@=hg=-Ns+AV$PsW-9Qxdx>aD5c<>!}onK#y|)GV+?7Uf>Mf`
z%d>cT-)n{K7fOPZQYfXMwT4m(X_`U^0RY&sV+XX>HXOq+gb;EIUA`MyYh+nweUUP6
zUrGt36gcPLoP!VoDW#2!LVerpk0$h%R_Af~yHf~)0E{tEO5u4P03eQI1VLcG`{F-;
z!Ag8%C{fU8xAbp*{VHxQU&ZC`PC@Iux%DIvLLh_yr4)=Y{Of;z#jTa7u>FA%KnSei
zfBgGHNGTzuv?D?Yfz}#QN__cs3xF9hQL@|p2m&9z?*jlX{`X@LLhKYUk&#E8u=bTw
zh3yYq1(GC%Qp)~rM%qjP&bgf$21+S-p3@3@PiT$4kTzj2gaBjA5<zKiENit|VfzE0
z3IZRUtmnY7ck1@@AJOc4_VToGS|d%fLJkaq)*9Vz*Z%&>dq2PDvlrLwce`EuEG*Xk
zKmyL5Zvw~*j7GbqKlt-Jj=ro=ulI<Eq6lZ-=Y7u=Gd~#Zi*NO{`|itE`@&x-1>g4(
z$8jn9n-Z|mTAF1U>h;I^zN^>kNRpXN-z$TS+VMQk<|F`^n3zD4BnZQB)A#NL=e+<S
z1SgM2h@!kMh@uGZ9Ge;N*6<L=F@z9y`7^75$w{to&Qy#sNGb8zNe^Fs-Nf`Se-A=N
zR{q}w6aGR7TLf{=`;xE=oCzR=*n$IqEkMdT;0jar0=;_R&Q-_-&IFjyGfR`H3pgLn
zvNs5fF=(yrKq#ebB$Pqn9MEXD^fOPsfh0))<Rf8znuz%A6R!_#53rH_!_!T8o(Cx<
zgb?U-Itati)&K{mPB`0lN`j0r)M_<!IvqO&%+8EbiiwHQMge26wg@41`7_@!=6=58
zNI+hgn9T=}FH3|FWLbtJ8EqbrGPiFMU+xpL;ZIAPZ#lgpgtpsGvlg5APbuvyM@In@
z0cQG{5?CpPAP69Y`|NY_m~+yXgn&E~n{|0@gE(@SX=f540CYN?Qf(C?z-&wB7iR1#
zU|@EGoO8@C%ntQ1WWD`EPrZp7OHp6;H#LDd9lEs=;phQ3`<ot#4WlDlDT~KpztEZB
z|1<9Udx32Ns&=4iY!gtm165<2fT|s+8ruX^?LgJI?+GY%g0a3vAEh8-9KJXcV6Mv<
zqtLovEHN%J)_3~ofhMHP&kD+jGn_U<>s1<yx97k)$Ah~bu_ra{i*Jpb1hX}!lt61>
z;m29{zK=<NHyESN;*3%`;KtGnD5bdY%}1EKc?AnU&Vuvt%>+USmR7G}X>}f#zWoGo
z9Amk2t<;TlDFVVU#HDXP!PMg~A_xKiz?iND0QAlUl~R~`{6&2A{pq_7YKp>{04e*g
z%B7TR>X6~+0g8YSf;3I-@f?8C_Y%$om@_~Fb0f3<!gADL3|66H?B+@__qLn~U<}y3
z^HCi5)gN%-n~wm%MgcIKW2`|CLR(eJSKpt;zF)k6U9~-kV|Q(mbKHFT&!+u+=Fm%I
z=dr!E!_T9M!_&<T-Wm=X?Up`w!L+{z0Pw=et?3b*3Al5KIe9$7v&Uft6XU7{q9{W9
zLm$uW?YBA7t1$rhe7QH`r+&z^*1AtEGD@uPXuV!Xx7)?vW_!u!?<;$qBcW94Jbgvz
zAP7K+0OuU<|7i}tdu4n?L{WruA9&!LBg-<JiF~cK#?A@%wRp>$p)AY57{eDI*GD@4
z4GvE?asG5p^e{9D&IAaN%haTl@O|H2O^s0`f;5#@Dr0H^#u$RYeLS6~Ko~OkiNEGZ
zYA-8QIKDc7b7sjm+Jsy?SfVZ07nFk4=osO$(G86YLP#r<GZ7$!fUdc>RbmQgtIz=Q
z3M`J}u}Nfr{B}5wV=K@WLLdx7lu^kz6JV6#CIeRi&&%boaU9$Ezq-1LGC^4QA0`0c
z$o?kg7k;pcaiDiS&KSe4+FqQyFx-EZxYLiP_q~S2+j9tl0BM?9t#S|qP)cFv#6x}R
z)<JD<8n^2^4gfcnu3~a>5<&>84l_#bBuPLfx75EvFtT_c7f1HC;|fWVU?GceaOwm+
tkJ{6!&4}1A0=BxL8D#`)<^7HP`U$eU6A)u>f4Tqw002ovPDHLkV1hoLs9XR5

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 0000000000000000000000000000000000000000..1194038182859ce61d95dcb945e71c7d582d3c04
GIT binary patch
literal 657
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`cm()_xXxr?
z_%AB@-{1d#TG}fhn}OluE4iZ#47aYD{8vzT>*)zp2n6PuiZ(Vj;kE|u?(Ttsfh8eM
zl@V^685lYl+`H3)=e3j{(Z2r)s7|6J$S?Rm0su`!fY;A#mH^#w+0(@_B%<~0w7Y$e
z4LDkh`<o83efpQb%gAs0KjqE0CYG57?aY`x=du3E-UjA<lE>LUF#fS&P&4+HU=*0l
z)Sz~xbnWYytPczJGoHv<v>@q>HIvc(21k3gyDmr6+?N;YElrX8A{fw<Q|Ge$xfo*u
zN3mv@*E;)f20^j-c(%X10*zBHO$}n2D5~J=?>n7!!6L5bm2<CGHm!QGCGKizf0^Na
z$GwwlreChz>h@{>gtqGAD}*n<nQ`6!7l%UHvi)o-_7AI~s+sORw~#BEf2xGptes<h
zNYXQj4W>O-g0{?I&i~t7I{r!iZJoRDvS6Ugt8j)JQuh><7OlGU{2{{)>ALoNKbP0a
zeQP-IA@t9NMZXwp82)ojI5Y2WTJS*`#;wlwLOGdtnGdX9^m3cb6@jfwQ@%BXh5A0*
zUgK)Carr8q6D~eSy;wBDR#Z7LC|+7^oyWLz%BxO>CMCOO7Y1=x1C3Sp9$o)tEl_kW
z_`N&>S8f{zqwf^~h6lz+L>cwu^^d(w^nChfPiN&mONJdxk9<Gq?#S(LSg@1n({+Zn
z9ecO?lm;_6Jg{dpI5N}YfwB|JhnI|pelom!sPN)lW1>f@JYUm0IZ3OAZ4VXRy^B7)
jv0~A2_O}1=Q|lS!k`G>%y0Jk9lvX@l{an^LB{Ts5oH8Ow

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..80ec9201c6bc3fa83bdfbfdd231d9e8e3e14c583
GIT binary patch
literal 1238
zcmV;{1S$K8P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(kV!;ARCt{2n$L^dMij@t-nA2u?QCiywosNN>?LtoSVBX?q9qVQb?U)1G=<)B
zNH2R#@umNONsqlGhui{fNXa25<q!xlOG4TuVAzDhwguyZQPHwiBuMP6dhm{RJeFk5
zSd#l=K46SSBYodIkK{M=9w3oOBoc{4BKd!k<LRtvn)gxe4bDAX1OU`w<QmXD0N7gZ
zqT`j&Y&N;>DWd<$+2yfwzr5NJ(vQ_y(=-nNR8_^AI)_bjAJ-l{@Xz0=)%<qTGyxz{
zN6`9bjyj?JUcW7J>rd>YX_}|1s(*ausDsL}GB(Y9zimyOgVnR~`fbr~GfguQCj{w-
zA)-GgYMAS~Bi~ul9}FUod5Cm?rfFWWSR85V4+gM$HZGqm!F63+K3Rg*v&W1m7K{GW
z6(vlce3K6XoDf$((gF2m6FB&lUDw6({GKmHoInqLd4A9DOJ6Tan0^={`k~KA1G-m*
zG19jA)n}2@t&q=S?Z-zWZQIaMhr#_W$VxvSWyCi0k>lSx-HC=DXReusEcCg4nNQE2
z_D-Ex@Q-y}hhZH4N`L;fhv%>UNG%Rv^;typBWFOE2;tV<d-&$-FLCScJ>J_0L+d92
zmjh0nSisU^#XqjDp2zmf7g+!JGytI8weUPq^P=@xMD)350HI|Uu=DG0aNPn{%6-w>
z%$(TI%hmN&Z)vfDmR*3NC}Zbc*TqV?k9OC>PfuSa{vIIuli=0ongL;h2LMG;(6U_|
z=eZ#V9j}CU?}snIpm<>C;GF5b<GOEb2Xwp=RBG^a2uz%!C<;1GiOT>HcHS=p>WjcN
z187ml315_?MH>2C%V8Qi%xq}d*fnV^httrH)#)KHW&j<fu^}q}e9jqU%}Re_C$i(i
zLdVx}`iL@XeThUOkw_#Gi9{m#Pa?Ehy1KsVksSTEw|}1LitFa}FFYL72Z-!Na$i6a
zmghbgu0Sit%GkgC2FP&vNtVBJ*N3@D0NC2i!Eqe!jTo-<ILXy3ih`}(L!D<e1yvY<
z8y89Q5b&xn@T_*Y54g3PgQ6%<Rh2s<Eu0q^ZbUk;dN$V7GVauB!|IGFGs2T-XqsQC
zLVo?sHbuiAPUy}bLAt{SE_`?di<QH{Pm7QP$nI=^eweB*<nyq4Hrib)5u>7LcP$k1
zL$gV$oY*5W6Sy7Vx-K@TjPR2ym(U*!e51004F2N%$GCXV_Jhu!n&-B9!!Ve<eSgHD
zETFY$TQ&?MaEm+&E(g?`&9RD$8@QDEn?KSfW_P&WG`QYFTz`W><tFW}<$rX6DJTN1
zNmGZBW2;IgG4+GX7EGj#uIq{Fa79fdMg9H#$2kDFab<M+S69#D+INjqqrspwIc-m>
z>G6(N!V)v^mR<1Aw~g@>RT|KmE9L%(JspoPJI(zF(BfeJd$UN5vuXO4%~q<WR3AW?
zChSZD)*jxpdF*F}En8JWiX}u=WV5t^YX*dQH_Kv)q-}`hrJ%A^I^tq$az)EyXJJEZ
zBiS50Z44WHq_r`Uh7H1o(#FiH5aFL-gXG`N-?fup(MxXpF8}}l07*qoM6N<$f>_IB
AX8-^I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8612c83c9b65e1f21b4896888dcbbc4ab1ccb105
GIT binary patch
literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2T4RhR9J=WmcNVBU>L_gEeS%>-buO8L5{oI^yJ_WL?~~!!%PmhsNm+};@-cZ
zyNipPpe{E!#q~<z5apmyMeqk49ZDo%V_%S#dtJQOBsFOwCocIcd7tNf-uL<DeaZ6#
zN=i!pGnFF2LI`!K@||mkO#nK0l`gIVc-tN`QZ;(LUZFj61q&e*fa5r{oGN|)l=}w<
zdj84&zV`dR50G2P(jXy(avVq7moH3dtkmiIr`p$Yssxje_djgy^L;;;h-w~{e?m$b
zd;Tq%0)!CCw(Xd2HlGtrLiRRlNGaLds1Zy;X7hP0&bDoRby;K{(MwQ|TvyvW^_d=<
zhCySczL0znntJ@u^SHGnN9tr3S8e0PeEqvO7v40AX&AJgy^8sUxODJR^B7s`hPW~N
z(`cL(4#364nq?IFW^Y{CQk!e5+IC$R&-;B!U%r0h=-ub@uLDs5N#BEew|V^Zg|>?d
z$h?9in`^7AHyhgC-o4K7_%-dTTL7Gl1CEMpSX4liL1^;v%?G43V_!#6av#^7_O4oQ
zHW-8^mSru>ODWl@&o~(eJU=|ny>FpPn3f#CvaDDQ$V=`k7^xagBzd$1pNX<8i_x_9
zZv-ThPN&mCiP9+4j-zyXJw5IUv9RXc+A+U+LedwllF5<{EbRfg1)TlyB#GAdJTWCD
bC29NwZLqPpd_6#F00000NkvXXu0mjf2vQcg

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..a480c334d03d98d852eafec1fec0f7cbbf6fd0c0
GIT binary patch
literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zXL!0ehE&XX
zduwCXAqNTe5A|LP7i>uok6&1#)z`Z2ryBdqfcXpZ1H9%r95H_({31YR&ZDUGmnw7b
z#K^4La_7QJt0`=TVfxeO6n**6%*k1E|EXR%XNA0j3k-beXVIHvCdFG@xah(wzUCE@
zuePr@`t^5TVRWGJmFMZpPyYOUTs`XU!pYUTHY+<a7*>Ru9P3uFWO9%>Zhc!=Fn0Be
zD_=h<8FZb0wc<nyvxD~1NuRIwX)HBhxMX`<X#Xjddu|Jv4H_5NX(j*Vyrw1fHBeHx
zBk+%!+DEfFYgX@`z52@JS9|wJZJ%mx*PSfxIeqCX$H$usj2P<IKCV5Q9{6KRmh%_Y
zM_0abvh?5hD|TLb{?y5(SKF3cE0{L>ytF^e6F^$J@^5_g^M7VH?JFv(w!P}!&MaVh
zc**Der5t9iBCUD-@`p;xXJqSN{LOeHEI8rN$#)<2`J@+r`4DU_ptxm~+{ZFDAXmrx
z>Jqg~tJ%>{f&4XMfgK%jQO`aWv29U|(ro>De_8I=*gb!FHnlZ$edIm1an{Ty?%ox^
P2xIVc^>bP0l+XkKem&S{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f98453e36067763fd3905dc4a3b7feca3db629c8
GIT binary patch
literal 486
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z7kIijhE&XX
zduyW?v!M*zhxc6yTQsg5<jeDW6k^4-?(CI?7F+xuNO#;3p7Kcg2TSP$zPamG&+QH_
ze09x{J$ed{U%mMIjM*|@`m*=F_}&~Obm-&V`7O;V41zFl(f-j*tJ!Cl&3T($QssO;
z|N7IXt6S>!=gZD^uiLHX-p(HQ`|o4nx%V#2y8j}?i<9BXsiu#2y8kgMa5UW!chpqf
zx=G^i<DKbe<0JBT7%oP+zkSM{xz>>3jQaBvRsT{8e};1zG&&`R9I9f?PIUy*ELxv0
zL~?z;edOtOzn9liudcXq_;T^P<@Fk#|7@e5FN(P7wr;NHr2A0~J4&B)sr>BCyx2Oa
znB~|3PLaHc|JOTQ`g2YEm6K%liPq`-JLk>sfP)P0p!ZYn$Hu!>zc>Hhf9~DR<y`N!
zzZSYD%W*W;;l%DkY{_f3T-))2ceC$j?jZ34t-qOOZ<xoIuVj;*eRfq*RneTx6|r8S
z4KLsD{@B^SnZaQ0-n6;d=|Q@Ut{a77mo+^W*Afz6z^xjUz2<+8`z1Y(uP-0{wEio5
ZzvTCfMW-%LNd-n6gQu&X%Q~loCICF;<naIi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/meta.json
new file mode 100644
index 0000000000..3b64b6a761
--- /dev/null
+++ b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_abyss.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by ThatGuyUSA (Github).",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-OUTERCLOTHING",
+            "directions": 4
+        },
+        {
+            "name": "equipped-OUTERCLOTHING-vox",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-dog.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING-dog.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-dog.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING-dog.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/wizard.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_blue.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/equipped-OUTERCLOTHING.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/equipped-OUTERCLOTHING.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/equipped-OUTERCLOTHING.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/redwizard.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_red.rsi/meta.json
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/equipped-OUTERCLOTHING-vox.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/equipped-OUTERCLOTHING-vox.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/equipped-OUTERCLOTHING-vox.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..081bace7f9ec2f8f3b51493ddc1784c1e690a8d9
GIT binary patch
literal 2020
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
C6})8t

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/icon.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/icon.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-left.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/inhand-right.png
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/OuterClothing/Misc/violetwizard.rsi/meta.json
rename to Resources/Textures/Clothing/OuterClothing/Misc/wizard_violet.rsi/meta.json
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 4769ae0d12..ccf0ed8c31 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -1149,3 +1149,9 @@ WallMalign: WallSolid
 WallMalignIndestructible: WallSolid
 WallMalignIndestructibleNoOcclusion: WallSolid
 MalignWindow: Window
+
+# 2026-10-01
+ClothingHeadHatWizard: ClothingHeadHatWizardBlue
+ClothingOuterWizard: ClothingOuterWizardBlue
+ClothingHeadHatRedwizard: ClothingHeadHatWizardRed
+ClothingHeadHatVioletwizard: ClothingHeadHatWizardViolet

From 5496ea026cb27b22c75fc63cb55aa549f3ffe16b Mon Sep 17 00:00:00 2001
From: TheMas3212 <TheMas3212@users.noreply.github.com>
Date: Fri, 2 Oct 2026 17:14:42 +0000
Subject: [PATCH 22/69] Add size whitelist to CrateRodentCage (#43984)

---
 .../Prototypes/Entities/Structures/Storage/Crates/crates.yml   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index 5984fb871d..325dc45eb4 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -448,6 +448,9 @@
   - type: EntityStorage
     capacity: 1
     airtight: false
+    whitelist:
+      sizes:
+      - Tiny
   - type: Fixtures
     fixtures:
       fix1:

From bf6ca7bc3185bf6783c52c7e87a83d5eae06b0b0 Mon Sep 17 00:00:00 2001
From: Khaomi <hayper1919@gmail.com>
Date: Fri, 2 Oct 2026 17:35:34 +0000
Subject: [PATCH 23/69] Fixed StrippableComponent having the wrong localization
 string (#43850)

* localization(strip): Wrong localization string

* feat: add missing parameter from merge
---
 Content.Shared/Strip/SharedStrippableSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs
index b7da60883d..39cb95e140 100644
--- a/Content.Shared/Strip/SharedStrippableSystem.cs
+++ b/Content.Shared/Strip/SharedStrippableSystem.cs
@@ -166,7 +166,7 @@ public abstract partial class SharedStrippableSystem : EntitySystem
 
         if (_inventorySystem.TryGetSlotEntity(target, slot, out _))
         {
-            _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied", ("owner", targetIdentity)), user);
+            _popupSystem.PopupCursor(Loc.GetString("strippable-component-item-slot-occupied-message", ("owner", targetIdentity)), user);
             return false;
         }
 

From 777183bef13f753fd2f61e6d98022e738de29acc Mon Sep 17 00:00:00 2001
From: Astroskier <astroskier452@gmail.com>
Date: Fri, 2 Oct 2026 17:43:39 +0000
Subject: [PATCH 24/69] Added Additional Available Alchohol Bottles to Booze
 Dispenser (#44921)

* Added Not Included Already Available Insertable Bottles to Booze Dispenser

* Removed Grenadine (it's not alchohol)

* Added Sake to Dispenser

WILL NOT WORK WITHOUT NEXT COMMIT

* Made Sake Insertable

* Sake Reversion Pt.1

* Sake Reversion pt.2

* Feedback
---
 Resources/Prototypes/Entities/Structures/Dispensers/booze.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index a393090421..30b3eee9ff 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -36,12 +36,16 @@
     containers:
       storagebase: !type:AllSelector
         children:
+        - id: DrinkAbsintheBottleFull
         - id: DrinkAleBottleFullGrowler
         - id: DrinkBeerGrowler
+        - id: DrinkBlueCuracaoBottleFull
+        - id: DrinkChampagneBottleFull
         - id: DrinkCoffeeLiqueurBottleFull
         - id: DrinkCognacBottleFull
         - id: DrinkGinBottleFull
         - id: DrinkMeadJug
+        - id: DrinkMelonLiquorBottleFull
         - id: DrinkRumBottleFull
         - id: DrinkTequilaBottleFull
         - id: DrinkVermouthBottleFull

From 5c75ec287f0b7867fc332bed3cda7792834eebbb Mon Sep 17 00:00:00 2001
From: Connor Huffine <chuffine@gmail.com>
Date: Fri, 2 Oct 2026 17:47:39 +0000
Subject: [PATCH 25/69] Move bulldog mags to syndicate (#44144)

* Move bulldog mags to syndicate

* Remove syndicate ammo from research tree

* Alphabetize

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
---
 Resources/Prototypes/Recipes/Lathes/Packs/security.yml |  2 --
 .../Prototypes/Recipes/Lathes/Packs/syndicate.yml      | 10 ++++++----
 Resources/Prototypes/Research/arsenal.yml              |  2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
index 961e8d6f99..ce4e3dd7ab 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml
@@ -120,8 +120,6 @@
   - MagazinePistolSubMachineGunUranium
   - MagazineRifleIncendiary
   - MagazineRifleUranium
-  - MagazineShotgunBeanbag
-  - MagazineShotgunIncendiary
   - SpeedLoaderMagnumIncendiary
   - SpeedLoaderMagnumUranium
 
diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
index 71d0bee2fb..dec68ec3f5 100644
--- a/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml
@@ -4,8 +4,10 @@
 - type: latheRecipePack
   id: SyndicateAmmoStatic
   recipes:
-  - MagazineShotgun
-  - MagazineShotgunEmpty
-  - MagazineShotgunSlug
-  - MagazinePistolCaselessRifle
   - MagazineBoxAntiMateriel
+  - MagazinePistolCaselessRifle
+  - MagazineShotgun
+  - MagazineShotgunBeanbag
+  - MagazineShotgunEmpty
+  - MagazineShotgunIncendiary
+  - MagazineShotgunSlug
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 5d601ace13..a363a3bf61 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -30,7 +30,6 @@
   - MagazinePistolSubMachineGunIncendiary
   - MagazineLightRifleIncendiary
   - SpeedLoaderMagnumIncendiary
-  - MagazineShotgunIncendiary
   - MagazineBoxPistolIncendiary
   - MagazineBoxMagnumIncendiary
   - MagazineBoxLightRifleIncendiary
@@ -58,7 +57,6 @@
   tier: 1
   cost: 5000
   recipeUnlocks:
-  - MagazineShotgunBeanbag
   - BoxShellTranquilizer
   - BoxBeanbag
   - WeaponDisabler

From 066ac90cfaa7bc6bb23e4de8ce734f5e3de632f9 Mon Sep 17 00:00:00 2001
From: hyperDelegate <zachary1064@gmail.com>
Date: Fri, 2 Oct 2026 18:00:58 +0000
Subject: [PATCH 26/69] Fixes Medibot line dropped by #32932 (#44226)

* Maybemaybemaybe

* Blade of YAML
---
 .../Specific/MedibotInjectOperator.cs         | 62 -------------------
 Resources/Prototypes/NPCs/medibot.yml         |  8 ++-
 2 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs

diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
deleted file mode 100644
index 9b70f7cdc4..0000000000
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using Content.Server.Chat.Systems;
-using Content.Shared.Chat;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Interaction;
-using Content.Shared.Popups;
-using Content.Shared.Silicons.Bots;
-using Robust.Shared.Audio.Systems;
-
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;
-
-public sealed partial class MedibotInjectOperator : HTNOperator
-{
-    [Dependency] private IEntityManager _entMan = default!;
-    private ChatSystem _chat = default!;
-    private MedibotSystem _medibot = default!;
-    private SharedAudioSystem _audio = default!;
-    private SharedInteractionSystem _interaction = default!;
-    private SharedPopupSystem _popup = default!;
-    private SharedSolutionContainerSystem _solutionContainer = default!;
-
-    /// <summary>
-    /// Target entity to inject.
-    /// </summary>
-    [DataField("targetKey", required: true)]
-    public string TargetKey = string.Empty;
-
-    public override void Initialize(IEntitySystemManager sysManager)
-    {
-        base.Initialize(sysManager);
-        _chat = sysManager.GetEntitySystem<ChatSystem>();
-        _medibot = sysManager.GetEntitySystem<MedibotSystem>();
-        _audio = sysManager.GetEntitySystem<SharedAudioSystem>();
-        _interaction = sysManager.GetEntitySystem<SharedInteractionSystem>();
-        _popup = sysManager.GetEntitySystem<SharedPopupSystem>();
-        _solutionContainer = sysManager.GetEntitySystem<SharedSolutionContainerSystem>();
-    }
-
-    public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status)
-    {
-        base.TaskShutdown(blackboard, status);
-        blackboard.Remove<EntityUid>(TargetKey);
-    }
-
-    public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
-    {
-        // TODO: Wat
-        var owner = blackboard.GetValue<EntityUid>(NPCBlackboard.Owner);
-
-        if (!blackboard.TryGetValue<EntityUid>(TargetKey, out var target, _entMan) || _entMan.Deleted(target))
-            return HTNOperatorStatus.Failed;
-
-        if (!_entMan.TryGetComponent<MedibotComponent>(owner, out var botComp))
-            return HTNOperatorStatus.Failed;
-
-        if (!_medibot.CheckInjectable((owner, botComp), target) || !_medibot.TryInject((owner, botComp), target))
-            return HTNOperatorStatus.Failed;
-
-        _chat.TrySendInGameICMessage(owner, Loc.GetString("medibot-finish-inject"), InGameICChatType.Speak, hideChat: true, hideLog: true);
-
-        return HTNOperatorStatus.Finished;
-    }
-}
diff --git a/Resources/Prototypes/NPCs/medibot.yml b/Resources/Prototypes/NPCs/medibot.yml
index cd15904ff6..e05b804f4f 100644
--- a/Resources/Prototypes/NPCs/medibot.yml
+++ b/Resources/Prototypes/NPCs/medibot.yml
@@ -61,4 +61,10 @@
         targetKey: Target
         components:
         - type: NPCRecentlyInjected
-
+    - !type:HTNPrimitiveTask
+      operator: !type:SpeakOperator
+        speech: !type:SingleSpeakOperatorSpeech
+          line: medibot-finish-inject
+        hidden: true
+        cooldownID: medibot-finish-inject
+        cooldown: 5

From e784f10f1411e728c0a536268c30f4e657703b8e Mon Sep 17 00:00:00 2001
From: telavivgamers <tami@tami.org.il>
Date: Fri, 2 Oct 2026 18:31:13 +0000
Subject: [PATCH 27/69] Make flashlight charge level meter update upon power
 cell removal (#45588)

* Forced UpdateLevel in HandHeldLightSystem.cs always to dirty the component to resolve visual glitch

* Revert "Forced UpdateLevel in HandHeldLightSystem.cs always to dirty the component to resolve visual glitch"

This reverts commit 95fa28f454007179dfde47f681898afd7afafef0.

* Removed spurious charge level null upon turning off flashlights
---
 Content.Server/Light/EntitySystems/HandheldLightSystem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
index 53b49d15da..91d69f1c2a 100644
--- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs
@@ -181,7 +181,6 @@ namespace Content.Server.Light.EntitySystems
 
             _lights.SetEnabled(ent, false, pointLightComponent);
             SetActivated(ent, false, ent, makeNoise);
-            ent.Comp.Level = null;
             _activeLights.Remove(ent);
             return true;
         }

From 0908314c986b0f48cb699f326f1059d4dd4c2382 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 2 Oct 2026 18:38:59 +0000
Subject: [PATCH 28/69] Update turnstiles to use Math instead of MathHelper
 (#45543)

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 Content.Shared/Doors/Systems/SharedTurnstileSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs b/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs
index b5d9f22a1c..5aad572bc8 100644
--- a/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs
+++ b/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs
@@ -121,9 +121,9 @@ public abstract partial class SharedTurnstileSystem : EntitySystem
         var rotateAngle = rot.ToWorldVec().ToAngle();
 
         var diff = Math.Abs(approachAngle - rotateAngle);
-        diff %= MathHelper.TwoPi;
+        diff %= Math.Tau;
         if (diff > Math.PI)
-            diff = MathHelper.TwoPi - diff;
+            diff = Math.Tau - diff;
 
         return diff < Math.PI / 4;
     }

From 101560b3827a9d888c9ac0986eff0147ebea7feb Mon Sep 17 00:00:00 2001
From: ProPeperos <61984624+ProPeperos@users.noreply.github.com>
Date: Fri, 2 Oct 2026 18:48:34 +0000
Subject: [PATCH 29/69] In gas mixer, the Primary port is now called Back port
 (#46271)

---
 Content.Client/Atmos/UI/GasMixerWindow.xaml               | 2 +-
 Resources/Locale/en-US/components/gas-mixer-component.ftl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml b/Content.Client/Atmos/UI/GasMixerWindow.xaml
index 1468ff55a3..8de57a2103 100644
--- a/Content.Client/Atmos/UI/GasMixerWindow.xaml
+++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml
@@ -20,7 +20,7 @@
         </BoxContainer>
         <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
             <Control MinSize="0 5" />
-            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-primary}"/>
+            <Label Text="{Loc comp-gas-mixer-ui-mixer-node-back}"/>
             <Control MinSize="5 0" />
             <LineEdit Name="MixerNodeOneInput" MinSize="60 0" />
             <Label Text=" %"/>
diff --git a/Resources/Locale/en-US/components/gas-mixer-component.ftl b/Resources/Locale/en-US/components/gas-mixer-component.ftl
index 57d1aad675..203c4b4c4d 100644
--- a/Resources/Locale/en-US/components/gas-mixer-component.ftl
+++ b/Resources/Locale/en-US/components/gas-mixer-component.ftl
@@ -1,6 +1,6 @@
 comp-gas-mixer-ui-mixer-output-pressure = Output Pressure (kPa):
 
-comp-gas-mixer-ui-mixer-node-primary = Primary Port:
+comp-gas-mixer-ui-mixer-node-back = Back Port:
 comp-gas-mixer-ui-mixer-node-side = Side Port:
 
 comp-gas-mixer-ui-mixer-set = Set

From 6f08e6b99d2a6eecbd9773c25ba5058cc7c791e0 Mon Sep 17 00:00:00 2001
From: JiyuSoftware <info@jiyu.dev>
Date: Fri, 2 Oct 2026 19:51:10 +0000
Subject: [PATCH 30/69] Fix MapRenderer decal and offset issues (#45866)

* Fix MapRenderer decal and offset issues

* Update Content.MapRenderer/Painters/DecalPainter.cs

Co-authored-by: Connor Huffine <chuffine@gmail.com>

* Condense if statements

* Backwards compatibility

Signed-off-by: Connor Huffine <chuffine@gmail.com>

---------

Signed-off-by: Connor Huffine <chuffine@gmail.com>
Co-authored-by: Connor Huffine <chuffine@gmail.com>
---
 Content.MapRenderer/Painters/DecalData.cs     |  2 +-
 Content.MapRenderer/Painters/DecalPainter.cs  | 26 ++++++++++++++++++-
 Content.MapRenderer/Painters/EntityPainter.cs | 20 +++++++++++---
 Content.MapRenderer/Painters/GridPainter.cs   | 24 +++++++++--------
 Content.MapRenderer/Painters/TilePainter.cs   | 16 +++++++++---
 5 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/Content.MapRenderer/Painters/DecalData.cs b/Content.MapRenderer/Painters/DecalData.cs
index b76113d670..009ff3df3d 100644
--- a/Content.MapRenderer/Painters/DecalData.cs
+++ b/Content.MapRenderer/Painters/DecalData.cs
@@ -2,4 +2,4 @@ using Content.Shared.Decals;
 
 namespace Content.MapRenderer.Painters;
 
-public readonly record struct DecalData(Decal Decal, float X, float Y);
+public readonly record struct DecalData(DecalIndex Index, Decal Decal, float X, float Y);
diff --git a/Content.MapRenderer/Painters/DecalPainter.cs b/Content.MapRenderer/Painters/DecalPainter.cs
index 9e68fe4548..90cba36404 100644
--- a/Content.MapRenderer/Painters/DecalPainter.cs
+++ b/Content.MapRenderer/Painters/DecalPainter.cs
@@ -36,7 +36,7 @@ public sealed class DecalPainter
         var stopwatch = new Stopwatch();
         stopwatch.Start();
 
-        decals.Sort(Comparer<DecalData>.Create((x, y) => x.Decal.ZIndex.CompareTo(y.Decal.ZIndex)));
+        decals.Sort(Comparer<DecalData>.Create(CompareDecals));
 
         if (_decalTextures.Count == 0)
         {
@@ -102,4 +102,28 @@ public sealed class DecalPainter
         // Woohoo!
         canvas.Mutate(o => o.DrawImage(image, new Point(pointX, pointY), alpha));
     }
+
+    /// <remarks>
+    /// Compares decals in the same order Client does.
+    /// <see cref="Content.Client.Decals.Overlays.DecalOverlay.CompareDecalIndex"/>
+    /// </remarks>
+    private static int CompareDecals(DecalData x, DecalData y)
+    {
+        var zComp = x.Decal.ZIndex.CompareTo(y.Decal.ZIndex);
+
+        if (zComp != 0)
+            return zComp;
+
+        var chunkXComp = x.Index.Chunk.X.CompareTo(y.Index.Chunk.X);
+
+        if (chunkXComp != 0)
+            return chunkXComp;
+
+        var chunkYComp = x.Index.Chunk.Y.CompareTo(y.Index.Chunk.Y);
+
+        if (chunkYComp != 0)
+            return chunkYComp;
+
+        return x.Index.Id.CompareTo(y.Index.Id);
+    }
 }
diff --git a/Content.MapRenderer/Painters/EntityPainter.cs b/Content.MapRenderer/Painters/EntityPainter.cs
index a2abc2bbf3..e586432244 100644
--- a/Content.MapRenderer/Painters/EntityPainter.cs
+++ b/Content.MapRenderer/Painters/EntityPainter.cs
@@ -138,16 +138,28 @@ public sealed class EntityPainter
             coloredImage.Mutate(o => o.BackgroundColor(imageColor));
 
             var (imgX, imgY) = rsi?.Size ?? (EyeManager.PixelsPerMeter, EyeManager.PixelsPerMeter);
-            var offsetX = (int)(entity.Sprite.Offset.X + customOffset.X) * EyeManager.PixelsPerMeter;
-            var offsetY = (int)(entity.Sprite.Offset.Y + customOffset.X) * EyeManager.PixelsPerMeter;
+
+            var spriteOffset = entity.Sprite.Offset + ((SpriteComponent.Layer)layer).Offset;
+
+            if (!entity.Sprite.NoRotation)
+            {
+                spriteOffset = worldRotation.RotateVec(spriteOffset);
+            }
+
+            spriteOffset += customOffset;
+
+            var offsetX = (int)MathF.Round(spriteOffset.X * EyeManager.PixelsPerMeter);
+            var offsetY = (int)MathF.Round(spriteOffset.Y * EyeManager.PixelsPerMeter);
+
             image.Mutate(o => o
                 .DrawImage(coloredImage, PixelColorBlendingMode.Multiply, PixelAlphaCompositionMode.SrcAtop, 1)
                 .Resize(imgX, imgY)
                 .Flip(FlipMode.Vertical)
                 .Rotate(spriteRotation));
 
-            var pointX = (int)entity.X + offsetX - imgX / 2;
-            var pointY = (int)entity.Y + offsetY - imgY / 2;
+            var pointX = (int)entity.X + offsetX - image.Width / 2;
+            var pointY = (int)entity.Y + offsetY - image.Height / 2;
+
             canvas.Mutate(o => o.DrawImage(image, new Point(pointX, pointY), 1));
         }
     }
diff --git a/Content.MapRenderer/Painters/GridPainter.cs b/Content.MapRenderer/Painters/GridPainter.cs
index 47cf2fcc3d..06ba7bcaf0 100644
--- a/Content.MapRenderer/Painters/GridPainter.cs
+++ b/Content.MapRenderer/Painters/GridPainter.cs
@@ -7,6 +7,7 @@ using System.Runtime.InteropServices;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Timing;
@@ -106,22 +107,23 @@ namespace Content.MapRenderer.Painters
 
             var decals = new Dictionary<EntityUid, List<DecalData>>();
             var query = _sEntityManager.AllEntityQueryEnumerator<MapGridComponent>();
+            var chunkEntities = _sEntityManager.System<ChunkEntitySystem>();
+            var decalChunkQuery = _sEntityManager.GetEntityQuery<DecalChunkComponent>();
 
             while (query.MoveNext(out var uid, out var grid))
             {
-                // TODO this needs to use the client entity manager because the client
-                // actually has the correct z-indices for decals for some reason when the server doesn't,
-                // BUT can't do that yet because the client hasn't actually received everything yet
-                // for some reason decal moment i guess.
-                if (_sEntityManager.TryGetComponent<DecalGridComponent>(uid, out var comp))
+                foreach (var chunk in chunkEntities.GetChunks(uid))
                 {
-                    foreach (var chunk in comp.ChunkCollection.ChunkCollection.Values)
+                    if (!decalChunkQuery.TryGetComponent(chunk.Owner, out var decalComp))
                     {
-                        foreach (var decal in chunk.Decals.Values)
-                        {
-                            var (x, y) = TransformLocalPosition(decal.Coordinates, grid);
-                            decals.GetOrNew(uid).Add(new DecalData(decal, x, y));
-                        }
+                        continue;
+                    }
+
+                    foreach (var (id, decal) in decalComp.Decals)
+                    {
+                        var (x, y) = TransformLocalPosition(decal.Coordinates, grid);
+                        var index = new DecalIndex(chunk.Comp.Chunk, id);
+                        decals.GetOrNew(uid).Add(new DecalData(index, decal, x, y));
                     }
                 }
             }
diff --git a/Content.MapRenderer/Painters/TilePainter.cs b/Content.MapRenderer/Painters/TilePainter.cs
index 114db8cb5e..fccf122c17 100644
--- a/Content.MapRenderer/Painters/TilePainter.cs
+++ b/Content.MapRenderer/Painters/TilePainter.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 using Robust.Client.Graphics;
-using Robust.Client.ResourceManagement;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -32,6 +31,13 @@ namespace Content.MapRenderer.Painters
             _sMapSystem = esm.GetEntitySystem<SharedMapSystem>();
         }
 
+        /// <summary>
+        /// Run the TilePainter, collecting all decal images and painting them on the tiles.
+        /// </summary>
+        /// <param name="gridCanvas">The image representation of the grid.</param>
+        /// <param name="gridUid">The UID of the grid.</param>
+        /// <param name="grid">The <see cref="MapGridComponent"/> of the grid.</param>
+        /// <param name="customOffset">A vector offset that will shift the decals.</param>
         public void Run(Image gridCanvas, EntityUid gridUid, MapGridComponent grid, Vector2 customOffset = default)
         {
             var stopwatch = new Stopwatch();
@@ -45,7 +51,9 @@ namespace Content.MapRenderer.Painters
             var images = GetTileImages(_sTileDefinitionManager, _resManager, tileSize);
             var i = 0;
 
-            _sMapSystem.GetAllTiles(gridUid, grid).AsParallel().ForAll(tile =>
+            _sMapSystem.GetAllTiles(gridUid, grid)
+                .AsParallel()
+                .ForAll(tile =>
             {
                 var path = _sTileDefinitionManager[tile.Tile.TypeId].Sprite.ToString();
 
@@ -54,7 +62,9 @@ namespace Content.MapRenderer.Painters
 
                 var x = (int) (tile.X + xOffset + customOffset.X);
                 var y = (int) (tile.Y + yOffset + customOffset.Y);
-                var image = images[path][tile.Tile.Variant].CloneAs<Rgba32>();
+
+                // If the variant does not exist, fall back to the first variant.
+                var image = (images[path].ElementAtOrDefault(tile.Tile.Variant) ?? images[path][0]).CloneAs<Rgba32>();
 
                 switch (tile.Tile.RotationMirroring % 4)
                 {

From 06ebdd462b90c61368fca5362a7339af7d335283 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Fri, 2 Oct 2026 22:36:32 +0000
Subject: [PATCH 31/69] Cleanup: Rewrite TextScreenSystem.  Timers now wrap the
 text screen. (#45784)

* Half the way to making the text screen less jank

* quarter-assed timer

* partial update

* fleshing out timing & scrolling in update

* common IGameTiming

* Back to AppearanceData

* partial appearance data system

* funny timer states

* mostly working timer scroll (damned edge pixels)

* screen: scroll offset + hide

* SignalTimer: remove time set on text update

* extend for timer

* TextScreenVisuals: cleanup

* restore old names

* Return old names, write more comments

* fix textscreensystem ref, consistent timer frame

* comments, "TextScreenVisualsComponent"

* TextScreenTimerVisualsComponent, diff reduction

* region

* system order

* no "client-side" comments

* small bugfixes & cleanup with devicenet refactor

* consolidate string formatting

* Restore ETA/ETD text

* No need for DefaultText for regular screen text

* Address Pok's suggestions

Co-authored-by: Pok27 <113675512+Pok27@users.noreply.github.com>

* formatting

* pok suggesto round 2, blyatin-1

also clean up the string vs. display value mess

* TextScreenSystem.GetString -> TimerDisplay.ToStr

* D2 begone!

* constants to component values

* comment update + SignalTimerWindow whitespace

* a touch of numerical safety

fixes a few errors from pasting huge text

* fields aren't properties :^)

* DataDef time

* Update TextScreenSystem.cs

* Update TextScreenTimerVisualsComponent.cs

* return the pause, bunch of comments, missed a comp

---------

Co-authored-by: Pok27 <113675512+Pok27@users.noreply.github.com>
---
 .../UI/SignalTimerWindow.xaml.cs              |  17 +-
 Content.Client/TextScreen/TextScreenSystem.cs | 786 +++++++++---------
 .../TextScreen/TextScreenTimerComponent.cs    |  22 -
 .../TextScreenTimerVisualsComponent.cs        |  94 +++
 .../TextScreen/TextScreenVisualsComponent.cs  | 193 +++--
 .../Components/SignalTimerComponent.cs        |  31 +-
 .../Systems/SignalTimerSystem.cs              | 262 +++---
 .../Screens/Systems/ScreenSystem.cs           |  64 +-
 .../Wallmounts/WallmountMachines/screen.yml   |   9 +-
 .../Wallmounts/WallmountMachines/timer.yml    |  22 +-
 Resources/Textures/Effects/text.rsi/blank.png | Bin 120 -> 0 bytes
 Resources/Textures/Effects/text.rsi/meta.json |   3 -
 .../Wallmounts/screen.rsi/outer_frame.png     | Bin 230 -> 229 bytes
 .../Wallmounts/screen.rsi/screen.png          | Bin 208 -> 213 bytes
 .../Wallmounts/signalscreen.rsi/finished.png  | Bin 0 -> 120 bytes
 .../Wallmounts/signalscreen.rsi/meta.json     |  39 +-
 .../signalscreen.rsi/outer_frame.png          | Bin 0 -> 236 bytes
 .../Wallmounts/signalscreen.rsi/running.png   | Bin 0 -> 117 bytes
 .../signalscreen.rsi/signalscreen.png         | Bin 360 -> 291 bytes
 19 files changed, 853 insertions(+), 689 deletions(-)
 delete mode 100644 Content.Client/TextScreen/TextScreenTimerComponent.cs
 create mode 100644 Content.Client/TextScreen/TextScreenTimerVisualsComponent.cs
 delete mode 100644 Resources/Textures/Effects/text.rsi/blank.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signalscreen.rsi/finished.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signalscreen.rsi/outer_frame.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/signalscreen.rsi/running.png

diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
index 2e0d6aecaa..7393038d27 100644
--- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
+++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs
@@ -1,18 +1,20 @@
-using Robust.Client.UserInterface.CustomControls;
+using Content.Client.TextScreen;
 using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
-using Content.Client.TextScreen;
-using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.MachineLinking.UI;
 
+/// <summary>
+/// A simple window to edit the duration and finish message for a signal timer.
+/// </summary>
 [GenerateTypedNameReferences]
 public sealed partial class SignalTimerWindow : DefaultWindow
 {
     [Dependency] private IGameTiming _timing = default!;
 
-    private const int MaxTextLength = 5;
+    private const int MaxTextLength = 16;
 
     public event Action<string>? OnCurrentTextChanged;
     public event Action<string>? OnCurrentDelayMinutesChanged;
@@ -59,7 +61,8 @@ public sealed partial class SignalTimerWindow : DefaultWindow
 
         if (_timing.CurTime < _triggerTime.Value)
         {
-            StartTimer.Text = TextScreenSystem.TimeToString(_triggerTime.Value - _timing.CurTime);
+            var displayValue = TextScreenSystem.ConvertTimeToDisplayValue(_triggerTime.Value - _timing.CurTime, true);
+            StartTimer.Text = displayValue.ToString();
         }
         else
         {
@@ -72,7 +75,7 @@ public sealed partial class SignalTimerWindow : DefaultWindow
         if (CurrentTextEdit.Text.Length > MaxTextLength)
         {
             CurrentTextEdit.Text = CurrentTextEdit.Text.Remove(MaxTextLength);
-            CurrentTextEdit.CursorPosition = MaxTextLength;
+            CurrentTextEdit.CursorPosition = int.Min(CurrentTextEdit.CursorPosition, MaxTextLength);
         }
         OnCurrentTextChanged?.Invoke(text);
     }
@@ -89,7 +92,7 @@ public sealed partial class SignalTimerWindow : DefaultWindow
 
         foreach (var a in toRemove)
         {
-            CurrentDelayEditMinutes.Text = text.Replace(a.ToString(),"");
+            CurrentDelayEditMinutes.Text = text.Replace(a.ToString(), "");
         }
 
         if (CurrentDelayEditMinutes.Text == "")
diff --git a/Content.Client/TextScreen/TextScreenSystem.cs b/Content.Client/TextScreen/TextScreenSystem.cs
index 811b11586a..85e72acef6 100644
--- a/Content.Client/TextScreen/TextScreenSystem.cs
+++ b/Content.Client/TextScreen/TextScreenSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Collections.Frozen;
 using System.Numerics;
 using Content.Shared.TextScreen;
 using Robust.Client.GameObjects;
@@ -7,66 +7,61 @@ using Robust.Shared.Utility;
 
 namespace Content.Client.TextScreen;
 
-// TODO: This thing needs a refactor.  Distinction between Timer and TextScreen are nasty.
-
-// Overview:
-// Data is passed from server to client through <see cref="SharedAppearanceSystem.SetData"/>,
-// calling <see cref="OnAppearanceChange"/>, which calls almost everything else.
-
-// Data for the (at most one) timer is stored in <see cref="TextScreenTimerComponent"/>.
-
-// All screens have <see cref="TextScreenVisualsComponent"/>, but:
-// the update method only updates the timers, so the timercomp is added/removed by appearance changes/timing out.
-
-// Because the sprite component stores layers in a dict with no nesting, individual layers
-// have to be mapped to unique ids e.g. {"textMapKey01" : <b>{first row, second char layerstate}</b>}
-// in either the visuals or timer component.
-
 /// <summary>
-/// The TextScreenSystem draws text in the game world using 3x5 sprite states for each character.
+/// Draws text on screens using 3x5 sprite states for each character. Optionally supports scrolling text.
 /// </summary>
+/// <remarks>
+/// Data is passed from server to client through <see cref="SharedAppearanceSystem.SetData"/>,
+/// calling <see cref="OnAppearanceChange"/>. This sets <see cref="TextScreenVisualsComponent.RowData"/>,
+/// which will be drawn in the next Update call.
+/// <br/>
+/// Layers for the text screen are set up on the ComponentStartup event, and stored in tuples
+/// in the <see cref="TextScreenVisualsComponent.RowData"/>. An additional character per row is used for
+/// screens that support scrolling.
+/// </remarks>
+/// <seealso cref="TextScreenVisualsComponent"/>
+/// <seealso cref="TextScreenTimerVisualsComponent"/>
 public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisualsComponent>
 {
-    [Dependency] private IGameTiming _gameTiming = default!;
+    [Dependency] private IGameTiming _timing = default!;
 
-    [Dependency] private EntityQuery<SpriteComponent> _spriteQuery = default!;
-    [Dependency] private EntityQuery<TextScreenTimerComponent> _screenTimerQuery = default!;
+    [Dependency] private EntityQuery<SpriteComponent> _spriteQuery;
+    [Dependency] private EntityQuery<TextScreenTimerVisualsComponent> _screenTimerQuery;
 
     /// <summary>
-    /// Contains char/state Key/Value pairs. <br/>
-    /// The states in Textures/Effects/text.rsi that special character should be replaced with.
+    /// Contains the state that should be drawn for each non-alphanumeric character.
     /// </summary>
-    private static readonly Dictionary<char, string> CharStatePairs = new()
-        {
-            { '<', "angle-l" },
-            { '>', "angle-r" },
-            {'\'', "apostrophe" },
-            {'\\', "backslash" },
-            { ' ', "blank" },
-            { '[', "bracket-l" },
-            { ']', "bracket-r" },
-            { '^', "caret" },
-            { ':', "colon" },
-            { ',', "comma" },
-            { '-', "dash" },
-            { '=', "equals" },
-            { '!', "exclamation" },
-            { '#', "hash" },
-            { '(', "paren-l" },
-            { ')', "paren-r" },
-            { '%', "percent" },
-            { '.', "period" },
-            { '+', "plus" },
-            { '?', "question" },
-            { '"', "quotation" },
-            { ';', "semicolon" },
-            { '/', "slash" },
-            { '$', "speso" },
-            { '*', "star" },
-            { '_', "underscore" },
-        };
-
-    private const string DefaultState = "blank";
+    /// <remarks>
+    /// Each state is expected to be in Textures/Effects/text.rsi.
+    /// </remarks>
+    private static readonly FrozenDictionary<char, string> CharStatePairs = new Dictionary<char, string>
+    {
+        { '<', "angle-l" },
+        { '>', "angle-r" },
+        {'\'', "apostrophe" },
+        {'\\', "backslash" },
+        { '[', "bracket-l" },
+        { ']', "bracket-r" },
+        { '^', "caret" },
+        { ':', "colon" },
+        { ',', "comma" },
+        { '-', "dash" },
+        { '=', "equals" },
+        { '!', "exclamation" },
+        { '#', "hash" },
+        { '(', "paren-l" },
+        { ')', "paren-r" },
+        { '%', "percent" },
+        { '.', "period" },
+        { '+', "plus" },
+        { '?', "question" },
+        { '"', "quotation" },
+        { ';', "semicolon" },
+        { '/', "slash" },
+        { '$', "speso" },
+        { '*', "star" },
+        { '_', "underscore" },
+    }.ToFrozenDictionary();
 
     /// <summary>
     /// A string prefix for all text layers.
@@ -83,23 +78,7 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
     /// </summary>
     private const int CharWidth = 4;
 
-    /// <summary>
-    /// The maximum number of characters to display per line when scrolled.
-    /// </summary>
-    private const int MaxScrollingCharacters = 32;
-
-    /// <summary>
-    /// The longest that a message should take to cross the screen before wrapping around.
-    /// </summary>
-    private static readonly TimeSpan MaxMessageScrollTime = TimeSpan.FromSeconds(5);
-
-    /// <summary>
-    /// The longest that it should take to scroll one pixel on a screen.
-    /// </summary>
-    private static readonly TimeSpan MaxPixelScrollTime = TimeSpan.FromMilliseconds(100);
-
     #region Inherited
-    /// <inheritdoc/>
     public override void Initialize()
     {
         base.Initialize();
@@ -108,59 +87,78 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
     }
 
     /// <summary>
-    /// Called by <see cref="SharedAppearanceSystem.SetData"/> to handle text updates,
-    /// and spawn a <see cref="TextScreenTimerComponent"/> if necessary
+    /// Appearance data handler - drives the actual text/timer.
     /// </summary>
     /// <remarks>
-    /// The appearance updates are batched; order matters for both sender and receiver.
+    /// Sets <see cref="TextScreenVisualsComponent.NewTextToDisplay"/> on any change,
+    /// which will be picked up in the next Update.
+    /// Color data, updating less frequently, is updated on the layers in the call directly.
     /// </remarks>
-    protected override void OnAppearanceChange(EntityUid uid, TextScreenVisualsComponent component, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(EntityUid uid, TextScreenVisualsComponent comp, ref AppearanceChangeEvent args)
     {
-        if (!Resolve(uid, ref args.Sprite))
-            return;
-
-        if (args.AppearanceData.TryGetValue(TextScreenVisuals.Color, out var color) && color is Color)
-            component.Color = (Color)color;
-
-        // DefaultText: fallback text e.g. broadcast updates from comms consoles
-        if (args.AppearanceData.TryGetValue(TextScreenVisuals.DefaultText, out var newDefault) && newDefault is string)
-            component.Text = SegmentText((string)newDefault, component);
-
-        // ScreenText: currently rendered text e.g. the "ETA" accompanying shuttle timers
-        if (args.AppearanceData.TryGetValue(TextScreenVisuals.ScreenText, out var screenText) && screenText is string text && text != component.LastText)
+        bool anyChange;
+        if (args.TryGetData(TextScreenVisuals.Color, out Color color))
         {
-            TimeSpan? startTime = null;
-            if (args.AppearanceData.TryGetValue(TextScreenVisuals.ScreenTextTime, out var screenTextTime) && screenTextTime is TimeSpan scrollStart)
-                startTime = scrollStart;
-
-            component.TextToDraw = SegmentText(text, component);
-            ResetText((uid, component));
-            BuildTextLayers((uid, component, args.Sprite));
-            ResetScrollingState((uid, component), startTime);
-
-            // Make sure any static rows are drawn correctly.
-            // TODO: sanity pass over the text and timer screen components, simplify these drawing functions
-            DrawStaticLayers((uid, args.Sprite), component.LayerStatesToDraw);
-
-            // If any layers are scrolled, adjust them to their proper position.
-            if (component.ScrollEnabled && component.NextScrollTime.Any(x => x < _gameTiming.CurTime))
-                DrawScrolledLayers((uid, component, args.Sprite));
-        }
-
-        if (!args.AppearanceData.TryGetValue(TextScreenVisuals.TargetTime, out var time)
-            || time is not TimeSpan target)
-            return;
-
-        if (target > _gameTiming.CurTime)
-        {
-            var timer = EnsureComp<TextScreenTimerComponent>(uid);
-            timer.Target = target;
-            BuildTimerLayers((uid, timer, component));
-            DrawStaticLayers(uid, timer.LayerStatesToDraw);
+            anyChange = comp.CurrentColor != color;
+            comp.CurrentColor = color;
         }
         else
         {
-            TeardownTimer((uid, component));
+            anyChange = comp.CurrentColor != comp.Color;
+            comp.CurrentColor = comp.Color;
+        }
+
+        // Update layer color - less frequent to change, no need to change in update.
+        if (anyChange && _spriteQuery.TryComp(uid, out var sprite))
+        {
+            foreach (var row in comp.RowData)
+            {
+                foreach (var layer in row.Layers)
+                {
+                    SpriteSystem.LayerSetColor((uid, sprite), layer.Key, comp.CurrentColor);
+                }
+            }
+        }
+
+        args.TryGetData(TextScreenVisuals.ScreenText, out string? screenTextValue);
+        args.TryGetData(TextScreenVisuals.DefaultText, out string? defaultTextValue);
+
+        if (!args.TryGetData(TextScreenVisuals.ScreenTextTime, out TimeSpan? scrollTime))
+            scrollTime = _timing.CurTime;
+
+        if (_screenTimerQuery.TryComp(uid, out var timer)
+            && args.TryGetData(TextScreenVisuals.TargetTime, out TimeSpan? textTime))
+        {
+            // If we have a valid timer, draw the timer.
+            if (defaultTextValue != null && defaultTextValue != timer.FinishedText)
+            {
+                timer.FinishedText = defaultTextValue;
+                anyChange = true;
+            }
+            if (screenTextValue != null && screenTextValue != timer.RunningText)
+            {
+                timer.RunningText = screenTextValue;
+                anyChange = true;
+            }
+            if (textTime != timer.TargetTime)
+            {
+                timer.TargetTime = textTime;
+                anyChange = true;
+            }
+            comp.TextTime = scrollTime.Value;
+            comp.NewTextToDisplay = anyChange;
+        }
+        else
+        {
+            // Otherwise, if we have text, draw our text.
+            var newTextValue = screenTextValue ?? defaultTextValue;
+            if (newTextValue != comp.TextToDisplay)
+            {
+                comp.TextToDisplay = newTextValue;
+                anyChange = true;
+            }
+            comp.TextTime = scrollTime.Value;
+            comp.NewTextToDisplay = anyChange;
         }
     }
 
@@ -171,24 +169,60 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
     {
         base.Update(frameTime);
 
-        var query = EntityQueryEnumerator<TextScreenVisualsComponent>();
-        while (query.MoveNext(out var uid, out var screen))
+        // Timers: update the printed value before handling text screen logic.
+        var timerQuery = EntityQueryEnumerator<TextScreenTimerVisualsComponent>();
+        while (timerQuery.MoveNext(out var uid, out var timer))
         {
-            if (_screenTimerQuery.TryComp(uid, out var timer))
+            if (timer.TargetTime == null)
+                continue;
+
+            if (timer.TargetTime <= _timing.CurTime)
             {
-                if (_gameTiming.CurTime < timer.Target)
-                {
-                    BuildTimerLayers((uid, timer, screen));
-                    DrawStaticLayers(uid, timer.LayerStatesToDraw);
-                }
-                else
-                {
-                    TeardownTimer((uid, screen));
-                }
+                // Timer finished, draw finished text and reset timer state.
+                SetTextToDisplay(uid, timer.FinishedText);
+                UpdateTimerSprite((uid, timer), false);
+
+                timer.TargetTime = null;
+                timer.ScreenValue = new(0, 0);
             }
-            else if (screen.ScrollEnabled && screen.NextScrollTime.Any(x => x < _gameTiming.CurTime))
+            else
             {
-                DrawScrolledLayers((uid, screen));
+                // Check if we need to update our time by the value it would print.
+                var screenValue = ConvertTimeToDisplayValue(timer.TargetTime.Value - _timing.CurTime, timer.ShowCentiseconds);
+                if (screenValue == timer.ScreenValue)
+                    continue;
+
+                var timerText = GetTimerString((uid, timer), screenValue);
+                SetTextToDisplay(uid, timerText);
+                UpdateTimerSprite((uid, timer), true);
+                timer.ScreenValue = screenValue;
+            }
+        }
+
+        // Text screens: update layers on changed, scroll if needed.
+        var screenQuery = EntityQueryEnumerator<TextScreenVisualsComponent, SpriteComponent>();
+        while (screenQuery.MoveNext(out var uid, out var screen, out var sprite))
+        {
+            if (screen.NewTextToDisplay)
+            {
+                // Update text layers
+                UpdateAndDrawText((uid, screen, sprite));
+                screen.NewTextToDisplay = false;
+            }
+            else if (screen.ScrollEnabled)
+            {
+                for (var i = 0; i < screen.RowData.Length; i++)
+                {
+                    var rowData = screen.RowData[i];
+                    if (rowData.NextScroll > _timing.CurTime)
+                        continue;
+
+                    ScrollRow(ref rowData);
+                    DrawLayers((uid, screen, sprite), ref rowData, i);
+
+                    // Commit changes to struct.
+                    screen.RowData[i] = rowData;
+                }
             }
         }
     }
@@ -196,40 +230,45 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
 
     #region Public API
     /// <summary>
-    /// Returns the <paramref name="timeSpan"/> converted to a string in either HH:MM, MM:SS or potentially SS:mm format.
+    /// Converts <paramref name="duration"/> into a <see cref="TimerDisplay"/> for display.
     /// </summary>
-    /// <param name="timeSpan">TimeSpan to convert into string.</param>
-    /// <param name="getMilliseconds">Should the string be ss:ms if minutes are less than 1?</param>
-    /// <remarks>
-    /// hours, minutes, seconds, and centiseconds are each set to 2 decimal places by default.
-    /// </remarks>
-    public static string TimeToString(TimeSpan timeSpan, bool getMilliseconds = true, string hours = "D2", string minutes = "D2", string seconds = "D2", string cs = "D2")
+    /// <param name="duration">The duration to convert.</param>
+    /// <param name="showCentiseconds">If true, enables sub-second precision for small durations.</param>
+    public static TimerDisplay ConvertTimeToDisplayValue(TimeSpan duration, bool showCentiseconds)
     {
-        string firstString;
-        string lastString;
+        if (duration < TimeSpan.Zero)
+            return new(0, 0);
 
-        if (timeSpan.TotalHours >= 1)
+        var millis = duration.TotalMilliseconds;
+        if (showCentiseconds && millis < 100_000) // 9999 centiseconds, 99:99, the largest value that could fit in two fields.
         {
-            firstString = timeSpan.Hours.ToString(hours);
-            lastString = timeSpan.Minutes.ToString(minutes);
-        }
-        else if (timeSpan.TotalMinutes >= 1 || !getMilliseconds)
-        {
-            firstString = timeSpan.Minutes.ToString(minutes);
-            lastString = timeSpan.Seconds.ToString(seconds);
-        }
-        else
-        {
-            firstString = timeSpan.Seconds.ToString(seconds);
-            var centiseconds = timeSpan.Milliseconds / 10;
-            lastString = centiseconds.ToString(cs);
+            var centis = (int)millis / 10;
+            return new(centis / 100, centis % 100);
         }
 
-        return firstString + ':' + lastString;
+        if (millis < TimeSpan.MillisecondsPerHour)
+            return new(duration.Minutes, duration.Seconds);
+
+        return new(duration.Hours, duration.Minutes);
     }
 
     /// <summary>
-    /// Returns the Effects/text.rsi state string based on <paramref name="character"/>, or null if none available.
+    /// Updates the text to display for a text screen, flags an update on the next Update.
+    /// </summary>
+    public void SetTextToDisplay(Entity<TextScreenVisualsComponent?> ent, string? text)
+    {
+        if (!Resolve(ent, ref ent.Comp))
+            return;
+
+        if (ent.Comp.TextToDisplay == text)
+            return;
+
+        ent.Comp.TextToDisplay = text;
+        ent.Comp.NewTextToDisplay = true;
+    }
+
+    /// <summary>
+    /// Returns the <c>Effects/text.rsi</c> state to draw for <paramref name="character"/>, or null if none available.
     /// </summary>
     public static string? GetStateFromChar(char? character)
     {
@@ -241,7 +280,8 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
             return value;
 
         // Or else it checks if its a normal letter or digit
-        if (char.IsLetterOrDigit(character.Value))
+        // (With apologies to those using non-latin character sets)
+        if (char.IsAscii(character.Value) && char.IsLetterOrDigit(character.Value))
             return character.Value.ToString().ToLower();
 
         return null;
@@ -255,12 +295,29 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
         if (!_spriteQuery.TryComp(ent, out var sprite))
             return;
 
-        // awkward to specify a textoffset of e.g. 0.1875 in the prototype
-        ent.Comp.TextOffset = Vector2.Multiply(TextScreenVisualsComponent.PixelSize, ent.Comp.TextOffset);
-        ent.Comp.TimerOffset = Vector2.Multiply(TextScreenVisualsComponent.PixelSize, ent.Comp.TimerOffset);
+        if (ent.Comp.CurrentColor == default)
+            ent.Comp.CurrentColor = ent.Comp.Color;
 
-        ResetText((ent, ent.Comp, sprite));
-        BuildTextLayers((ent, ent.Comp, sprite));
+        // Create text layers
+        var textRsiPath = new ResPath(TextPath);
+        for (var rowIdx = 0; rowIdx < ent.Comp.RowData.Length; rowIdx++)
+        {
+            var maxIndex = ent.Comp.ScrollEnabled ? ent.Comp.RowLength + 1 : ent.Comp.RowLength;
+            var layers = ent.Comp.RowData[rowIdx].Layers;
+
+            for (var chr = 0; chr < maxIndex; chr++)
+            {
+                var newKey = TextMapKey + rowIdx + chr;
+                var layerIndex = SpriteSystem.LayerMapReserve((ent, sprite), newKey);
+                SpriteSystem.LayerSetRsi((ent, sprite), layerIndex, textRsiPath);
+                SpriteSystem.LayerSetColor((ent, sprite), layerIndex, ent.Comp.CurrentColor);
+                layers.Add((newKey, null));
+            }
+        }
+
+        // Place frame on top of text layers (obscuring the scroll trick)
+        if (ent.Comp.FrameState != null)
+            SpriteSystem.AddLayer((ent, sprite), ent.Comp.FrameState, null);
     }
 
     /// <summary>
@@ -269,308 +326,215 @@ public sealed partial class TextScreenSystem : VisualizerSystem<TextScreenVisual
     [SubscribeLocalEvent]
     private void OnUnpaused(Entity<TextScreenVisualsComponent> ent, ref EntityUnpausedEvent args)
     {
-        for (int i = 0; i < ent.Comp.NextScrollTime.Length; i++)
+        for (int i = 0; i < ent.Comp.RowData.Length; i++)
         {
-            if (ent.Comp.NextScrollTime[i] != TimeSpan.MaxValue) // Reserved value, should stay at max.
-                ent.Comp.NextScrollTime[i] += args.PausedTime;
+            var rowData = ent.Comp.RowData[i];
+            if (rowData.NextScroll != TimeSpan.MaxValue) // Reserved value, should stay at max.
+            {
+                rowData.NextScroll += args.PausedTime;
+                ent.Comp.RowData[i] = rowData;
+            }
         }
     }
     #endregion Event Handlers
 
     #region Internal
     /// <summary>
-    /// Removes the timer component, clears the sprite layer dict,
-    /// and draws <see cref="TextScreenVisualsComponent.Text"/>
+    /// Returns the string (newline separated rows) that should be displayed on a screen for a particular timer value.
     /// </summary>
-    private void TeardownTimer(Entity<TextScreenVisualsComponent> ent)
+    private string GetTimerString(Entity<TextScreenTimerVisualsComponent> ent, TimerDisplay newScreenValue)
     {
-        ent.Comp.TextToDraw = ent.Comp.Text;
+        if (ent.Comp.TimerRow < 0)
+            return ent.Comp.RunningText;
 
-        if (!_screenTimerQuery.TryComp(ent, out var timer) || !_spriteQuery.TryComp(ent, out var sprite))
-            return;
+        var strings = ent.Comp.RunningText.Split("\n");
+        var timerString = newScreenValue.ToString();
 
-        foreach (var key in timer.LayerStatesToDraw.Keys)
-            SpriteSystem.RemoveLayer((ent, sprite), key);
-
-        RemComp<TextScreenTimerComponent>(ent);
-
-        ResetText(ent);
-        BuildTextLayers((ent.Owner, ent.Comp, sprite));
-        DrawStaticLayers(ent.Owner, ent.Comp.LayerStatesToDraw);
-    }
-
-    /// <summary>
-    /// Converts string to string?[] based on
-    /// <see cref="TextScreenVisualsComponent.RowLength"/> and <see cref="TextScreenVisualsComponent.Rows"/>.
-    /// </summary>
-    private string?[] SegmentText(string text, TextScreenVisualsComponent component)
-    {
-        var segmented = new string?[component.Rows];
-
-        // Split by newlines, reduce each line to MaxCharacters
-        var sublines = text.Split("\n");
-        var length = int.Min(component.Rows, sublines.Length);
-        for (var i = 0; i < length; i++)
+        if (ent.Comp.TimerRow < strings.Length)
         {
-            var line = sublines[i].Trim();
-
-            // Ensure our string's length is within our limits.
-            var maxLength = component.ScrollEnabled ? MaxScrollingCharacters : component.RowLength;
-            if (line.Length > maxLength)
-                line = line.Substring(0, MaxScrollingCharacters);
-
-            // If the text will scroll, ensure that we have a buffer between lines.
-            if (line.Length > component.RowLength)
-                line = line.PadRight(line.Length + component.RowLength - 1);
-
-            segmented[i] = line;
+            // Timer row within array bounds.
+            strings[ent.Comp.TimerRow] = timerString;
         }
-
-        return segmented;
-    }
-
-    /// <summary>
-    /// Clears <see cref="TextScreenVisualsComponent.LayerStatesToDraw"/>, and instantiates new blank defaults.
-    /// </summary>
-    private void ResetText(Entity<TextScreenVisualsComponent, SpriteComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp2))
-            return;
-
-        var screen = ent.Comp1;
-        var sprite = (ent.Owner, ent.Comp2);
-
-        foreach (var key in screen.LayerStatesToDraw.Keys)
-            SpriteSystem.RemoveLayer(sprite, key, logMissing: false);
-
-        screen.LayerStatesToDraw.Clear();
-
-        for (var row = 0; row < screen.Rows; row++)
+        else
         {
-            for (var i = 0; i <= screen.RowLength; i++) // Extra index needed for scrolling.
+            // Extend our array until we can fit the timer row.
+            var newStrings = new string[ent.Comp.TimerRow + 1];
+            for (var i = 0; i < strings.Length; i++)
             {
-                var key = TextMapKey + row + i;
-                var layerIndex = SpriteSystem.LayerMapReserve(sprite, key);
-                screen.LayerStatesToDraw.Add(key, null);
-                SpriteSystem.LayerSetRsi(sprite, layerIndex, new ResPath(TextPath));
-                SpriteSystem.LayerSetColor(sprite, layerIndex, screen.Color);
-                SpriteSystem.LayerSetRsiState(sprite, layerIndex, DefaultState);
+                newStrings[i] = strings[i];
             }
-        }
 
-        if (screen.FrameState != null)
-        {
-            var key = TextScreenVisualLayers.Frame;
-            SpriteSystem.RemoveLayer(sprite, key, logMissing: false); // State may not exist, remove it if it does - needs to be on top of the text.
-            var layerIndex = SpriteSystem.LayerMapReserve(sprite, key);
-            SpriteSystem.LayerSetData(sprite, layerIndex, screen.FrameState);
+            for (var i = strings.Length; i < ent.Comp.TimerRow; i++)
+            {
+                newStrings[i] = "";
+            }
+
+            newStrings[ent.Comp.TimerRow] = timerString;
+
+            strings = newStrings;
         }
+        return string.Join('\n', strings);
     }
 
     /// <summary>
-    /// Sets the states in the <see cref="TextScreenVisualsComponent.LayerStatesToDraw"/> to match the component
-    /// <see cref="TextScreenVisualsComponent.TextToDraw"/> string?[].
+    /// Updates row data for a given text screen before drawing all of its rows.
     /// </summary>
     /// <remarks>
-    /// Remember to set <see cref="TextScreenVisualsComponent.TextToDraw"/> to a string?[] first.
+    /// Should be called whenever the screen has updates to its text strings.
+    /// If you only need to scroll existing text, DrawLayers can be used directly.
     /// </remarks>
-    private void BuildTextLayers(Entity<TextScreenVisualsComponent, SpriteComponent?> ent)
+    private void UpdateAndDrawText(Entity<TextScreenVisualsComponent, SpriteComponent> ent)
     {
-        if (!Resolve(ent, ref ent.Comp2))
-            return;
-
         var screen = ent.Comp1;
-        var sprite = (ent.Owner, ent.Comp2);
+        var sprite = ent.Comp2;
 
-        for (var rowIdx = 0; rowIdx < Math.Min(screen.TextToDraw.Length, screen.Rows); rowIdx++)
+        var texts = screen.TextToDisplay?.Split("\n") ?? [];
+
+        // Update each row from the split text.
+        for (var i = 0; i < screen.RowData.Length; i++)
         {
-            var row = screen.TextToDraw[rowIdx];
-            if (row == null)
-                continue;
+            var rowData = screen.RowData[i];
 
-            var min = Math.Min(row.Length, screen.RowLength);
-
-            for (var chr = 0; chr < min; chr++)
+            if (i >= texts.Length || texts[i].Length == 0)
             {
-                screen.LayerStatesToDraw[TextMapKey + rowIdx + chr] = GetStateFromChar(row[chr]);
-                SpriteSystem.LayerSetOffset(
-                    sprite,
-                    TextMapKey + rowIdx + chr,
-                    screen.TextOffset + Vector2.Multiply(
-                        new Vector2((chr - min / 2f + 0.5f) * CharWidth, -rowIdx * screen.RowOffset),
-                        TextScreenVisualsComponent.PixelSize)
-                );
-            }
-        }
-    }
+                // Invalid text: clear all row states (no need to offset, just set state to null).
+                for (var j = 0; j < rowData.Layers.Count; j++)
+                {
+                    var layerTuple = rowData.Layers[j];
 
-    /// <summary>
-    /// Populates timer.LayerStatesToDraw and the sprite component's layer dict with calculated offsets.
-    /// </summary>
-    private void BuildTimerLayers(Entity<TextScreenTimerComponent, TextScreenVisualsComponent, SpriteComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp3))
-            return;
+                    if (SpriteSystem.LayerMapTryGet((ent, sprite), layerTuple.Key, out var layerIndex, false))
+                        SpriteSystem.LayerSetRsiState((ent, sprite), layerIndex, null);
 
-        var timer = ent.Comp1;
-        var screen = ent.Comp2;
-        var sprite = (ent.Owner, ent.Comp3);
+                    rowData.Layers[j] = new(layerTuple.Key, null);
+                }
 
-        var time = TimeToString(
-            (_gameTiming.CurTime - timer.Target).Duration(),
-            false,
-            screen.HourFormat, screen.MinuteFormat, screen.SecondFormat
-        );
-
-        var min = Math.Min(time.Length, screen.RowLength);
-
-        for (var i = 0; i < min; i++)
-        {
-            var layer = TextMapKey + 0 + i;
-            timer.LayerStatesToDraw[layer] = GetStateFromChar(time[i]);
-            SpriteSystem.LayerSetOffset(
-                sprite,
-                layer,
-                screen.TimerOffset + Vector2.Multiply(
-                    new Vector2((i - min / 2f + 0.5f) * CharWidth, 0f),
-                    TextScreenVisualsComponent.PixelSize)
-            );
-        }
-    }
-
-    /// <summary>
-    /// Draws a LayerStates dict by setting the sprite states individually.
-    /// </summary>
-    private void DrawStaticLayers(Entity<SpriteComponent?> ent, Dictionary<string, string?> layerStates)
-    {
-        if (!Resolve(ent, ref ent.Comp))
-            return;
-
-        foreach (var (key, state) in layerStates.Where(pairs => pairs.Value != null))
-            SpriteSystem.LayerSetRsiState(ent, key, state);
-    }
-
-    /// <summary>
-    /// Handles scrolling, updates the scrolled state of a text screen.
-    /// </summary>
-    /// <remarks>
-    /// Be sure to call BuildTimerLayers before using this to set up the text layers used.
-    /// </remarks>
-    private void DrawScrolledLayers(Entity<TextScreenVisualsComponent, SpriteComponent?> ent)
-    {
-        if (!Resolve(ent, ref ent.Comp2))
-            return;
-
-        var screen = ent.Comp1;
-        var sprite = (ent.Owner, ent.Comp2);
-
-        for (int i = 0; i < screen.Rows; i++)
-        {
-            (var scrolled, var newChar) = UpdateScrollPosition(ent, i);
-
-            if (!scrolled)
-                continue;
-
-            var charOffset = screen.ScrollPosition[i] % CharWidth; // The amount to scroll each character off to the left by.
-            for (int j = 0; j <= screen.RowLength; j++)
-            {
-                SpriteSystem.LayerSetOffset(
-                    sprite,
-                    TextMapKey + i + j,
-                    Vector2.Multiply(
-                        new Vector2((j - screen.RowLength / 2f + 0.5f) * CharWidth - charOffset, -i * screen.RowOffset),
-                        TextScreenVisualsComponent.PixelSize
-                        ) + screen.TextOffset
-                );
-            }
-
-            if (!newChar)
-                continue;
-
-            var textOffset = screen.ScrollPosition[i] / CharWidth; // The total number of characters scrolled so far.
-            for (int j = 0; j <= screen.RowLength; j++)
-            {
-                var chr = (textOffset + j) % screen.TextToDraw[i]!.Length;
-                SpriteSystem.LayerSetRsiState(
-                    sprite,
-                    TextMapKey + i + j,
-                    GetStateFromChar(screen.TextToDraw[i]![chr])
-                );
-            }
-        }
-    }
-
-    /// <summary>
-    /// Returns true if <paramref name=oldValue"/> wraps onto a
-    /// new character if incremented by <paramref name="increments"/>
-    /// </summary>
-    private bool CharacterWrapped(int oldValue, int increments)
-    {
-        var newValue = oldValue + increments;
-        return newValue % CharWidth < oldValue % CharWidth;
-    }
-
-    /// <summary>
-    /// Resets the scrolling state for a particular text screen.
-    /// </summary>
-    private void ResetScrollingState(Entity<TextScreenVisualsComponent> ent, TimeSpan? startTime)
-    {
-        if (!ent.Comp.ScrollEnabled)
-            return;
-
-        for (int i = 0; i < ent.Comp.Rows; i++)
-        {
-            ent.Comp.ScrollPosition[i] = 0;
-
-            // Short/null string, shouldn't scroll.
-            if (ent.Comp.TextToDraw[i] == null || ent.Comp.TextToDraw[i]!.Length <= ent.Comp.RowLength)
-            {
-                ent.Comp.NextScrollTime[i] = TimeSpan.MaxValue;
-                ent.Comp.TimeBetweenScrolls[i] = TimeSpan.MaxValue;
+                // Set data back to a default state.
+                rowData.ScrollDelay = TimeSpan.MaxValue;
+                rowData.NextScroll = TimeSpan.MaxValue;
+                rowData.ScrollPosition = 0;
+                rowData.Text = "";
             }
             else
             {
-                // Find our desired scroll speed.
-                var newMaxScrollTime = MaxMessageScrollTime / ent.Comp.TextToDraw[i]!.Length / CharWidth;
-                var scrollTime = newMaxScrollTime < MaxPixelScrollTime ? newMaxScrollTime : MaxPixelScrollTime;
-                ent.Comp.NextScrollTime[i] = startTime ?? _gameTiming.CurTime;
-                ent.Comp.TimeBetweenScrolls[i] = scrollTime;
+                if (!screen.ScrollEnabled || texts[i].Length <= screen.RowLength)
+                {
+                    // Non-scrolling: ensure that our string fits on one screen.
+                    rowData.ScrollDelay = TimeSpan.MaxValue;
+                    rowData.NextScroll = TimeSpan.MaxValue;
+                    rowData.ScrollPosition = 0;
+                    rowData.Text = texts[i][..int.Min(texts[i].Length, screen.RowLength)];
+                }
+                else
+                {
+                    // Scrolling: find our timing, adjust scroll position within the text.
+                    var rowText = texts[i][..int.Min(texts[i].Length, screen.MaxScrollingCharacters)];
+                    rowData.Text = rowText.PadRight(rowText.Length + screen.RowLength - 1);
+
+                    var newMaxPixelScrollTime = screen.MaxMessageScrollTime / rowText.Length / CharWidth; // Scroll speed per pixel at the max message scroll length.
+                    rowData.ScrollDelay = newMaxPixelScrollTime < screen.MaxPixelScrollTime ? newMaxPixelScrollTime : screen.MaxPixelScrollTime;
+
+                    rowData.NextScroll = screen.TextTime;
+                    rowData.ScrollPosition = 0;
+
+                    // Update the scroll timing & position to where it should be.
+                    ScrollRow(ref rowData);
+                }
+
+                // Draw our new layers.
+                DrawLayers((ent.Owner, screen, sprite), ref rowData, i);
             }
+
+            // Finally, commit the row state.
+            screen.RowData[i] = rowData;
         }
     }
 
     /// <summary>
-    /// Updates the scroll position of a given row.
+    /// Updates a TextScreenRow's scroll position and timing based on current state and sim time.
     /// </summary>
-    /// <returns>
-    /// A two-tuple of booleans:
-    /// The first element, newChar, represents if the row has scrolled onto a new character (and thus all of the states should update)
-    /// and the second, scrolled, represents if the row has scrolled any pixels at all.
-    /// </returns>
-    private (bool newChar, bool scrolled) UpdateScrollPosition(Entity<TextScreenVisualsComponent> ent, int i)
+    private void ScrollRow(ref TextScreenRow rowData)
     {
-        var screen = ent.Comp;
+        var difference = (_timing.CurTime - rowData.NextScroll).TotalSeconds;
+        if (!double.IsPositive(difference))
+            difference = 0.0;
 
-        if (i < 0 || i >= screen.NextScrollTime.Length)
-            return (false, false);
+        var increments = 1;
+        if (rowData.ScrollDelay.TotalSeconds > 0.0)
+            increments += (int)Math.Truncate(difference / rowData.ScrollDelay.TotalSeconds);
 
-        if (screen.NextScrollTime[i] >= _gameTiming.CurTime)
-            return (false, false);
+        rowData.ScrollPosition += increments;
+        rowData.NextScroll += increments * rowData.ScrollDelay;
+    }
 
-        if (screen.TimeBetweenScrolls[i] >= _gameTiming.CurTime)
-            return (false, false);
+    /// <summary>
+    /// Draws sprite layers for the given row on the given entity.
+    /// </summary>
+    private void DrawLayers(Entity<TextScreenVisualsComponent, SpriteComponent> ent, ref TextScreenRow rowData, int rowIndex)
+    {
+        Entity<SpriteComponent?> sprite = (ent.Owner, ent.Comp2);
+        var screen = ent.Comp1;
 
-        // Find the number of pixels we need to scroll.
-        var difference = (_gameTiming.CurTime - screen.NextScrollTime[i]).TotalSeconds;
-        var increments = (int)Math.Truncate(difference / screen.TimeBetweenScrolls[i].TotalSeconds) + 1;
+        // Find our horizontal offset, if we're scrolling (prevents text from going out of bounds when well set)
+        var textIsScrolling = rowData.Text.Length > screen.RowLength;
+        var scrollOffset = textIsScrolling ? screen.HorizontalScrollOffset : 0;
 
-        var newChar = increments >= CharWidth || CharacterWrapped(screen.ScrollPosition[i], increments);
-        var scrolled = true;
+        // The horizontal shift, in pixels, that each character is drawn at. For non-scrolling text, ScrollPosition must be 0.
+        var subCharOffset = rowData.ScrollPosition % CharWidth;
 
-        screen.ScrollPosition[i] += increments;
-        screen.NextScrollTime[i] += increments * screen.TimeBetweenScrolls[i];
+        // Draw all of the characters in our row's text.
+        var maxCharIndex = int.Min(rowData.Layers.Count, rowData.Text.Length);
+        for (var j = 0; j < maxCharIndex; j++)
+        {
+            var layerTuple = rowData.Layers[j];
+            var charIndex = (j + rowData.ScrollPosition / CharWidth) % rowData.Text.Length;
 
-        return (scrolled, newChar);
+            var newState = GetStateFromChar(rowData.Text[charIndex]);
+
+            if (SpriteSystem.LayerMapTryGet(sprite, layerTuple.Key, out var layerIndex, false))
+            {
+                SpriteSystem.LayerSetRsiState(sprite, layerIndex, newState);
+                SpriteSystem.LayerSetOffset(sprite, layerIndex, Vector2.Multiply(
+                    screen.TextOffset +
+                    new Vector2((j - maxCharIndex / 2f + 0.5f) * CharWidth - subCharOffset + scrollOffset, -rowIndex * screen.RowOffset),
+                    TextScreenVisualsComponent.PixelSize));
+            }
+
+            rowData.Layers[j] = new(layerTuple.Key, newState);
+        }
+
+        // Hide the remaining layers (fill with null state).
+        for (var j = maxCharIndex; j < rowData.Layers.Count; j++)
+        {
+            var layerTuple = rowData.Layers[j];
+
+            if (SpriteSystem.LayerMapTryGet((ent, sprite), layerTuple.Key, out var layerIndex, false))
+                SpriteSystem.LayerSetRsiState((ent, sprite), layerIndex, null);
+
+            rowData.Layers[j] = new(layerTuple.Key, null);
+        }
+
+        // Handle leftmost/rightmost scroll hiding, if needed.
+        // NOTE: As subCharOffset increases, the text scrolls leftwards.
+        //       Leftmost state should be hidden at high values, rightmost at low values.
+        if (rowData.Layers.Count > 0)
+        {
+            var hideLeft = textIsScrolling && subCharOffset >= CharWidth - screen.LeftInvisiblePixels;
+            var hideRight = textIsScrolling && subCharOffset < screen.RightInvisiblePixels;
+            SpriteSystem.LayerSetVisible((ent, sprite), rowData.Layers[0].Key, !hideLeft);
+            SpriteSystem.LayerSetVisible((ent, sprite), rowData.Layers[^1].Key, !hideRight);
+        }
+    }
+
+    /// <summary>
+    /// Updates the light on a timer's sprite based on if it's currently running or not.
+    /// </summary>
+    private void UpdateTimerSprite(Entity<TextScreenTimerVisualsComponent> ent, bool running)
+    {
+        if (_spriteQuery.TryComp(ent, out var sprite)
+            && SpriteSystem.LayerMapTryGet((ent, sprite), TimerVisualLayers.Light, out var layerIndex, logMissing: false))
+        {
+            SpriteSystem.LayerSetRsiState((ent, sprite), layerIndex, running ? ent.Comp.RunningState : ent.Comp.FinishedState);
+        }
     }
     #endregion Internal
 }
diff --git a/Content.Client/TextScreen/TextScreenTimerComponent.cs b/Content.Client/TextScreen/TextScreenTimerComponent.cs
deleted file mode 100644
index 0aca155f2a..0000000000
--- a/Content.Client/TextScreen/TextScreenTimerComponent.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Client.TextScreen;
-
-/// <summary>
-/// Added to an entity already containing a <see cref="TextScreenVisualsComponent"/> to track frame-by-frame timer updates
-/// </summary>
-[RegisterComponent]
-public sealed partial class TextScreenTimerComponent : Component
-{
-    /// <summary>
-    /// The time that the timer is counting down to.
-    /// </summary>
-    [DataField("targetTime", customTypeSerializer: typeof(TimeOffsetSerializer))]
-    public TimeSpan Target = TimeSpan.Zero;
-
-    /// <summary>
-    /// Per-character layers, for mapping into the sprite component.
-    /// </summary>
-    [ViewVariables]
-    public Dictionary<string, string?> LayerStatesToDraw = new();
-}
diff --git a/Content.Client/TextScreen/TextScreenTimerVisualsComponent.cs b/Content.Client/TextScreen/TextScreenTimerVisualsComponent.cs
new file mode 100644
index 0000000000..c26a8e3def
--- /dev/null
+++ b/Content.Client/TextScreen/TextScreenTimerVisualsComponent.cs
@@ -0,0 +1,94 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Client.TextScreen;
+
+/// <summary>
+/// A component for text screens that support countdown timers with frame-by-frame updates.
+/// </summary>
+/// <remarks>
+/// Entities must have <see cref="TextScreenVisualsComponent"/> to work!
+/// </remarks>
+[RegisterComponent, Access(typeof(TextScreenSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class TextScreenTimerVisualsComponent : Component
+{
+    /// <summary>
+    /// The time that the timer is counting down to.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoPausedField]
+    public TimeSpan? TargetTime;
+
+    /// <summary>
+    /// The text to render onto the screen while the timer is running.
+    /// </summary>
+    [DataField]
+    public string RunningText = "";
+
+    /// <summary>
+    /// The string to draw onto the screen when the target time is reached.
+    /// </summary>
+    [DataField]
+    public string FinishedText = "";
+
+    /// <summary>
+    /// The 0-indexed row to use for the timer data.
+    /// </summary>
+    [DataField]
+    public int TimerRow;
+
+    /// <summary>
+    /// If true, the timer will show small durations with centisecond precision.
+    /// If false, times will be shown with second precision at most.
+    /// </summary>
+    [DataField]
+    public bool ShowCentiseconds = true;
+
+    /// <summary>
+    /// The last value being displayed on the screen.
+    /// </summary>
+    /// <remarks>
+    /// A value of all zeros implies the timer is done, and <see cref="FinishedText"/> should be displayed instead.
+    [DataField]
+    public TimerDisplay ScreenValue;
+
+    /// <summary>
+    /// The state to use for the <see cref="TimerVisualLayers.Light"/> layer when the timer is in progress.
+    /// </summary>
+    [DataField]
+    public string? RunningState;
+
+    /// <summary>
+    /// The state to use for the <see cref="TimerVisualLayers.Light"/> layer when the timer elapses.
+    /// </summary>
+    [DataField]
+    public string? FinishedState;
+}
+
+/// <summary>
+/// A value to display on a timer, agnostic of time unit.
+/// </summary>
+/// <remarks>
+/// Values to be expressed as <c>HIGH:LOW</c>, both values effectively capped at 99.
+/// Used to avoid string comparisons.
+/// </remarks>
+[DataDefinition, Serializable]
+public partial record struct TimerDisplay(int HighValue, int LowValue)
+{
+    public override readonly string ToString()
+    {
+        var high = int.Clamp(HighValue, 0, 99);
+        var low = int.Clamp(LowValue, 0, 99);
+        return $"{high:D2}:{low:D2}";
+    }
+}
+
+/// <summary>
+/// Sprite layers for text screen timers.
+/// </summary>
+[Serializable]
+public enum TimerVisualLayers : byte
+{
+    /// <summary>A light that turns on with the status of the timer.</summary>
+    Light
+}
diff --git a/Content.Client/TextScreen/TextScreenVisualsComponent.cs b/Content.Client/TextScreen/TextScreenVisualsComponent.cs
index a4797f2154..2fc85c08d6 100644
--- a/Content.Client/TextScreen/TextScreenVisualsComponent.cs
+++ b/Content.Client/TextScreen/TextScreenVisualsComponent.cs
@@ -1,15 +1,17 @@
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
 
 namespace Content.Client.TextScreen;
 
 /// <summary>
 /// A component for rendering text on a screen.
-/// Can show scrolling text, timers, or other specific-use information (e.g. arrivals timer)
+/// Can show scrolling text, timers, or other specific-use information (e.g. arrivals timer).
 /// </summary>
-[RegisterComponent]
+/// <remarks>
+/// Pausing handled manually due to <see cref="TextScreenRow"/> logic.
+/// </remarks>
+[RegisterComponent, Access(typeof(TextScreenSystem))]
 public sealed partial class TextScreenVisualsComponent : Component
 {
     /// <summary>
@@ -17,33 +19,31 @@ public sealed partial class TextScreenVisualsComponent : Component
     /// </summary>
     public const float PixelSize = 1f / EyeManager.PixelsPerMeter;
 
+    #region Appearance
     /// <summary>
     /// The color of the text drawn.
     /// </summary>
     /// <remarks>
-    /// 15,151,251 is the old ss13 color, from tg
+    /// 15,151,251 is the old SS13 color used on tgstation.
     /// </remarks>
     [DataField]
-    public Color Color = new Color(15, 151, 251);
+    public Color Color = new(15, 151, 251);
+
+    /// <summary>
+    /// The current color being drawn on the screen.
+    /// </summary>
+    [ViewVariables]
+    public Color CurrentColor;
 
     /// <summary>
     /// Offset for centering the text.
     /// </summary>
+    /// <remarks>
+    /// Values in pixels.
+    /// </remarks>
     [DataField]
     public Vector2 TextOffset = Vector2.Zero;
 
-    /// <summary>
-    /// Offset for centering the timer.
-    /// </summary>
-    [DataField]
-    public Vector2 TimerOffset = Vector2.Zero;
-
-    /// <summary>
-    /// Number of rows of text this screen can render.
-    /// </summary>
-    [DataField]
-    public int Rows = 2;
-
     /// <summary>
     /// Vertical distance between the top pixel of each row.
     /// </summary>
@@ -60,76 +60,139 @@ public sealed partial class TextScreenVisualsComponent : Component
     public int RowLength = 5;
 
     /// <summary>
-    /// Text the screen should show when it finishes a timer.
+    /// The longest that a message should take to cross the screen before wrapping around.
     /// </summary>
     [DataField]
-    public string?[] Text = new string?[2];
+    public TimeSpan MaxMessageScrollTime = TimeSpan.FromSeconds(5);
 
     /// <summary>
-    /// Text the screen will draw whenever appearance is updated.
-    /// </summary>
-    public string?[] TextToDraw = new string?[2];
-
-    /// <summary>
-    /// Per-character layers, for mapping into the sprite component.
+    /// The longest that it should take to scroll one pixel on a screen.
     /// </summary>
     [DataField]
-    public Dictionary<string, string?> LayerStatesToDraw = new();
+    public TimeSpan MaxPixelScrollTime = TimeSpan.FromMilliseconds(100);
 
+    /// <summary>
+    /// The maximum number of characters to display per row.
+    /// </summary>
+    [DataField]
+    public int MaxScrollingCharacters = 32;
+
+    /// <summary>
+    /// When scrolling, a horizontal offset for the scrolling, in pixels.
+    /// </summary>
+    /// <remarks>
+    /// Needed for finer adjustments of scroll bounds, along with
+    /// <see cref="LeftInvisiblePixels"/> and <see cref="RightInvisiblePixels"/>
+    /// </remarks>
+    /// <seealso cref="TextScreenSystem.CharWidth"/>
+    [DataField]
+    public int HorizontalScrollOffset;
+
+    /// <summary>
+    /// When scrolling, the number of pixels that the leftmost letters should be invisible for.
+    /// Value should be between [0,CharWidth).
+    /// </summary>
+    /// <seealso cref="TextScreenSystem.CharWidth"/>
+    [DataField]
+    public int LeftInvisiblePixels;
+
+    /// <summary>
+    /// When scrolling, the number of pixels that the rightmost letters should be invisible for.
+    /// Value should be between [0,CharWidth).
+    /// </summary>
+    /// <seealso cref="TextScreenSystem.CharWidth"/>
+    [DataField]
+    public int RightInvisiblePixels;
+
+    /// <summary>
+    /// The layer for the outer frame of the text screen.
+    /// </summary>
+    /// <remarks>
+    /// Will be registered on top of the other layers.
+    /// Should be at least 2 pixels thick on either side for the illusion to work.
+    /// </remarks>
+    [DataField]
+    public PrototypeLayerData? FrameState;
+    #endregion
+
+    #region Text State
     /// <summary>
     /// If true, the screen is able to scroll its text.
-    /// Not used for timers.
     /// </summary>
     [DataField]
     public bool ScrollEnabled;
 
     /// <summary>
-    /// The next time that the text on each row should be scrolled.
+    /// The list of row data for the text screens.
     /// </summary>
-    [DataField(customTypeSerializer: typeof(CustomArraySerializer<TimeSpan, TimeOffsetSerializer>))]
-    public TimeSpan[] NextScrollTime = [TimeSpan.MaxValue, TimeSpan.MaxValue];
+    /// <remarks>
+    /// Each row needs its own entry. To declare a three row timer, the yaml could look like <c>rowData: [{},{},{}]</c>.
+    /// </remarks>
+    [DataField]
+    public TextScreenRow[] RowData = { new(), new() };
 
     /// <summary>
-    /// The amount of time between scrolling individual pixels per row.
+    /// The text to display on the screen.
+    /// Each row delimited with a newline (\n) character.
     /// </summary>
-    [DataField]
-    public TimeSpan[] TimeBetweenScrolls = [TimeSpan.MaxValue, TimeSpan.MaxValue];
+    [ViewVariables]
+    public string? TextToDisplay;
 
     /// <summary>
-    /// A counter the scroll position of each row.
-    /// Should be used modulo the pixel width of the actual strings.
+    /// The time that the text was sent.
+    /// Used for scrolling.
     /// </summary>
-    [DataField]
-    public int[] ScrollPosition = new int[2];
+    [ViewVariables]
+    public TimeSpan TextTime;
 
     /// <summary>
-    /// The last received text for this screen. Prevents resetting the scroll state on updates.
+    /// If true, text to display has been updated and should redraw.
     /// </summary>
-    [DataField]
-    public string? LastText;
-
-    /// <summary>
-    /// The layer for the outer frame of the text screen.
-    /// Will be registered on top of the other layers.
-    /// </summary>
-    [DataField]
-    public PrototypeLayerData? FrameState;
-
-    /// <summary>
-    /// The format string to use for displaying hours when used as a timer.
-    /// </summary>
-    [DataField]
-    public string HourFormat = "D2";
-
-    /// <summary>
-    /// The format string to use for displaying minutes when used as a timer.
-    /// </summary>
-    [DataField]
-    public string MinuteFormat = "D2";
-
-    /// <summary>
-    /// The format string to use for displaying seconds when used as a timer.
-    /// </summary>
-    [DataField]
-    public string SecondFormat = "D2";
+    [ViewVariables]
+    public bool NewTextToDisplay;
+    #endregion
+}
+
+/// <summary>
+/// All information about a given row of text.
+/// </summary>
+[DataDefinition, Serializable]
+public partial struct TextScreenRow()
+{
+    /// <summary>
+    /// The time this row should next scroll the text by a pixel.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan NextScroll = TimeSpan.MaxValue;
+
+    /// <summary>
+    /// The delay between each pixel scrolled on this screen.
+    /// </summary>
+    [DataField]
+    public TimeSpan ScrollDelay = TimeSpan.MaxValue;
+
+    /// <summary>
+    /// The current position of the row in the string, in pixels.
+    /// </summary>
+    /// <remarks>
+    /// Increases monotonically, should be taken modulo the text length.
+    /// Each character is a fixed size (pixel width defined in <see cref="TextScreenSystem.CharWidth"/>).
+    /// </remarks>
+    [DataField]
+    public int ScrollPosition;
+
+    /// <summary>
+    /// A list with each of the row's sprite layers, with the key inside of it and the state it's currently on.
+    /// </summary>
+    /// <remarks>
+    /// Currently not removed from the sprite when the component is removed.
+    /// </remarks>
+    [DataField]
+    public List<(string Key, string? State)> Layers = new();
+
+    /// <summary>
+    /// The full text currently being drawn on the row. May not all fit on the screen at once.
+    /// </summary>
+    [DataField]
+    public string Text = string.Empty;
 }
diff --git a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
index 3feb69c879..9150eac25a 100644
--- a/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
+++ b/Content.Server/DeviceLinking/Components/SignalTimerComponent.cs
@@ -4,55 +4,66 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Server.DeviceLinking.Components;
 
+/// <summary>
+/// A component for signalable timers.
+/// Uses a UI to set a label and timer value, and can be started with a signal.
+/// Outputs its own signals when the timer starts/finishes.
+/// </summary>
 [RegisterComponent]
 public sealed partial class SignalTimerComponent : Component
 {
+    /// <summary>
+    /// The current timer delay, used to populate the UI.
+    /// </summary>
     [DataField]
     public double Delay = 5;
 
     /// <summary>
-    ///     This shows the Label: text box in the UI.
+    /// This shows the Label: text box in the UI.
     /// </summary>
     [DataField]
     public bool CanEditLabel = true;
 
     /// <summary>
-    ///     The label, used for TextScreen visuals currently.
+    /// The label, used for TextScreen visuals currently.
     /// </summary>
     [DataField]
     public string Label = string.Empty;
 
     /// <summary>
-    ///     Default max width of a label (how many letters can this render?)
+    /// Default max width of a label (how many letters can this render?)
     /// </summary>
     [DataField]
-    public int MaxLength = 5;
+    public int MaxLength = 16;
 
     /// <summary>
-    ///     The port that gets signaled when the timer triggers.
+    /// The port that gets signaled when the timer triggers.
     /// </summary>
     [DataField]
     public ProtoId<SourcePortPrototype> TriggerPort = "Timer";
 
     /// <summary>
-    ///     The port that gets signaled when the timer starts.
+    /// The port that gets signaled when the timer starts.
     /// </summary>
     [DataField]
     public ProtoId<SourcePortPrototype> StartPort = "Start";
 
+    /// <summary>
+    /// A port that can be signaled to start the timer.
+    /// </summary>
     [DataField]
     public ProtoId<SinkPortPrototype> Trigger = "Trigger";
 
     /// <summary>
-    ///     If not null, this timer will play this sound when done.
+    /// If not null, this timer will play this sound when done.
     /// </summary>
     [DataField]
     public SoundSpecifier? DoneSound;
 
     /// <summary>
-    ///     The maximum duration in seconds
-    ///     When a larger number is in the input box, the display will start counting down from this one instead
+    /// The maximum duration in seconds
+    /// When a larger number is in the input box, the display will start counting down from this one instead
     /// </summary>
     [DataField]
-    public Double MaxDuration = 3599; // 59m 59s
+    public double MaxDuration = 3599; // 59m 59s
 }
diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
index a801923c7b..f45ee1eaba 100644
--- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
+++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
@@ -1,82 +1,150 @@
 using Content.Server.DeviceLinking.Components;
-using Content.Shared.UserInterface;
 using Content.Shared.Access.Systems;
 using Content.Shared.DeviceLinking.Events;
 using Content.Shared.MachineLinking;
 using Content.Shared.TextScreen;
+using Content.Shared.UserInterface;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
 
 namespace Content.Server.DeviceLinking.Systems;
 
+/// <summary>
+/// A system for signallable timers. Sets timer AppearanceData when triggered to start/stop.
+/// </summary>
+/// <seealso cref="Content.Client.TextScreenTimerVisualsComponent"/>
+/// <seealso cref="AppearanceComponent"/>
 public sealed partial class SignalTimerSystem : EntitySystem
 {
-    [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] private IGameTiming _gameTiming = default!;
-    [Dependency] private DeviceLinkSystem _signalSystem = default!;
-    [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
-    [Dependency] private UserInterfaceSystem _ui = default!;
     [Dependency] private AccessReaderSystem _accessReader = default!;
+    [Dependency] private DeviceLinkSystem _deviceLink = default!;
+    [Dependency] private SharedAppearanceSystem _appearance = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private UserInterfaceSystem _ui = default!;
+
+    [Dependency] private EntityQuery<ActiveSignalTimerComponent> _activeTimerQuery;
+    [Dependency] private EntityQuery<AppearanceComponent> _appearanceQuery;
 
     /// <summary>
     /// Per-tick timer cache.
     /// </summary>
-    private List<Entity<SignalTimerComponent>> _timers = new();
+    private readonly List<Entity<SignalTimerComponent>> _timers = new();
 
-    public override void Initialize()
+    #region Event Handlers
+    [SubscribeLocalEvent]
+    private void OnInit(Entity<SignalTimerComponent> ent, ref ComponentInit args)
     {
-        base.Initialize();
-
-        SubscribeLocalEvent<SignalTimerComponent, ComponentInit>(OnInit);
-        SubscribeLocalEvent<SignalTimerComponent, AfterActivatableUIOpenEvent>(OnAfterActivatableUIOpen);
-
-        SubscribeLocalEvent<SignalTimerComponent, SignalTimerTextChangedMessage>(OnTextChangedMessage);
-        SubscribeLocalEvent<SignalTimerComponent, SignalTimerDelayChangedMessage>(OnDelayChangedMessage);
-        SubscribeLocalEvent<SignalTimerComponent, SignalTimerStartMessage>(OnTimerStartMessage);
-        SubscribeLocalEvent<SignalTimerComponent, SignalReceivedEvent>(OnSignalReceived);
-    }
-
-    private void OnInit(EntityUid uid, SignalTimerComponent component, ComponentInit args)
-    {
-        _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
-        _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
-        _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
-        _signalSystem.EnsureSinkPorts(uid, component.Trigger);
-    }
-
-    private void OnAfterActivatableUIOpen(EntityUid uid, SignalTimerComponent component, AfterActivatableUIOpenEvent args)
-    {
-        var time = TryComp<ActiveSignalTimerComponent>(uid, out var active) ? active.TriggerTime : TimeSpan.Zero;
-
-        if (_ui.HasUi(uid, SignalTimerUiKey.Key))
+        if (_appearanceQuery.TryComp(ent, out var appearance))
         {
-            _ui.SetUiState(uid, SignalTimerUiKey.Key, new SignalTimerBoundUserInterfaceState(component.Label,
-                TimeSpan.FromSeconds(component.Delay).Minutes.ToString("D2"),
-                TimeSpan.FromSeconds(component.Delay).Seconds.ToString("D2"),
-                component.CanEditLabel,
-                time,
-                active != null,
-                _accessReader.IsAllowed(args.User, uid)));
+            _appearance.SetData(ent, TextScreenVisuals.DefaultText, ent.Comp.Label, appearance);
+            _appearance.SetData(ent, TextScreenVisuals.ScreenText, ent.Comp.Label, appearance);
+            _appearance.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime, appearance);
         }
+
+        _deviceLink.EnsureSinkPorts(ent, ent.Comp.Trigger);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnAfterActivatableUIOpen(Entity<SignalTimerComponent> ent, ref AfterActivatableUIOpenEvent args)
+    {
+        var time = _activeTimerQuery.TryComp(ent, out var active) ? active.TriggerTime : TimeSpan.Zero;
+
+        if (!_ui.HasUi(ent, SignalTimerUiKey.Key))
+            return;
+
+        var timeSpan = TimeSpan.FromSeconds(ent.Comp.Delay);
+
+        _ui.SetUiState(ent.Owner, SignalTimerUiKey.Key, new SignalTimerBoundUserInterfaceState(ent.Comp.Label,
+            timeSpan.Minutes.ToString("D2"),
+            timeSpan.Seconds.ToString("D2"),
+            ent.Comp.CanEditLabel,
+            time,
+            active != null,
+            _accessReader.IsAllowed(args.User, ent)));
     }
 
     /// <summary>
-    ///     Finishes a timer, triggering its main port, and removing its <see cref="ActiveSignalTimerComponent"/>.
+    /// Called by <see cref="SignalTimerTextChangedMessage"/> to both
+    /// change the default component label, and propagate that change to the TextScreen.
     /// </summary>
-    public void Trigger(EntityUid uid, SignalTimerComponent signalTimer)
+    [SubscribeLocalEvent]
+    private void OnTextChangedMessage(Entity<SignalTimerComponent> ent, ref SignalTimerTextChangedMessage args)
     {
-        RemComp<ActiveSignalTimerComponent>(uid);
+        if (!IsMessageValid(ent, args))
+            return;
 
-        _audio.PlayPvs(signalTimer.DoneSound, uid);
-        _signalSystem.InvokePort(uid, signalTimer.TriggerPort);
+        ent.Comp.Label = args.Text[..Math.Min(ent.Comp.MaxLength, args.Text.Length)];
 
-        if (_ui.HasUi(uid, SignalTimerUiKey.Key))
+        if (!_appearanceQuery.TryComp(ent, out var appearance))
+            return;
+
+        // could maybe move the defaulttext update out of this block,
+        // if you delved deep into appearance update batching
+        _appearance.SetData(ent, TextScreenVisuals.DefaultText, ent.Comp.Label, appearance);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenText, ent.Comp.Label, appearance);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime, appearance);
+    }
+
+    /// <summary>
+    /// Called by <see cref="SignalTimerDelayChangedMessage"/> to change the <see cref="SignalTimerComponent"/>
+    /// delay, and propagate that change to a textscreen.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnDelayChangedMessage(Entity<SignalTimerComponent> ent, ref SignalTimerDelayChangedMessage args)
+    {
+        if (!IsMessageValid(ent, args))
+            return;
+
+        ent.Comp.Delay = Math.Min(args.Delay.TotalSeconds, ent.Comp.MaxDuration);
+    }
+
+    /// <summary>
+    /// Called by <see cref="SignalTimerStartMessage"/> to instantiate an <see cref="ActiveSignalTimerComponent"/>,
+    /// clear <see cref="TextScreenVisuals.ScreenText"/>, propagate those changes, and invoke the start port.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnTimerStartMessage(Entity<SignalTimerComponent> ent, ref SignalTimerStartMessage args)
+    {
+        if (!IsMessageValid(ent, args))
+            return;
+
+        // feedback received: pressing the timer button while a timer is running should cancel the timer.
+        if (_activeTimerQuery.HasComp(ent))
         {
-            _ui.SetUiState(uid, SignalTimerUiKey.Key, new SignalTimerBoundUserInterfaceState(signalTimer.Label,
-                TimeSpan.FromSeconds(signalTimer.Delay).Minutes.ToString("D2"),
-                TimeSpan.FromSeconds(signalTimer.Delay).Seconds.ToString("D2"),
-                signalTimer.CanEditLabel,
+            _appearance.SetData(ent, TextScreenVisuals.TargetTime, _gameTiming.CurTime);
+            Trigger(ent);
+        }
+        else
+            StartTimer(ent);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(Entity<SignalTimerComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (args.Port == ent.Comp.Trigger)
+            StartTimer(ent);
+    }
+    #endregion Event Handlers
+
+    #region Public API
+    /// <summary>
+    /// Finishes a timer, triggering its main port, and removing its <see cref="ActiveSignalTimerComponent"/>.
+    /// </summary>
+    public void Trigger(Entity<SignalTimerComponent> ent)
+    {
+        RemComp<ActiveSignalTimerComponent>(ent);
+
+        _audio.PlayPvs(ent.Comp.DoneSound, ent);
+        _deviceLink.InvokePort(ent.Owner, ent.Comp.TriggerPort);
+
+        if (_ui.HasUi(ent, SignalTimerUiKey.Key))
+        {
+            _ui.SetUiState(ent.Owner, SignalTimerUiKey.Key, new SignalTimerBoundUserInterfaceState(ent.Comp.Label,
+                TimeSpan.FromSeconds(ent.Comp.Delay).Minutes.ToString("D2"),
+                TimeSpan.FromSeconds(ent.Comp.Delay).Seconds.ToString("D2"),
+                ent.Comp.CanEditLabel,
                 TimeSpan.Zero,
                 false,
                 true));
@@ -89,6 +157,22 @@ public sealed partial class SignalTimerSystem : EntitySystem
         UpdateTimer();
     }
 
+    public void StartTimer(Entity<SignalTimerComponent> ent)
+    {
+        var timer = EnsureComp<ActiveSignalTimerComponent>(ent);
+        timer.TriggerTime = _gameTiming.CurTime + TimeSpan.FromSeconds(ent.Comp.Delay);
+
+        if (_appearanceQuery.TryComp(ent, out var appearance))
+        {
+            _appearance.SetData(ent, TextScreenVisuals.TargetTime, timer.TriggerTime, appearance);
+            _appearance.SetData(ent, TextScreenVisuals.ScreenText, string.Empty, appearance);
+        }
+
+        _deviceLink.InvokePort(ent.Owner, ent.Comp.StartPort);
+    }
+    #endregion Public API
+
+    #region Internal
     private void UpdateTimer()
     {
         _timers.Clear();
@@ -108,14 +192,15 @@ public sealed partial class SignalTimerSystem : EntitySystem
             if (!Exists(timer.Owner))
                 continue;
 
-            Trigger(timer.Owner, timer.Comp);
+            Trigger(timer);
         }
     }
 
     /// <summary>
-    ///     Checks if a UI <paramref name="message"/> is allowed to be sent by the user.
+    /// Checks if a UI <paramref name="message"/> is allowed to be sent by the user.
     /// </summary>
     /// <param name="uid">The entity that is interacted with.</param>
+    /// <param name="message">The message to check.</param>
     private bool IsMessageValid(EntityUid uid, BoundUserInterfaceMessage message)
     {
         if (!_accessReader.IsAllowed(message.Actor, uid))
@@ -123,80 +208,5 @@ public sealed partial class SignalTimerSystem : EntitySystem
 
         return true;
     }
-
-    /// <summary>
-    ///     Called by <see cref="SignalTimerTextChangedMessage"/> to both
-    ///     change the default component label, and propagate that change to the TextScreen.
-    /// </summary>
-    private void OnTextChangedMessage(EntityUid uid, SignalTimerComponent component, SignalTimerTextChangedMessage args)
-    {
-        if (!IsMessageValid(uid, args))
-            return;
-
-        component.Label = args.Text[..Math.Min(component.MaxLength, args.Text.Length)];
-
-        if (!HasComp<ActiveSignalTimerComponent>(uid))
-        {
-            // could maybe move the defaulttext update out of this block,
-            // if you delved deep into appearance update batching
-            _appearanceSystem.SetData(uid, TextScreenVisuals.DefaultText, component.Label);
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, component.Label);
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
-        }
-    }
-
-    /// <summary>
-    ///     Called by <see cref="SignalTimerDelayChangedMessage"/> to change the <see cref="SignalTimerComponent"/>
-    ///     delay, and propagate that change to a textscreen.
-    /// </summary>
-    private void OnDelayChangedMessage(EntityUid uid, SignalTimerComponent component, SignalTimerDelayChangedMessage args)
-    {
-        if (!IsMessageValid(uid, args))
-            return;
-
-        component.Delay = Math.Min(args.Delay.TotalSeconds, component.MaxDuration);
-        _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, component.Delay);
-    }
-
-    /// <summary>
-    ///     Called by <see cref="SignalTimerStartMessage"/> to instantiate an <see cref="ActiveSignalTimerComponent"/>,
-    ///     clear <see cref="TextScreenVisuals.ScreenText"/>, propagate those changes, and invoke the start port.
-    /// </summary>
-    private void OnTimerStartMessage(EntityUid uid, SignalTimerComponent component, SignalTimerStartMessage args)
-    {
-        if (!IsMessageValid(uid, args))
-            return;
-
-        // feedback received: pressing the timer button while a timer is running should cancel the timer.
-        if (HasComp<ActiveSignalTimerComponent>(uid))
-        {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, _gameTiming.CurTime);
-            Trigger(uid, component);
-        }
-        else
-            OnStartTimer(uid, component);
-    }
-
-    private void OnSignalReceived(EntityUid uid, SignalTimerComponent component, ref SignalReceivedEvent args)
-    {
-        if (args.Port == component.Trigger)
-        {
-            OnStartTimer(uid, component);
-        }
-    }
-
-    public void OnStartTimer(EntityUid uid, SignalTimerComponent component)
-    {
-        TryComp<AppearanceComponent>(uid, out var appearance);
-        var timer = EnsureComp<ActiveSignalTimerComponent>(uid);
-        timer.TriggerTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.Delay);
-
-        if (appearance != null)
-        {
-            _appearanceSystem.SetData(uid, TextScreenVisuals.TargetTime, timer.TriggerTime, appearance);
-            _appearanceSystem.SetData(uid, TextScreenVisuals.ScreenText, string.Empty, appearance);
-        }
-
-        _signalSystem.InvokePort(uid, component.StartPort);
-    }
+    #endregion Internal
 }
diff --git a/Content.Server/Screens/Systems/ScreenSystem.cs b/Content.Server/Screens/Systems/ScreenSystem.cs
index c15d180edd..ff4e82dac9 100644
--- a/Content.Server/Screens/Systems/ScreenSystem.cs
+++ b/Content.Server/Screens/Systems/ScreenSystem.cs
@@ -1,8 +1,9 @@
-using Content.Shared.TextScreen;
 using Content.Server.Screens.Components;
+using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.RoundEnd;
 using Content.Shared.Screens;
+using Content.Shared.TextScreen;
 using Robust.Shared.Timing;
 
 namespace Content.Server.Screens.Systems;
@@ -13,43 +14,47 @@ namespace Content.Server.Screens.Systems;
 public sealed partial class ScreenSystem : EntitySystem
 {
     [Dependency] private IGameTiming _gameTiming = default!;
-    [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
+    [Dependency] private SharedAppearanceSystem _appearance = default!;
+
+    [Dependency] private EntityQuery<AppearanceComponent> _appearanceQuery;
 
     /// <summary>
-    /// Send a text update to every screen on the same MapUid as the originating comms console.
+    /// Send a text update to every screen on the same map as the originating device.
     /// </summary>
     [SubscribeLocalEvent]
     private void OnScreenText(Entity<ScreenComponent> ent, ref DeviceNetworkPacketEvent<ScreenTextPayload> args)
     {
         var text = args.Data.Text;
+        if (text == null)
+            return;
+
+        if (!_appearanceQuery.TryComp(ent, out var appearance))
+            return;
+
         // don't allow text updates if there's an active timer
         // (and just check here so the server doesn't have to track them)
-        if (_appearanceSystem.TryGetData(ent, TextScreenVisuals.TargetTime, out TimeSpan target)
+        if (_appearance.TryGetData(ent, TextScreenVisuals.TargetTime, out TimeSpan target, appearance)
             && target > _gameTiming.CurTime)
             return;
 
         var screenMap = Transform(ent).MapUid;
-        var argsMap = Transform(args.Sender).MapUid;
-
-        if (screenMap == null
-            || argsMap == null
-            || screenMap != argsMap
-            || text == null)
+        if (screenMap == null)
             return;
 
-        _appearanceSystem.SetData(ent, TextScreenVisuals.DefaultText, text);
-        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
-        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenText, text, appearance);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime, appearance);
     }
 
     /// <summary>
     /// Determines if/how a timer packet affects this screen.
+    /// </summary>
+    /// <remarks>
     /// Currently there are 2 broadcast domains: Arrivals, and every other screen.
     /// Domain is determined by the <see cref="DeviceNetworkComponent.TransmitFrequencyId"/> on each timer.
     /// Each broadcast domain is divided into subnets. Screen MapUid determines subnet.
     /// Subnets are the shuttle, source, and dest. Source/dest change each jump.
     /// This is required to send different timers to the shuttle/terminal/station.
-    /// </summary>
+    /// </remarks>
     [SubscribeLocalEvent]
     private void OnShuttleTimer(Entity<ScreenComponent> ent, ref DeviceNetworkPacketEvent<ScreenShuttlePayload> args)
     {
@@ -60,7 +65,11 @@ public sealed partial class ScreenSystem : EntitySystem
         if (timerXform.MapUid == null)
             return;
 
-        string? text = null;
+        // Need to have have the AppearanceComponent to do anything.
+        if (!_appearanceQuery.TryComp(ent, out var appearance))
+            return;
+
+        var text = payload.OverrideText;
         TimeSpan time;
 
         switch (timerXform.MapUid)
@@ -68,28 +77,33 @@ public sealed partial class ScreenSystem : EntitySystem
             // sometimes the timer transforms on FTL shuttles have a hyperspace mapent, so matching by grid works as a fallback.
             case var local when local == payload.Shuttle || timerXform.GridUid == payload.Shuttle:
                 time = payload.ShuttleTime;
+                text ??= GetShuttleScreenText(ref args);
                 break;
             case var origin when origin == payload.SourceMap:
                 time = payload.SourceTime;
+                text ??= GetShuttleScreenText(ref args);
                 break;
             case var remote when remote == payload.DestinationMap:
                 time = payload.DestinationTime;
-                text = ShuttleTimerMasks.ETA;
+                text ??= ShuttleTimerMasks.ETA;
                 break;
             default:
                 return;
         }
 
-        if (payload.OverrideText != null)
-            text = payload.OverrideText;
-
-        _appearanceSystem.SetData(ent, TextScreenVisuals.TargetTime, _gameTiming.CurTime + time);
-        _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime);
-
-        if (text != null)
-            _appearanceSystem.SetData(ent, TextScreenVisuals.ScreenText, text);
+        _appearance.SetData(ent, TextScreenVisuals.TargetTime, _gameTiming.CurTime + time, appearance);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenTextTime, _gameTiming.CurTime, appearance);
+        _appearance.SetData(ent, TextScreenVisuals.ScreenText, text, appearance);
 
         if (payload.OverrideColor != null)
-            _appearanceSystem.SetData(ent, TextScreenVisuals.Color, payload.OverrideColor);
+            _appearance.SetData(ent, TextScreenVisuals.Color, payload.OverrideColor, appearance);
+    }
+
+    /// <summary>
+    /// Returns the localization key for ETA or ETD, depending on if the shuttle is currently docked.
+    /// </summary>
+    private string GetShuttleScreenText(ref DeviceNetworkPacketEvent<ScreenShuttlePayload> args)
+    {
+        return args.Data.Docked ? ShuttleTimerMasks.ETD : ShuttleTimerMasks.ETA;
     }
 }
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index b2ff4f9630..333f7fdabc 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -5,11 +5,16 @@
   description: Displays text or time.
   components:
   - type: Rotatable
+  - type: TextScreenTimerVisuals
+    timerRow: 1
+    showCentiseconds: false # Distracting when too common.
   - type: TextScreenVisuals
     textOffset: 0,3
-    timerOffset: 0,-4
-    rows: 2
+    rowData: [{},{}]
     rowLength: 6
+    horizontalScrollOffset: 1
+    leftInvisiblePixels: 2
+    rightInvisiblePixels: 1
     scrollEnabled: true
     frameState:
       sprite: Structures/Wallmounts/screen.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
index 5790e91fa9..c068efab11 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/timer.yml
@@ -61,17 +61,27 @@
   components:
   - type: SignalTimer
     canEditLabel: true
+  - type: TextScreenTimerVisuals
+    runningState: running
+    finishedState: finished
   - type: TextScreenVisuals
     color: FloralWhite
-#    textOffset: 0,3
-#    timerOffset: 0,3
-    # textLength: 5 This field does not exist. Bug?
-    rows: 1
+    scrollEnabled: true
+    rowData: [{}]
+    horizontalScrollOffset: 1
+    leftInvisiblePixels: 2
+    rightInvisiblePixels: 1
+    maxScrollingCharacters: 16
+    frameState:
+      state: outer_frame
   - type: Sprite
     drawdepth: WallMountedItems
     sprite: Structures/Wallmounts/signalscreen.rsi
-    noRot: true
-    state: signalscreen
+    layers:
+    - state: signalscreen
+    - state: finished
+      shader: unshaded
+      map: [ enum.TimerVisualLayers.Light ]
     # noRot: true # TODO From an accessibility standpoint, screens with text shouldn't be rotatable; Mapping Lead already have concerns about this.
   - type: Construction
     graph: Timer
diff --git a/Resources/Textures/Effects/text.rsi/blank.png b/Resources/Textures/Effects/text.rsi/blank.png
deleted file mode 100644
index 9eb5b578fc609c339355ec106e4e6e9c7d7408cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^EI`c0!3HFsSlX8YDaPU;cPEB*=VV@jWYZme9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucL0(T6#}J9|<OR$L2|#Wd1LNJ#syl%!22WQ%
Jmvv4FO#q~R8(RPX

diff --git a/Resources/Textures/Effects/text.rsi/meta.json b/Resources/Textures/Effects/text.rsi/meta.json
index 7ada6cc272..674df4a00f 100644
--- a/Resources/Textures/Effects/text.rsi/meta.json
+++ b/Resources/Textures/Effects/text.rsi/meta.json
@@ -127,9 +127,6 @@
         {
             "name": "backslash"
         },
-        {
-            "name": "blank"
-        },
         {
             "name": "bracket-l"
         },
diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/outer_frame.png b/Resources/Textures/Structures/Wallmounts/screen.rsi/outer_frame.png
index 0cec4846797dda7848d5be76c153505e5c8c484a..1db1c0edc08aa98a2e29a50ab25dc1371d0e5d6d 100644
GIT binary patch
delta 188
zcmV;t07L)g0p$UZF@K*)L_t(og=1hC1*2dT3@~71U|?XVXl(y4uPjG5OCR2S#L!V+
z$q09VnuhLwZ5@4vr;i@e+;V9-d4{W3E;8J@ahZ{Ufq{VqS@QD5iwxg?eqyAR<(%w%
z|E1;RQN);NWf`$x)B&Ro7<Is?14bP%>Hw75Fu$sjL0(zzKQ*l^dwBN|!_CWAQN-X?
qubPG~%`8R-u(rS`7zLwXPyhhS>m$|du$WQ+0000<MNUMnLSTa7uU1h2

delta 189
zcmV;u07C!e0p<aaF@K;*L_t(og=1hC1*2dT3@~7<Xl(y4uPjG*iyz*7#L!V+$;hat
zq5EH3N1x&8qla{}Tv|?^;p&x(47YAvW@Ld0UcPvdt`2|!7G#O<KR+?j+Hy{IzW>O4
zCR$ra2#h*l)B&Ro7<Is?0|wjy@X9E^s**uoS?)hR#nb=~?>0VSxOw?1oX^O>z`&rU
rp-Xd%(ZQ`7muX(}j)GAz3Wx##*bO7s5rdN>00000NkvXXu0mjfbZ%9f

diff --git a/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png b/Resources/Textures/Structures/Wallmounts/screen.rsi/screen.png
index d9958d7a37d598873e3553acbbcd309e3c81be66..8550c9859c87d3f767d91b5cf6714ce1d5556f22 100644
GIT binary patch
delta 172
zcmV;d08{_a0o4JJF@KLqL_t(oh3(d{3WG2dh2azNEebjaBB=DyT&s&X>Fb45umy(%
ze2#RAsEbpq!}+F=4ENu10V4V{0RXSAw{a3(HdN0BLtBeAAk9jf7f&okdmsLYVvKKz
z@1z6(gxg0Y<s|`If%l0g7{CAqFn|FJ*!_l8Q^V(8pl5@R8YOpk!X47AwB9BkxLtsV
aZs7;4-X7LlIw!gS0000<MNUMnLSTZ(FG_y^

delta 167
zcmV;Y09gOk0nh=EF@K6lL_t(oh3(d{3WG2dh2e9>w-9s?L};at=GwRvCw;w;3RZAP
zz~@LO9ZEZTyPR)Jmh*23Ktz8g_kM^)nX3=`HDG)gk*aRu<$A*wyxMq{7nq(F%j_iG
zFP*ij0lP$P^#=wpfB_6(00WNKu<Z;q{sn#wc)95~3jkDg6Ch7t{;<qWv^R<9t2dk8
V9@h27u3i8D002ovPDHLkV1m{CN_hYP

diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/finished.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/finished.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f7b28b74dd90bd4b9748b86e2854e2b29642fb5
GIT binary patch
literal 120
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a*RA(978f1
z-<~t%Wl-Q@Fqq@R{yuMtpW^)q8(X$;?GghjVPG&=sq}l^UD2DD#Tg#N^Owi5O?*7*
P8d%2D)z4*}Q$iB}^Nu30

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json
index 68851e396b..1a51ba1be2 100644
--- a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json
@@ -1,14 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Made by brainfood1183 (Github) for Space Station 14 and modified by Flareguy. Revamped by AftrLite.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "signalscreen"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by brainfood1183 (Github) for Space Station 14 and modified by Flareguy. Revamped by AftrLite, split apart by whatston3.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "finished",
+            "delays": [
+                [
+                    0.25,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "outer_frame"
+        },
+        {
+            "name": "running"
+        },
+        {
+            "name": "signalscreen"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/outer_frame.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/outer_frame.png
new file mode 100644
index 0000000000000000000000000000000000000000..5410b0d82f916d79c1d4ceb0083e2c3622c3090b
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}%RF5iLn2z=
zPT9zH$UvfHy;6tw%Q%lVC(VqH7h~3TTfBVT8nwZxo#l?VcwyIUiCHUMcHP<j_YVJk
zUv>ef6K7oZAAeZ0(MY&{^2>7%s#eJ?FMi^hX?|OFo*Vo0<xY!sYTCTp`Z(s-yzHeP
zs`w}B&puQodOO4;e;bGDOfK#X4BThp4p_VVPG+6SDebk$x_MjPo|_qOKP}qgIj5zl
k{$+ce$>A0OCx!>iKO@ynXT_FU0bR`C>FVdQ&MBb@0R7=$>Hq)$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/running.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/running.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8b7a9b05424c62dcdecd5ee5f7ec5ea14d9c11a
GIT binary patch
literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`kpS1ArY-_
z&l&PEDDW^COgY0c>shY&r;2tSj!e-K9tMU7u7NkR&-b0$SIhXXoZ-9_ySDmN)gGW$
N22WQ%mvv4FO#qDfAyEJT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png
index b788a0bc692d75dd1480b9c279dd865820c8d152..91c20c6a16c60644a8bd7cce4887a5a6ee33e5b2 100644
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}cRgJkLn2y}
z6C_v{Cy4YkF|zfXnA3Ia+y76eicB`Yd3e{INA~Mfjj}}rS4>L&XTN@7Y*YJX!mDZC
zr%xKk>@Ax3@LKO_jj~M%!8Jc0xz4g+kWN^%%U7i-kiEw$;R+-3JBBr^fpwv(%%<H>
z+RNn)@9e1&T`i-$t6^5#yLv`D##NDg%<^`%2Q=CwH@F^r{F`5L$<rqfe|$RHEpj<9
z|D9pV->UYji4m6@cC9mOj&4wI2GVo<Ib#dnYbGDuyS#_pm*>B*XiS#WuK$S=$CkI)
nWhDKWpK;p#poRqN7dD1}{K-51b-8Q;dX&M_)z4*}Q$iB}0O5Lh

literal 360
zcmV-u0hj)XP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px$B1uF+RA_<ima$61P!xv$h)WmgUPuNZ25OK(AEiqLU%<tV)<vA^bGY~%olA#H
zTB<@KiKLTAaT1s76sa_o3rTa7{2yEnhg|p$KiqHtLI@#*keXtxH<vdf?Ht-Wlf_|z
z+v}mV?Yo5kN8@_FZXcf@P2$q!E!)9-rttI-Yz;udzn^zGP--Uwm{O&GuXNKtg8@hn
zAPobM9zYrfAU%LIwGSY75xTe<qRf>v4ih{EbL0C}`Zv~6*YkDrpjnzcWA(oJbq$vC
zZ#;pQ=NK*9`96VCh3n~Sg!9igqd}|o=l%nxy#~(i7MS)L0DvREU8oMC)EY#oHSTt_
zNeKPP689e=`je%IAFk)?>|}kBI_`F~vHTDC2_b}#n(zg;x6V+&q}3Pz0000<MNUMn
GLSTXuE1gUL


From df09298031190262703b6d4df5e990604dc7ded2 Mon Sep 17 00:00:00 2001
From: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com>
Date: Sat, 3 Oct 2026 13:45:20 +0000
Subject: [PATCH 32/69] Big sprites cleanup (Part 1?) (#46276)

* remove unused drinks

* delete

* delete again

* delete ammo

* again

* again

* DELETE!

* done!

* done x2!
---
 .../Belt/assault.rsi/equipped-BELT.png        | Bin 363 -> 0 bytes
 .../Clothing/Belt/assault.rsi/icon.png        | Bin 382 -> 0 bytes
 .../Clothing/Belt/assault.rsi/inhand-left.png | Bin 341 -> 0 bytes
 .../Belt/assault.rsi/inhand-right.png         | Bin 368 -> 0 bytes
 .../Clothing/Belt/assault.rsi/meta.json       |  26 --
 .../base_syndicate.rsi/equipped-EARS.png      | Bin 216 -> 0 bytes
 .../Ears/Headsets/base_syndicate.rsi/icon.png | Bin 288 -> 0 bytes
 .../Headsets/base_syndicate.rsi/meta.json     |  18 --
 .../servicesecurity.rsi/equipped-EARS.png     | Bin 307 -> 0 bytes
 .../Headsets/servicesecurity.rsi/icon.png     | Bin 294 -> 0 bytes
 .../Headsets/servicesecurity.rsi/meta.json    |  18 --
 .../Hands/Gloves/spaceninja.rsi/icon-red.png  | Bin 697 -> 0 bytes
 .../Hands/Gloves/spaceninja.rsi/meta.json     | 103 ++++----
 .../ihvoid.rsi/equipped-HELMET-vox.png        | Bin 825 -> 0 bytes
 .../Helmets/ihvoid.rsi/equipped-HELMET.png    | Bin 665 -> 0 bytes
 .../Clothing/Head/Helmets/ihvoid.rsi/icon.png | Bin 377 -> 0 bytes
 .../Head/Helmets/ihvoid.rsi/inhand-left.png   | Bin 564 -> 0 bytes
 .../Head/Helmets/ihvoid.rsi/inhand-right.png  | Bin 562 -> 0 bytes
 .../Head/Helmets/ihvoid.rsi/meta.json         |  30 ---
 .../Mobs/Back/corgi_back.rsi/armor.png        | Bin 481 -> 0 bytes
 .../Mobs/Back/corgi_back.rsi/cardborg.png     | Bin 792 -> 0 bytes
 .../Mobs/Back/corgi_back.rsi/deathsquad.png   | Bin 1979 -> 0 bytes
 .../corgi_back.rsi/fire_extinguisher0.png     | Bin 526 -> 0 bytes
 .../corgi_back.rsi/fire_extinguisher1.png     | Bin 526 -> 0 bytes
 .../Clothing/Mobs/Back/corgi_back.rsi/ian.png | Bin 1012 -> 0 bytes
 .../Mobs/Back/corgi_back.rsi/meta.json        |  47 ----
 .../Mobs/Back/corgi_back.rsi/oxygen.png       | Bin 585 -> 0 bytes
 .../Mobs/Back/corgi_back.rsi/petcollar.png    | Bin 258 -> 0 bytes
 .../Mobs/Back/corgi_back.rsi/walkietalkie.png | Bin 433 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/beret.png        | Bin 354 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/blackscarf.png   | Bin 346 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/bunny.png        | Bin 508 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/captain.png      | Bin 413 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/cardborg_h.png   | Bin 505 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/cargosoft.png    | Bin 412 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/chef.png         | Bin 197 -> 0 bytes
 .../Hats/corgi_hats.rsi/christmasscarf.png    | Bin 366 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/clown.png        | Bin 547 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/detective.png    | Bin 245 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/festive.png      | Bin 362 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat0_cakehat.png  | Bin 289 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat0_reindeer.png | Bin 301 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat0_white.png    | Bin 505 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat0_yellow.png   | Bin 527 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat1_cakehat.png  | Bin 459 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat1_white.png    | Bin 496 -> 0 bytes
 .../Hats/corgi_hats.rsi/hardhat1_yellow.png   | Bin 518 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/helmet.png       | Bin 632 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/hopcap.png       | Bin 431 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/kitty.png        | Bin 866 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/meta.json        | 219 ---------------
 .../Mobs/Hats/corgi_hats.rsi/nursehat.png     | Bin 255 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/paper.png        | Bin 322 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/paper_words.png  | Bin 322 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/pirate.png       | Bin 535 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/policehelm.png   | Bin 478 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/redwizard.png    | Bin 421 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/santahat.png     | Bin 446 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/scarf.png        | Bin 329 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/sheet.png        | Bin 1130 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/sheriff.png      | Bin 586 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/sombrero.png     | Bin 523 -> 0 bytes
 .../Clothing/Mobs/Hats/corgi_hats.rsi/sun.png | Bin 204 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/tophat.png       | Bin 245 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/ushankadown.png  | Bin 1097 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/ushankaup.png    | Bin 887 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/wizard-fake.png  | Bin 515 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/wizard.png       | Bin 515 -> 0 bytes
 .../Mobs/Hats/corgi_hats.rsi/zebrascarf.png   | Bin 369 -> 0 bytes
 Resources/Textures/Effects/fire.rsi/meta.json |  21 +-
 .../Textures/Effects/fire.rsi/overcharged.png | Bin 4849 -> 0 bytes
 .../Mobs/Aliens/hivebot.rsi/EngBot.png        | Bin 1750 -> 0 bytes
 .../Mobs/Aliens/hivebot.rsi/meta.json         |   4 -
 .../Textures/Mobs/Pets/caracal.rsi/meta.json  |  81 +++---
 .../Mobs/Pets/caracal.rsi/stanislav.png       | Bin 14692 -> 0 bytes
 .../Mobs/Pets/caracal.rsi/stanislav_dead.png  | Bin 884 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/clown.png        | Bin 3056 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/clown_e.png      | Bin 308 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/clown_e_r.png    | Bin 299 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/clown_l.png      | Bin 429 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/meta.json        |  36 +--
 .../Mobs/Silicon/chassis.rsi/peace.png        | Bin 2016 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/peace_e.png      | Bin 308 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/peace_e_r.png    | Bin 299 -> 0 bytes
 .../Mobs/Silicon/chassis.rsi/peace_l.png      | Bin 429 -> 0 bytes
 .../Mobs/Silicon/onestar.rsi/meta.json        | 193 --------------
 .../Mobs/Silicon/onestar.rsi/onestar_boss.png | Bin 5815 -> 0 bytes
 .../onestar.rsi/onestar_boss_screen.png       | Bin 7488 -> 0 bytes
 .../onestar.rsi/onestar_boss_unpowered.png    | Bin 2310 -> 0 bytes
 .../onestar.rsi/onestar_boss_wrecked.png      | Bin 17336 -> 0 bytes
 .../Silicon/output.rsi/ai-banned-unshaded.png | Bin 820 -> 0 bytes
 .../Mobs/Silicon/output.rsi/ai-banned.png     | Bin 1589 -> 0 bytes
 .../output.rsi/ai-banned_dead-unshaded.png    | Bin 109 -> 0 bytes
 .../Silicon/output.rsi/ai-banned_dead.png     | Bin 463 -> 0 bytes
 .../Silicon/output.rsi/ai-empty-unshaded.png  | Bin 109 -> 0 bytes
 .../Mobs/Silicon/output.rsi/ai-empty.png      | Bin 451 -> 0 bytes
 .../output.rsi/ai-holo-old-unshaded.png       | Bin 2483 -> 0 bytes
 .../Mobs/Silicon/output.rsi/ai-holo-old.png   | Bin 7280 -> 0 bytes
 .../Mobs/Silicon/output.rsi/ai-unshaded.png   | Bin 6255 -> 0 bytes
 .../Textures/Mobs/Silicon/output.rsi/ai.png   | Bin 6761 -> 0 bytes
 .../Silicon/output.rsi/ai_dead-unshaded.png   | Bin 453 -> 0 bytes
 .../Mobs/Silicon/output.rsi/ai_dead.png       | Bin 453 -> 0 bytes
 .../Silicon/output.rsi/default-unshaded.png   | Bin 2005 -> 0 bytes
 .../Mobs/Silicon/output.rsi/default.png       | Bin 2005 -> 0 bytes
 .../output.rsi/floating_face-unshaded.png     | Bin 721 -> 0 bytes
 .../Mobs/Silicon/output.rsi/floating_face.png | Bin 721 -> 0 bytes
 .../Silicon/output.rsi/horror-unshaded.png    | Bin 1777 -> 0 bytes
 .../Mobs/Silicon/output.rsi/horror.png        | Bin 1404 -> 0 bytes
 .../Mobs/Silicon/output.rsi/meta.json         |   1 -
 .../output.rsi/xeno_queen-unshaded.png        | Bin 2484 -> 0 bytes
 .../Mobs/Silicon/output.rsi/xeno_queen.png    | Bin 2484 -> 0 bytes
 .../Drinks/(mdr)grapejuice.rsi/icon.png       | Bin 842 -> 0 bytes
 .../Drinks/(mdr)grapejuice.rsi/meta.json      |   1 -
 .../Consumable/Drinks/banana.rsi/icon.png     | Bin 288 -> 0 bytes
 .../Consumable/Drinks/banana.rsi/meta.json    |   1 -
 .../Consumable/Drinks/bigteacup.rsi/icon.png  | Bin 310 -> 0 bytes
 .../Consumable/Drinks/bigteacup.rsi/meta.json |   1 -
 .../Consumable/Drinks/britmug.rsi/icon.png    | Bin 420 -> 0 bytes
 .../Consumable/Drinks/britmug.rsi/meta.json   |   1 -
 .../Consumable/Drinks/broken.rsi/icon.png     | Bin 177 -> 0 bytes
 .../Consumable/Drinks/broken.rsi/meta.json    |   1 -
 .../Consumable/Drinks/brownstar.rsi/icon.png  | Bin 242 -> 0 bytes
 .../Consumable/Drinks/brownstar.rsi/meta.json |   1 -
 .../Drinks/espressomartini/fill-1.png         | Bin 170 -> 0 bytes
 .../Drinks/espressomartini/fill-2.png         | Bin 168 -> 0 bytes
 .../Drinks/espressomartini/fill-3.png         | Bin 197 -> 0 bytes
 .../Drinks/espressomartini/fill-4.png         | Bin 211 -> 0 bytes
 .../Drinks/espressomartini/fill-5.png         | Bin 233 -> 0 bytes
 .../Drinks/espressomartini/fill-6.png         | Bin 246 -> 0 bytes
 .../Drinks/espressomartini/icon.png           | Bin 318 -> 0 bytes
 .../Drinks/espressomartini/icon_empty.png     | Bin 288 -> 0 bytes
 .../Drinks/espressomartini/meta.json          |  37 ---
 .../Drinks/glass_brown.rsi/icon.png           | Bin 277 -> 0 bytes
 .../Drinks/glass_brown.rsi/meta.json          |   1 -
 .../Drinks/glass_orange.rsi/icon.png          | Bin 261 -> 0 bytes
 .../Drinks/glass_orange.rsi/meta.json         |   1 -
 .../Consumable/Drinks/glass_red.rsi/icon.png  | Bin 273 -> 0 bytes
 .../Consumable/Drinks/glass_red.rsi/meta.json |   1 -
 .../Drinks/glass_yellow.rsi/icon.png          | Bin 252 -> 0 bytes
 .../Drinks/glass_yellow.rsi/meta.json         |   1 -
 .../Consumable/Drinks/grapesoda.rsi/icon.png  | Bin 365 -> 0 bytes
 .../Consumable/Drinks/grapesoda.rsi/meta.json |   1 -
 .../Consumable/Drinks/kvass.rsi/icon.png      | Bin 219 -> 0 bytes
 .../Consumable/Drinks/kvass.rsi/meta.json     |   1 -
 .../Consumable/Drinks/lemonade.rsi/icon.png   | Bin 345 -> 0 bytes
 .../Consumable/Drinks/lemonade.rsi/meta.json  |   1 -
 .../Consumable/Drinks/lemonglass.rsi/icon.png | Bin 286 -> 0 bytes
 .../Drinks/lemonglass.rsi/meta.json           |   1 -
 .../Consumable/Drinks/watermelon.rsi/icon.png | Bin 282 -> 0 bytes
 .../Drinks/watermelon.rsi/meta.json           |   1 -
 .../Drinks/whiskeysodaglass2.rsi/icon.png     | Bin 613 -> 0 bytes
 .../Drinks/whiskeysodaglass2.rsi/meta.json    |   1 -
 .../Pipes/crack.rsi/lit-equipped-MASK.png     | Bin 2891 -> 0 bytes
 .../Smokeables/Pipes/crack.rsi/lit-icon.png   | Bin 3658 -> 0 bytes
 .../Smokeables/Pipes/crack.rsi/meta.json      |  94 -------
 .../Pipes/crack.rsi/unlit-equipped-MASK.png   | Bin 626 -> 0 bytes
 .../Smokeables/Pipes/crack.rsi/unlit-icon.png | Bin 783 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/clown.png       | Bin 393 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/clown2.png      | Bin 442 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/clown2_cap.png  | Bin 529 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/clown_cap.png   | Bin 481 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/death.png       | Bin 409 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/death2.png      | Bin 482 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/death2_cap.png  | Bin 492 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/death_cap.png   | Bin 425 -> 0 bytes
 .../Fun/spraycans.rsi/equipped-BELT.png       | Bin 188 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/meta.json       |  75 ------
 .../Objects/Fun/spraycans.rsi/mime.png        | Bin 400 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/mime2.png       | Bin 271 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/mime2_cap.png   | Bin 285 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/mime_cap.png    | Bin 410 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/rainbow.png     | Bin 442 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/rainbow2.png    | Bin 336 -> 0 bytes
 .../Fun/spraycans.rsi/rainbow2_cap.png        | Bin 379 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/rainbow_cap.png | Bin 482 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/spray.png       | Bin 293 -> 0 bytes
 .../Objects/Fun/spraycans.rsi/spray_cap.png   | Bin 246 -> 0 bytes
 .../Fun/spraycans.rsi/spray_cap_colors.png    | Bin 181 -> 0 bytes
 .../Fun/spraycans.rsi/spray_colors.png        | Bin 145 -> 0 bytes
 .../Objects/Materials/Sheets/researchicon.png | Bin 879 -> 0 bytes
 .../Objects/Misc/bureaucracy.rsi/meta.json    |  39 ---
 .../Misc/bureaucracy.rsi/paper_talisman.png   | Bin 219 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_armor.png  | Bin 285 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_blind.png  | Bin 278 -> 0 bytes
 .../paper_talisman_communicate.png            | Bin 322 -> 0 bytes
 .../paper_talisman_conceal.png                | Bin 335 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_deafen.png | Bin 254 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_emp.png    | Bin 262 -> 0 bytes
 .../paper_talisman_newtome.png                | Bin 307 -> 0 bytes
 .../paper_talisman_revealrunes.png            | Bin 327 -> 0 bytes
 .../paper_talisman_runestun.png               | Bin 295 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_supply.png | Bin 312 -> 0 bytes
 .../bureaucracy.rsi/paper_talisman_travel.png | Bin 273 -> 0 bytes
 .../paper_talisman_travel_unused.png          | Bin 274 -> 0 bytes
 .../Specific/Medical/medipen.rsi/atropen.png  | Bin 239 -> 0 bytes
 .../Medical/medipen.rsi/atropen_empty.png     | Bin 292 -> 0 bytes
 .../Specific/Medical/medipen.rsi/meta.json    | 250 ++++++++----------
 .../Specific/Medical/medipen.rsi/oxapen.png   | Bin 255 -> 0 bytes
 .../Medical/medipen.rsi/oxapen_empty.png      | Bin 306 -> 0 bytes
 .../Specific/Medical/medipen.rsi/salacid.png  | Bin 250 -> 0 bytes
 .../Medical/medipen.rsi/salacid_empty.png     | Bin 304 -> 0 bytes
 .../syndihandheldcrewmonitor.rsi/meta.json    |  21 --
 .../syndiscanner.png                          | Bin 670 -> 0 bytes
 .../Tools/Hydroponics/disk.rsi/disk.png       | Bin 355 -> 0 bytes
 .../Tools/Hydroponics/disk.rsi/meta.json      |  21 --
 .../Casings/rocket_shell.rsi/base.png         | Bin 322 -> 0 bytes
 .../Casings/rocket_shell.rsi/meta.json        |  14 -
 .../Magazine/Dart/darts.rsi/base.png          | Bin 375 -> 0 bytes
 .../Magazine/Dart/darts.rsi/inhand-left.png   | Bin 441 -> 0 bytes
 .../Magazine/Dart/darts.rsi/inhand-right.png  | Bin 464 -> 0 bytes
 .../Dart/darts.rsi/mag-unshaded-1.png         | Bin 2219 -> 0 bytes
 .../Dart/darts.rsi/mag-unshaded-2.png         | Bin 2219 -> 0 bytes
 .../Dart/darts.rsi/mag-unshaded-3.png         | Bin 2215 -> 0 bytes
 .../Dart/darts.rsi/mag-unshaded-4.png         | Bin 2223 -> 0 bytes
 .../Dart/darts.rsi/mag-unshaded-5.png         | Bin 2210 -> 0 bytes
 .../Magazine/Dart/darts.rsi/meta.json         |  37 ---
 .../Magnum/magnum_smg_mag.rsi/base.png        | Bin 204 -> 0 bytes
 .../magnum_smg_mag.rsi/inhand-left-mag.png    | Bin 228 -> 0 bytes
 .../magnum_smg_mag.rsi/inhand-left-stripe.png | Bin 125 -> 0 bytes
 .../magnum_smg_mag.rsi/inhand-right-mag.png   | Bin 244 -> 0 bytes
 .../inhand-right-stripe.png                   | Bin 130 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/mag-1.png       | Bin 161 -> 0 bytes
 .../Magnum/magnum_smg_mag.rsi/meta.json       |  36 ---
 .../Magnum/magnum_smg_mag.rsi/stripe.png      | Bin 705 -> 0 bytes
 .../Guns/Projectiles/meteor.rsi/large.png     | Bin 317 -> 0 bytes
 .../Guns/Projectiles/meteor.rsi/meta.json     |  15 --
 .../Machines/traitordm.rsi/meta.json          |  17 --
 .../traitordm.rsi/redemption-unshaded.png     | Bin 795 -> 0 bytes
 .../Machines/traitordm.rsi/redemption.png     | Bin 766 -> 0 bytes
 229 files changed, 207 insertions(+), 1262 deletions(-)
 delete mode 100644 Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png
 delete mode 100644 Resources/Textures/Clothing/Belt/assault.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Clothing/Belt/assault.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/equipped-EARS.png
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-red.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET-vox.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/armor.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/cardborg.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/deathsquad.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher0.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher1.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/ian.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/oxygen.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/petcollar.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/walkietalkie.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/beret.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/blackscarf.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/bunny.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/captain.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cardborg_h.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cargosoft.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/chef.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/christmasscarf.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/clown.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/detective.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/festive.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_cakehat.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_reindeer.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_white.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_yellow.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_cakehat.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_white.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_yellow.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/helmet.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hopcap.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/kitty.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/nursehat.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper_words.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/pirate.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/policehelm.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/redwizard.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/santahat.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/scarf.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheet.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheriff.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sombrero.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sun.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/tophat.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankadown.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankaup.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard-fake.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard.png
 delete mode 100644 Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/zebrascarf.png
 delete mode 100644 Resources/Textures/Effects/fire.rsi/overcharged.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/hivebot.rsi/EngBot.png
 delete mode 100644 Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png
 delete mode 100644 Resources/Textures/Mobs/Pets/caracal.rsi/stanislav_dead.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
 delete mode 100644 Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_screen.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_unpowered.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_wrecked.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/default.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/floating_face.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/horror.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/meta.json
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png
 delete mode 100644 Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/banana.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/broken.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/clown.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/clown2.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/clown2_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/clown_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/death.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/death2.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/death2_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/death_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/mime.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/mime2.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/mime2_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/mime_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/rainbow.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/rainbow_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/spray.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap_colors.png
 delete mode 100644 Resources/Textures/Objects/Fun/spraycans.rsi/spray_colors.png
 delete mode 100644 Resources/Textures/Objects/Materials/Sheets/researchicon.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_armor.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_blind.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_communicate.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_conceal.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_deafen.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_emp.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_newtome.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_revealrunes.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_runestun.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_supply.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel_unused.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen_empty.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen_empty.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid_empty.png
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png
 delete mode 100644 Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/disk.png
 delete mode 100644 Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/base.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/large.png
 delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
 delete mode 100644 Resources/Textures/Structures/Machines/traitordm.rsi/meta.json
 delete mode 100644 Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png
 delete mode 100644 Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png

diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/assault.rsi/equipped-BELT.png
deleted file mode 100644
index 77a7c17193ed651608539e1c959555b956b994ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^Mb{aSW-L^Y)gZ_hAQ#V;{{Q
zg=lywWb+jUPjR}=rx?A=;aZJd_`&l6;f^AAT^?zPs80A=IzjvT3?6mQU4QBY`r`U+
z_#@woG6IbR0yfpmW$&^ildsqXKQG_B`)&=ZU3;(LuBiMcA0Nhry*`_F|8H#Q)Es;J
zJ@;Nut}m-oRA2sZ{{Niz-M6LJze%2d*mw1(zgzFFz591xQgU@w-Ne_cPan+Nx5uub
z<HYaVukTfHINzLH&b2t=?$x{7&tLiJEE$~646zwV3Y_dN`c}QuIptg1GuM@gBH5GD
ztlU@b(J=Ki=3TtQ{QUOA6VE@~_xt<*J16^7d+g#ai+tm{<=4;>xaPF0g75F&7pHeS
zyxKJ{#p;OBu@$qgZ`pPI_*-+%?{ak+aS432H_vbY?Wp*{IIm%1fO%WwB#^zHu6{1-
HoD!M<+oYs1

diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/icon.png b/Resources/Textures/Clothing/Belt/assault.rsi/icon.png
deleted file mode 100644
index 18047a5740a46576225cb3c988c2a1d0ba01bf93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 382
zcmV-^0fGLBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003+Nkl<Zc%1E(
z%W8x$6o!9GHx-5%0&a!UT}9vEK<Ps8$@(;Xiga5jinALA+y-QZmM$k<C5>Z@v6t24
z0})Je&X?N}2m}IwOD9^=nI)<8>DP<SJMQ(8q(z<q0M;9(+mDBSG^TE#$IQt%8(EUd
zBG0hiFdPp(>ZYCZ)uKw0bMBOwY+y+$i3ptYL0}t7&?c&4Oi4JmKrOGDktySXh_r}p
zi@XI?ay6rykM7DxfOCF2ANym0{cdZ_2qzx_-{b(`oRN9j_q#2MJOdGdhz93@hyVap
zNq80=s*+GQt^V#}as_(PMVxcFilf0kzP-NS_U<0Q_)rQV@Klz75TjU&1x)Iu#VY=e
zVO}wth+^&v0v?r66{1xf;r&zUw+&NL_4&2Hl*oBtTbW)`lD&C&tS0{lEJ>w${ycFY
c5D5GiU&K<K)xHI(Hvj+t07*qoM6N<$g2>ybI{*Lx

diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-left.png
deleted file mode 100644
index 9edac4c151b0a91f22ab69a32f6a0502f3f2699f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0003TNkl<Zc%1Fo
z!EM7Z425A?8whA7-~!%2&=%E(-NGwq0Z!lm-azWffDi4#G37+S|6QD1o)LzkgU~qu
z00000006)>Ip-E*Y*u+O#+Gw7%RBPcfg;jW)p>6h?Y(!Z>O{o62<8PCjd=l7brKQx
zv#zGOBH~naG7WWfK))IA{dkz>G6Op4HUny{W|_6tac011k3j$c000000KgR?1lyfh
zXXby4&-46co!L{D&Cp$45JFf}O6~amY{t;5v17NTl-euZ*QEg4w%Kk*|FD1C%d$+z
z>)9?C_6Yn}<g>*$Ex>*r@9co9%nGo7_)^N#D)SX@dknwh#wn$?7ykJA4D)^aok9rf
naq^c^o_8F-k2Bh@PkfSJD=%zZmgvjU00000NkvXXu0mjfklLF#

diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/assault.rsi/inhand-right.png
deleted file mode 100644
index 2489dcd7ec23c35c0bc39cefef4cf9daed9e79b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^Mr1aSW-L^Y-RhuOkKm>>n~6
z-Z#dcKPBV(Lb_#7Yo+u3Me73u`kUvyJ#<f0$p5NBw*9osTSx!DzvO?YWY$b4XBMDQ
zP+;%Ganf@7wZ3G&=P_K0K3z9?VpE=}D5acvkUKlMM^R8QP0sgFs_jiCHem%NQRB<O
z*Qa*5^BPa?2uc2)$i@@<rux9+x_B))(-(}wzONV!j|F{P(P8-NOT+&Uk_c-W*6!MU
zvo@o@GVuTI{P*(fwj7@`mm&M@cdwP-?VcX@j(YS~c<#i8UF*v4{hlKKx-I0|8kR5l
zyEA8L-Jdptb^ZJH*Q&?nPHlMnv7%_^kM*BtnFTW~pE8HB@@J;SYL;uCzJ2=RxnzDz
z<eu*<`4#T#dv2C-yMDfY^R=?d=lQq41uSCEId|(R!-B`$bN=S6I&=M_B*^ccu6{1-
HoD!M<sL7->

diff --git a/Resources/Textures/Clothing/Belt/assault.rsi/meta.json b/Resources/Textures/Clothing/Belt/assault.rsi/meta.json
deleted file mode 100644
index a01a9c6cb9..0000000000
--- a/Resources/Textures/Clothing/Belt/assault.rsi/meta.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/equipped-EARS.png
deleted file mode 100644
index f071b43109b4b929a0ba6c235065f76e77225615..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!CX%l$B>G+x3@NOHW&!7UU=XXmY4K&isS*&
zIi9*o5pEA3Fugb3`KdVknK;9X&H1ly9-H#-$?RLVpU#+W_Econ`fIa({p!Ck=jL>S
zQxk#40YO7!%6qOazpn6CoW3W@@l^U(8Yfu1XW0~P%Z0MKP17XYK?0txelF{r5}E+U
C<xRi<

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/icon.png
deleted file mode 100644
index 608b9ef7a0a787b53eddbfd9d8f25b67c1187e72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik70(?STB_t%&R8{ly^XJc>Z)9Y2cfni@4UM~*$<fi#fq{YI;^IJsi888}
zffP?kkYDhB1Yi)lf9@PmoU_0qvY3H^?=T269?xHq0u;>kba4!^@PFIyDAb_9;o5k{
z<z4;#o;ggVIagQxJNI9Xr^)6?Gt&bHb5Q}^y@lqj?Tv}88`^dXZ1>RT)>J$6YgZDB
z-u?$C*&NfZv0A3<nv^lU+Vj-!Kuui2PGPOWJKU#i@>%NVFBAOr=aAq;*`+<2w`bSP
R{sy#|!PC{xWt~$(69Da^XU+fs

diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
deleted file mode 100644
index 774e33fbe7..0000000000
--- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-EARS",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/equipped-EARS.png
deleted file mode 100644
index 1abbd39075f760257e76bf122973304da1dac5e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gdz
zi(^Q|oVT|QavnAiV7<t>gu78;f?d$0>_X2>*9BH0+n6)`z5msV$Ln0^Gqj8FKVr%7
zNQR-1ub}9&_%(Jpk*PQD2R2-nxL_T+_j${;zH2$`63J`sRo`4LAC=v2`Mm4(yIF4;
z4F8nIzTWqKlVDQ4`r-D);R`-}P~2=^&nobop`(}qW@Li}yTcr2g>#Ik!V_X6{;oN&
zuB742{vTaIjDG(QhEL-XI2>-Ty+Qjg*Pp{54#qR$G2#jHABKt#TFO%o&5i(in8DN4
K&t;ucLK6USM0AJ%

diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png
deleted file mode 100644
index 0b1f751416654df08f1a601633bc0a7b0a355984..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 294
zcmV+>0oneEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002(Nkl<Zc%1E&
zJr9B~5QbkINy^luH?e6nI?<6o0l$QQ$>yeuZa2XS5yrY0q637=hl72Rrn%&rd#+!A
z!{PXMJey=9GJz1N>Ka8+SgoB55gBIg1`(N`6py0Fv~4?^#KtB$NfMmT9^yEjTK7AF
zrfC50HLop@W!Yf7xIh?&gYn`50HC$TVgG>E8UPRov7P`kLrMwX_aUVOGoz~O$pWK4
zlihY}j;B)>UoRKj?)Q)NN~!KymSs8rM@2*?P1D}@uaq+H5@WEs1A!38^L+5^7wP<+
sz7B0WpH*T?@vpaQ@eAj0I2>#71p4-0q*qZXE&u=k07*qoM6N<$g27IIhyVZp

diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
deleted file mode 100644
index dd2fdcc360..0000000000
--- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-        "name": "equipped-EARS",
-        "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-red.png b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/icon-red.png
deleted file mode 100644
index 7385dae93acd127001028a2cb5455e646865a84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007jNkl<Zc%1E)
zv1{8v6vn>`r9+1dRe~iC)ll$~(@+92ba19D@fQCNr=hC@{SyM+3)0+<NhW7@G!$Ye
z8Kk8i0_~7H<GZC$L*3zZ2zOYP(>kTa9sDNgc<+6``|fln*6;VR%Gg+``Wj#jum<=a
z03Q9VMsXaIeNK{uEnCMPauUXIOhg36SV=?(K@)EX0C@g*A5u!BX}T1|(n}zOAm8^f
z@rL;J^b>>-WT7VB5Y2iA$JY&bo`)a^AcP>B^Q-u+140O5jG<Pmp)*j(+7STY>h=^*
zOas2}<K{<(X1(LakFOgpFVFLeV@m;8`Y5_<)avDU^J0j-;0XH{1+sPotu>^SrJSrC
zfrv1WXK2<tAR_Ev6nGmhhFG`+LI`^G1>l^!SzR7-H0vEF4ghvP*vQ%uTD`j&H|rg=
zdN~I243~!-@4i37q9v&S2qEbGG{og0$3UK;)yuIL9Dy<BX6Wo=RaY&<)$J*=c7$_z
z0Amcg;S`+n($`V}5JC{=9NlmVV+_va0kU@FKxV~fLu*}uIF|<)kH_eSQ+S>Sr4)=Y
z*xA`BIpF}}I3~_Hj4_Z>!t*?I!zr}Z4rE?bDTO3Sm{O_&bF#aM?d@$R%sGdY62_R4
za}I!roOl#PPGD<m3n#mqrRJ|ces$uuzSYYC07@woMd5Ne=TJ&PYmFcXDs>JZO;aYN
zL=XhfT4OXCxlO3GMo|>7GyR}Gm)syCy!1o&Ze5v&u(`8Q+5^@arBq3Lo_bcy)^)>a
zX>1<C_MJZ=Hx?DySR@XhB1S~c`q^CD&yFuT2kt$H?B_CH^rx53ees~n=wHOj{|D9p
fYk)Pt$^m`?aY=+H{~2q+00000NkvXXu0mjf0#Z2f

diff --git a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
index cd85a5be23..210f1a39ed 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/spaceninja.rsi/meta.json
@@ -1,56 +1,53 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "icon-red"
-    },
-    {
-      "name": "icon-green"
-    },
-    {
-      "name": "equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "red-equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "green-equipped-HAND",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "red-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "red-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "green-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "green-inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-green"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "red-equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "green-equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "red-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "red-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "green-inhand-right",
+            "directions": 4
+        }
+    ]
 }
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
deleted file mode 100644
index 522a2eb9237cc1184d099440e873d7431ff13928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 825
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{2-dT^vIy;@-|WpDpYta$H?=no_Us6s~RT
z{7DDBk0$e9YS^+xG^+E7Lei3z&!5SEc(HSXWj3FtlEkeqkN9<3Mfl~ss|B^1<U&HY
zE=>t)k*a(=dq!;f+jDQ$P2Bgr@x$D?2hN>KPglErPAzNetOY(olXaf3M))>9%?_7}
z$e9!w>78I$wkYR*1cQm)mAkF(PCP2?sn^Qx{}bj6+@7!EV7hN_d4uVG&-qs3yIJy|
zizcc_aPRo@Adr#&|AVJ@c$dpEF-%BMesDvlNxr`3z$D3IOm^aFvO2pytp0!BP-w&S
zoona*XSj0sd*SEp-*OFvCY*jMbis4R>j>4x<Q47jH)@IX&AM;)y8mji!_Js#`wveJ
zSLZrE&t|&Oqjxph7wWX83W@9UcAxFl4P1YH?d|PC1#=YsYn)*+IC+QwzVz)s=d#P0
zI$PQ2G0jNfG-XZLEYz*%W2WJ=>_AO^`?kH0wmZMJ<;-Th@RK{eJ@scndUTrhhEP!#
z7Xii#g?HB#xZj^}=KA~XYgAk2F|GQn|LT71{PNx<5i=w&-!l|mR_$l<Am-j@W~-0O
zTBI1~A2Uk&ay7Wpal04)*7v+$zR%T53OpUCykOIp3b}4QvCrmnKZY!ike?}(9ya~9
zF_YHRu00IAi)TD~eNH@=z3IWrn$L5%GNjij@+@RY*&J!fWU?mND@P^c-JaKT7`E_U
z7ibG$3VEKWacDwI|C$cLt9)BHf81#}5V4*yt6Qoe_toFs`}1a01s?pZH}QVdgY9e;
z?hRGyj(?@*><OO|{g@%Af4Z0IYEy+x?hmuJYK8y#?EU@e#_*Q44Ee|J$Lv?WTqyJU
z{=YCK;RONu{tS+BQ5>ISCY*mh`}vl=m+M^g4op#CderjgK9df^WF36?2rI`&;WLM=
Vf{fI6h5(a0gQu&X%Q~loCIC|GXM+F$

diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/equipped-HELMET.png
deleted file mode 100644
index 863e02e405b97a9b5b99c34a642d52702ccf47a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 665
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU`p_GaSW-L^LEz8Y^g+vWAit=
zdc7!pDR7IA*OVicM{+Jti`5Pj4)c~E?^}DFp7qS+{>GniaMDW!mF{NOizf|_s3v%L
zw6R$2_#)%v@K!<n+MLY&@88up+`qr%{?EI=@4Vmhz3shm)>f%!GdZjoX73dL5RiW9
z-?6It8lCC@!#~Go*3~+1Wq*^u=KJG*dEWi@{d*V~uGG!<b#=P%bt=n_qtSC`TOYqR
z?}*cMgSwA;bt)S6Ox>;Tf4cU6)MKc*rL$t5KF7N1aA(d{XMBYByo=2|8!Yxgd;inQ
z>FT}gz1JU?-~X}y!(A44W`kJ^?*BT)#IPVj=bP{4Bd4;Mj=TF>^fkxmnQy(GFyZS~
zmNP=emsv^$8Q(DExG-2VNDCg|JK)B$fq4T#A+-&E85g%~brNxlUAuJSb$wxmhP>UT
zAIlx}rus(l6<2;R;bXAanbWr4=G~*XnwvYn+U%>9xU*jY7y$eB)IP5KemPC#Zdta5
zqo^+9)gMMdy<(@%>E5fqeL6cdEG1~Jy!?I9OKBoNnR&5hQ_ruy%94BA&35L+nNnO|
zQ`olUW}m$(ln^Nv)H^Bcpn->}*9IN$>~-(|GRD~^{Qi)xk<Yl^Zi3n3!{@Df!*{Zm
zY?3d?n#IsC^(xCH>-qn!*6j{{TpwXnB~dS}^QP|T$BPeczPIT6WLf*3-(tVT>)njY
zHU=KLE5pc>cVP9>8SASyIX1~Q^l~JyCnz)BV7$@6P{v@U)PP&)Gy96k56!n<aq$5r
OIR;NxKbLh*2~7Y2TOybM

diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/icon.png
deleted file mode 100644
index 8f9f2194f24a576beec9eb1c565b81da8a51be8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 377
zcmV-<0fzpGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003%Nkl<Zc%1E*
zJ#vFE5QQI})H;LR(83WY+@r?i=K`5H_sJ3bgB#qt&=H_@lUyK~j4nWm7>%&8wUS|I
z^k$erpxyULNDBl)2#l%8sO}!X0|0n%30fsd-F5v%h+t5F#yCE;L&iGq+klWC!754W
zSThHJqm->a8Dq#8yE;S80F8N<j#8>a2cbe30dARJgRz0Q380&oL<j)LEg(pXumo_J
z&Va8^5<t^8J6ojA0IkFpI$xw+>a7qJ`vS$ju#W2ufTtWh<<=0Rmtrdb%IJ8?hXZh#
zVv~%!AY=@XQf)!g2<NAMabEx}2*6kisKz9K-^T^=?G6A`Q3*lY-=&tr8DRPL9(({b
z00lyo$(RJ7YqET8wWBCf=T%i*27Lbj_#ebw0D6K=z9zk5pR#B22T9<6Ogw-G7#rXZ
Xh1_>09>Kgl00000NkvXXu0mjfUmcxK

diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-left.png
deleted file mode 100644
index 71423b594c0e998fb599f1ad0368948b1859c9db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005|Nkl<Zc%1Fp
zJxjwt90u?wDn-<|h>9;mvC>iL=wv|b;9@Cs5V4?sfPM*Qq2jDiaViui2SJIGqu50#
zI5@Q6;L>y`f~`YokeZSvcd-e1e$b%@_wVKD-4T)lh=_=Yh=_<NY!uM~x~@wYhI^W(
z3H2Y5GmPL0eE?%#6fLE;+P!V*oBM&6n`nP0qz6z+ZMEZ5<L39pktMTzkc$xQ@08Rf
z&>eiG(KJ7L{SA8k4cc_f@}ITp|68q91%QG2yCHoB%;zt2^A_#j0C2pQcT=<0s+u!F
zw!mzH-I*Yp^Z-6`hnD|xzxH00M$=KdDCsvsR_hq(T!5QR(5}DejgTjIf`vk%t*R>4
z6Ki;RF2gVkWV6|Uf6GaKUk31>cq=T30StQp!xs7gh=_=Yh=_<Nd^~yKD3j<zSG$L%
zp?@M2`T#sRA0V6ETVavc=Dyzp&X*_qUi|1x902h8UhW%$-5%ik8E|KOS+*zD2);in
zW(aQiK7fOZ>zq~l)zN-FsYdV+U&X?E*>(LuZ-S2-J17>5LNx*%z~<8}GMS7}4c{+;
z*_pYs)7|Yq8(~t70O*8J5vcF`001DWw9tEKV&dcsFVCH|-!Kf<wF41A`sQBg9-07v
z^~4%hqA_J98WXM^hyVaMI$`2Opf^Do7{IUxFl;}(+o)1!r`Wsz0000<MNUMnLSTYQ
Ceg=d9

diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/inhand-right.png
deleted file mode 100644
index 8abcd3bfa8c9d985398878698ffeaa85d32c9c45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005`Nkl<Zc%1Fp
zu}cC`90%~P5z)}K1~n8JLW|MZq#!udB8EX!Mztq2_fPZ>6c|l{R6|2iTvKBdO@`5;
z(9q&Jh+x-rhTao9->bXhz8`S#c|O1Q^X}c_?g2zZL_|bHL=-e3UDu^Lh{xkff(%MF
z|B#v({uTHF42v3zsf5|xmOj4?{e2uYoaDC^pqNUSk+ISC`^llHcDo;n;52{7DPVoM
zRByCjdaVq-Rz`e0EUc`TbniR>RKF?!&@;d72$(oJ$xR44ZvnvG`jL{P|E&5|X&(vQ
z0y79&M?yDS0X}j&!hg9}yVsQJ4M**^iIC_#vN{kAB3_#aIn8ey1JdWWp?p4XYMO?H
z#VDR0pJ5mVve~TXuK<Aa{G1A_iQ!)?fZGAw7We`X5fKp)5fM@F^u5#T_nW5u1pbat
z;0qvJAMjiKo)-Jzar(doD5etT{B#rm(E2P1w|UuIG4YFW#!XU30PwT(*G5x1j2om1
za2J_F?4g8fqlvBKvz%y~%hffRpZIf9gJ7Xh!2Qy)sw}RMDnKTaLG0m5RTfuBodVX*
zC$$lr?rzu?P#j#`czOT?BnnVZZ{t<d000Y%Q6vxdJ3jBVBExHxO@-gy%jVPLGXQif
zNbvepSo$((nVkuTW@o~xy8AbQp9-@8ZU=DNH<$vqs^i{clK=n!07*qoM6N<$f`5wu
AqW}N^

diff --git a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
deleted file mode 100644
index 3cf0b8d484..0000000000
--- a/Resources/Textures/Clothing/Head/Helmets/ihvoid.rsi/meta.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "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
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/armor.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/armor.png
deleted file mode 100644
index 48e49f91c1ce5cfa939018f69ac5103cb4acc56b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 481
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|iwp;uumf=k2V6xvd5~ZN67U
zEmBy#Bb8roP{>wDW#QwQIB(IiDGh%MDlYuH|IzZ${@%$piNcIP10dj!@vd_23f43~
z)99W+(aX;(Ew3LsbFzB>c9qOY9~PG8?eyzbsQ7em^&k6nOdTD|GFRQ|6WZc7r$OoW
zZdJ9|<*hS=IU0`@+T41s*`n}m{kn#|4^&jE*c?CHyjRBkL?xsyzirE+q@KB7WCBzV
zSh_#95E2aJXna<=?$)<&FXslRCWJO=sw=X`-^xjS^}hV{=k|_m>&?>q4jU|)bvEQc
zY-QDgRrXHx6N5QVT)#JY^@9>to2OgYVQvS}N=I8xT$~>N+3yTvSe46K!^G>?x5(B_
zop<>Bqf67ihyG>Ewp})N;Wf_;!}^4KQrS~m!VZfsGCpAWJy~qQwzSrpGbc3b*Lr;M
z*cGPKSZTNX*%p~Tg<tbTW-fdA<!!*epGFFua+946g4uSYb{m%6Tv(j9S}AT>P29KQ
zCGK4r+)rlCjtY1>`=qm1?fuz*%sULrYVR*kjjXfH_wT>5-D|<qj#rWImasOke`XC!
V`_dGl>rw!6w5O||%Q~loCIG#e*3bX|

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/cardborg.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/cardborg.png
deleted file mode 100644
index f0c14cb8362285cb8a7cc8b93dcf72b65890bb28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008tNkl<Zc%1E;
zzi!(w5XQe29X&WQQqcC$B>`f=t37yY(Fcehs6o)K1=_J_AHsQnqTM_sYv2s-l0k_O
z!?FhN>JU(%NJ-@BPa2^21A^ETef)g7lLdVQ7=~dOhG7_nVHk#Cm}30VIB9a;bKsTh
zM1M3+gb-NWTwCV~Apjs*-CVz@p)Hp|e`rna-F@J^u5$ta!1FrrN8==pcj$HxjN@|L
z^EwDaN@O<%{b4ejO#lE<w1?+)(qroT<r0Z&5=aRE0N+0{#^mC<sDDMbdw{$9z-cZi
z0a3J1Uw`~`ZXEym<ufH5i9vsuoSclXTK!Q*1ppvS%S|8*LsAQpTR`RN@)D=>IW86p
zOr}#xC^E9O0Ac9xyrZ=GJnykWU0aac0xGBTdHO#H+)A!0alEt6Q7hDCK0ru7TLLJk
z@zvLoD%YQvbp%~37McH#CD>{0La4`XV!c`km`tY#f}r*OZ<ET`fU^(h##q}wf$Q}x
zj*s6s&2xp609}Cm!usz&MF15w_IA6?9Mj*sK(2ry0aX^Kve`UjZgbV!;-YaIweHo6
z1TYN4Fbu;m48t%C!!XSACHFCw>hDX(*JgA)^&>Icb3dtBb+PljLgS(6pg&Bc0~|&B
zQa4z#TwYPMH-@yz0aH`ncpUEx+dN~8l=<&v3+3$<Xd8V^Y0vAZ<FnbssGLkT)Ps2?
zq$As+s72Jz3L)_8_fMxbdH42x5-Rp?QEYYnGL5=EwF-<DP%FSz{<aMf@_5$McgLmu
zY{zZwTFV>M7uNse`1c>*$no^g=rQxky$ZR`kh%~B{meAIWkx@<Ww>fDw8mV8>z;jH
z5~@=7EXxaES)5usL~LKS?%8jmdTcSQ32163MjJGda3cZh^(}h6UM4uD_w+e+T;rns
z05ZO=%cd>Qwm0qr4i8^f5?h9DYrF7NT8s+VY#soZ_x98+suYjD2&tt?>?-=1|B=7S
WU!dr#tZZWd0000<MNUMnLSTYjk$lSl

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/deathsquad.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/deathsquad.png
deleted file mode 100644
index 05a38386a8729369c2ff51026df3b8e0db46c9e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1979
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
N002ovPDHLkV1jg|&X52A

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher0.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher0.png
deleted file mode 100644
index 58abc6439b7d541d6487ad044f2e4cd4d3994daf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005iNkl<Zc%1Fp
zJ#NA<90l-4(kwjzrvN1kC=zq4Fjc-l*KQ0^rOq9?R16%U7s%dTAQMEO-T{fZqN)(M
z10RA2J3#XVeZM6NiJZTU;~~!g5fKp)5fKs58F6e|K0j0?0C{Q~l@#mAoAkF%y34~k
z_va|m2jquk$*)#R{&YGg&jKUm!ZPRB_D)BqVF&>50SF<E9)z<SfPH5DJ^&yHf{GC0
zso-*Qv3Uh1rYR?;Dg6^)fvdDD%i3m|2LXnQ1z;G<<JPqx2rhFmY<u3$^!8UXA^z{j
z@4E<X&%4R;ej*|wA|fIpA|fLC4~_{CHs9VI+Xes(qNo%B#5yk=MA7!o2i2y%>Cm{T
zplEt09@pt=YEwpIJ|JH@9RSPlah<}(y#a7)wfN{~&arJ&M<d)Tu3x(@tVUyb((6gp
zAZW8eUB}nzhJo+q7=wKKkGtj=^-lv><$`h3Fa*L7*RHE=M>#coK;BwbVj;uD0*~{#
zwyliFSJOn@NKW|QXEWt%@aHw4;H@bKtpmC>AW_@%bb}xhu4iiXY~}M)t4+1*q6{&#
zs)p2eitKB!4BJr(txE_|cm|(q4f`He<RGL`&qeGK%S{=ke3Emhk%-FU7X(+Ev3`gL
Q6951J07*qoM6N<$f*C^Q7ytkO

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher1.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/fire_extinguisher1.png
deleted file mode 100644
index 58abc6439b7d541d6487ad044f2e4cd4d3994daf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005iNkl<Zc%1Fp
zJ#NA<90l-4(kwjzrvN1kC=zq4Fjc-l*KQ0^rOq9?R16%U7s%dTAQMEO-T{fZqN)(M
z10RA2J3#XVeZM6NiJZTU;~~!g5fKp)5fKs58F6e|K0j0?0C{Q~l@#mAoAkF%y34~k
z_va|m2jquk$*)#R{&YGg&jKUm!ZPRB_D)BqVF&>50SF<E9)z<SfPH5DJ^&yHf{GC0
zso-*Qv3Uh1rYR?;Dg6^)fvdDD%i3m|2LXnQ1z;G<<JPqx2rhFmY<u3$^!8UXA^z{j
z@4E<X&%4R;ej*|wA|fIpA|fLC4~_{CHs9VI+Xes(qNo%B#5yk=MA7!o2i2y%>Cm{T
zplEt09@pt=YEwpIJ|JH@9RSPlah<}(y#a7)wfN{~&arJ&M<d)Tu3x(@tVUyb((6gp
zAZW8eUB}nzhJo+q7=wKKkGtj=^-lv><$`h3Fa*L7*RHE=M>#coK;BwbVj;uD0*~{#
zwyliFSJOn@NKW|QXEWt%@aHw4;H@bKtpmC>AW_@%bb}xhu4iiXY~}M)t4+1*q6{&#
zs)p2eitKB!4BJr(txE_|cm|(q4f`He<RGL`&qeGK%S{=ke3Emhk%-FU7X(+Ev3`gL
Q6951J07*qoM6N<$f*C^Q7ytkO

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/ian.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/ian.png
deleted file mode 100644
index f1548bfab228498bad3ed6606ac784d4d980c882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000BKNkl<Zc%1E-
zzfaph6vv;dgsVcDwu(ejqJmHtqN)`OQ^za_F)=XqKj>e;?7x7OsRKhLIx$p2k-Bt`
ziYl{Ik&K+isNsieQZArghsgFhK09}g18Vg?OX54<`@Z+?M=o~&2!bF8f*=TjAP9mW
zNHV6LXOq-tp-=Z#g&K5km8t6I(m3Hb4l9*PnyCC@r<}&5GIW0}8Yt~4+ld5`gsJD*
zlXv4qE_TYWuzjOsTUNia+!*_wecY7Rf1v6FIotx*71z1$u>M~{Istt4i$(D}UU_A?
zk@;F6+xx2e$|K-^LoER#iwvdI{~k9jGDUWgyE>6JnQ8=h!4g9JvSN`-NQ%`sH6pEC
zLAtqm0%#A)pM$wbDTTpcXr^?yKK<aw*;mw`Xbqs00wDxuX8wex!_@JDjQdm|bppsi
z0|+7Dx&VX0gJJLAC8NQn9C^|SSlGVN>~<?Cxb1`M4(C2&zX5LhewE#BWxf#->3drI
z^R)DROg+yAyNj&TahPEk%yELx!S15+UVKu00DwvKmHrDDhQV@=Yj9lzC<4IcC4gmF
ze*Mq&Bgg@Ov1ze-y`Fgwi1c~V=qo$vWgP&37l|v+n)}vA5ClOG1VIo4K@cRs)bmVu
zVVN;>e=XBfC%hTT!idVfT^3|{_n7$znC3K?hV8LuXEK=<_WsogkhkA5Ih&*JUox0|
z9x1nvn`7IKJ06cc74`yG9@^f;q{98&SaOBHE|&-y-%P#90OAuNoC4mQmJMDzH-ZPw
zLC10Ydjly$9Nt;K<2XTE&UQ#M0WXfYksL`t;({i+exf~Kg}HE9t^h#FKn^Bf7|B5c
zfRrO6iWTN!{SgtDgir!ZJ<lpjE3wXK{nM}j?G4L#;R!A(V~Mey=#PNP(n=%=a=!w!
z7anr7CzXA=(FDt~Qe9Nk>vhetET9`B3tgNpSFW8K(j5><fGDexdXC8Oze7f~BfT#%
zIwCz|>UmbJ%!iD74F|t|z|5m(Lh(^YuD6a-_dbtd7_3&S!NU))#%d<{sP#{wYj+~Q
z2C-AXGstJ{tk0lpcc5!`z;3sOb)+16C(Gagf~j!5brjL@wC#4w_v@_B!ta1!Wbko{
z3i+&ih_c5oDAme5u%~s<&JFnf=2PYul!jrj7hl$VjjrAC>qLH4EA#$yQimj7k9!Sg
zKfV@jB=|B@@35*`OsVjKPuk%vY~N_6-eFgpU!hj3r4!;eBC;D9Q_m~6QT0XkPf!~F
ig+^2xr)hJazWfCo?31~RP}Lp)0000<MNUMnLSTYH3F5>6

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
deleted file mode 100644
index 7126cd166e..0000000000
--- a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/meta.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "armor",
-      "directions": 4
-    },
-    {
-      "name": "cardborg",
-      "directions": 4
-    },
-    {
-      "name": "deathsquad",
-      "directions": 4
-    },
-    {
-      "name": "fire_extinguisher0",
-      "directions": 4
-    },
-    {
-      "name": "fire_extinguisher1",
-      "directions": 4
-    },
-    {
-      "name": "ian",
-      "directions": 4
-    },
-    {
-      "name": "oxygen",
-      "directions": 4
-    },
-    {
-      "name": "petcollar",
-      "directions": 4
-    },
-      {
-          "name": "walkietalkie",
-          "directions": 4
-      }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/oxygen.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/oxygen.png
deleted file mode 100644
index 4e1ba4acbb032bda948e73fcfd5f1bd9db97eed0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006INkl<Zc%1Fp
zu}d3K90&04-IXq#0#%Tv3dUsV(mtmf3Qnb$MR<!xhyDSgqvD^?_7A9gk<u=aLWhop
z7NpCyOQ%F38WkELgOq~c{T#{_FTG3j67O>Q{Y>G#NACOk@p2j71Bi%-h=_=Yh;A4o
z>i~nWY*&KMr(5q5)pBcianfbkuK1IWU_YJ%0DJ=^NfXRr2TOz2S^!{au7X+X0JGLX
zX#85!TCV}X^7^J23ooU-vLWS_4Ow2_l=Jf!mD_hf@DrGsyaxc-`T8-@dmwiW2)6l$
z!`tu+MaXyw#;<LdofhUNP5=P4S}k{VT}ah&LfhN2T~SKO`G13`b=N}Gah_b|dLkks
zA|fIpA|fK98=&V2O80>S04zRV!0R{fLt{ygrU%uXFDe_*J74UCWxMih?G*rEd+!kK
zW*twb@8HwU@6fu&&mS;5t<;-f*{=A7B4!>u42=gF$EM0C-JbveynV46n=kTyfKp1n
z7mEK1??uK-@RL+9px|6EPP<u0yIIHBR2hDu2&I&Gp7&o9A{*d&o?+P)+4}N1JTYBC
zV|PC^WE>y;-2s=cVIXFw1s?_)f9{4Sx-vF)_hEKgh$<f7JD|U+<Mh0B(Qp1LrIs!3
z*2O3sL&s&f>`jrrqP}qG4@n@?Tw3eQ&)`$d5cRMun=p(#xx6NqnNisC{p2Ad5si*B
XhNsCThrCTx00000NkvXXu0mjf>GKa<

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/petcollar.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/petcollar.png
deleted file mode 100644
index a41aa29918d7bb4307ea5df5f113324bb25039ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Cp}#pLn`LHy|tJ3kbywk!_7xT
z65FQmOt3s8!}HMcgVc`GO!FAm7m5gK{Nc!PZW7t=FYI0R>F1J?awVW{AXw4;^E+!-
z<@)WVJ&!lP-~9S!O8c=Nb{bE8R%Tx`>?*nY`TO$Uoj+5j&tYl(9Cz!kXHj#wV#H#r
z4z}zspI=U0wW|VR43J!4c5k)C_L%+)mV0OO|2UK%eUtU?&y;g3P0sG9GnEd=*cbQj
zG0#EA&6}D`Z{_tHxnJzQ?6|4^`lNE8-i8wKNG|^)hnUm*LFRe7`njxgN@xNAniXwi

diff --git a/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/walkietalkie.png b/Resources/Textures/Clothing/Mobs/Back/corgi_back.rsi/walkietalkie.png
deleted file mode 100644
index 5a5ff60380bfda086048ed24a728de09676ad958..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV65<TaSW-L^Y)gZ_hAPKwg=yX
z(kEWJ>X><uSzR|$^+EiJI+2)9_J6n~z3V#yc1=q<ZZ*YfM_aQ6=gOZlDoeX>&B>g7
z>HAHlop-9^^&<B%cR)d3&#iKX@TTaOUzV+YU1?t)b=otvvrL17>19lh!TaYQ9<wnl
z;PpQj|K31`&s+4-0xkj9iD%M`GuD3mX6SS}Jc6f);lRzUP1mFtT(WyD`uNMr|7-9#
zul!`Egbb|Yq{{>T?ocdK$|&34exuXk`;*nz-c@dzxB6zNg!_Ey)ZeRZ_r2OA#=ozA
z2P1>cL&@BVP4AUNy7h}}-7KwUFlFETc)I(ZMa}7OCWh(94kt}`{Kf0xU)Kpesq0xY
zetLE3xSBECJ}ug|P$D_&dcFCvj?+6C@}(2`I)fQ6nXI)szJF($R&0Zc=Nz?LtkZMc
z|8q{UQ{5J$m%Woa#(3&I#>i<0qh6cbG>gohm>T)Aa4C1daruOW=Wcean75DN`rp>q
UCbxB^fl<NW>FVdQ&MBb@0B3r-6aWAK

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/beret.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/beret.png
deleted file mode 100644
index 5c2725e910f0853309cd66afe7b0fe342237fc63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 354
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVAS+<aSW-L^Y+%k+(Qlmtq;W=
z8Q(P+Kk`Y@l-<E-KAr6ngZTW3O7AokgjiVu4?IiIH{^buq0SsQ<^OJpn-yt$*y8`F
zFfjaE%l^7^t;nP2)8(&xd{IATi{Uwg?PlxGm$SaC<DU4<p2s*sY~hcVFs^LR&Fhb;
zTi<-|;`zVgquk%_eKND<RZ1t>O?sSP{)^QlsAB)7`h|7dau3S5);B)BkPv?3Nc20s
z@Sq((W6r*K$P9Ei6x1K}y|-lB;sY+(JpM7O6IXtg4R%WLnskq2>yq%~wN)X`uj0>|
zA5-z@d(E`u;?$*j!7@ve6qKvpnCEpr*v7EB^Tnxq0r~nbEsJv!S4@ArjbW;u{vPRV
v)2<x5VmUS0<M7wUPg8il%{G*RSeH`6v~!2+s=IG}@<0Nfu6{1-oD!M<x;~Y|

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/blackscarf.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/blackscarf.png
deleted file mode 100644
index 45513d7a526f8fdb4feffbabc47475898962f8e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU{v&UaSW-L^Y+%>z7_?610O#Y
z$?DpEwPEpp?;LR1Kl`j{cj4sQdmA#oefh6#I+I@^ibn~k83+zU8y;J<YU$Uz8mpp`
zdiFo7`2KF{`)f>Re4IFxl>9sQd{0W76f`R;d7Fo(@2aSftt|p6kz$6MP4^eC(~SGf
zWFw`cq_mYm&~oX|T;5etMdw}{8^7+l8oOcDw9RFEm(Hu4H#_U+E8icUXWw7k%Me~T
zlND&r-usPu?*HGNE1D?`aRiY3XOgmRyX+(xTWy)S+2svyTUnmpxx8mzY0z)4+*{TA
zpRM@zOk!8`)(ZknPv(^SPuQ;f<M>jZla~Cpsm|`nTQ|I2+POEYXU^vj&-e?E*)E)z
pXD_q&FB8xA`F;C2)EOAwy=8aloMy{)L|77Jqo=E%%Q~loCIC$nm0|z@

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/bunny.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/bunny.png
deleted file mode 100644
index 63dd9d103adbda1697d8a40b7d6698c05ab8115e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005QNkl<Zc%1Fp
zO>2WN7zgmjb>K-TE1rtIt{3U2@Kfhg6ffC17pYK$I*JF$4qb-Y)y?>%FZTa~Vm+8V
zd6M`VB7mpn*&HOL)aL(sy|yZY)0lW(Z7Y47&uL#2X93s*F~p_1n(++r!V}gh0P_<<
z=)aE`PD-hp^>DCGKv>tU{e4mV^uQ*L&w6Ss(|A)C7waj|^&SNDaX7FB*X5#Ywgeci
z=6|zX&e3H(1-#|b>)U@6gM*e*>TYlJ?Q{E2?+>Ye^c1+oeL!EG+$UcE0DuX5$h$Wq
z&vWhjK2=pkVHjGqh5cFJntb1<AP7d4@z4pVs;adG00000004m75JG4d>jPYs%eFv*
z=oDlWMVv*pY~q-G@daxFnxvGP<2&6h%k(bGoPF<Oe<jvkz9NLsNs?H-uoOaQvnV2p
zA}0$ZoQ!~Nn$k8+iO7D~Hm8$Pij-2kL4I>K1(GE3OcKUWN|Egdx;i05?|dD50+Uj*
zUkRLzfZyC>PhK?v_vq;pz|PewQP*VyJgL@YDbI6VmL<(*Gg_@ycX!De<5JsN&jPxx
yX|Y&L@^ka0wzU%Qc|5kZQ!?eY0RR91fQ>I($K`)xTBH^L0000<MNUMnLSTXyD(Qp(

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/captain.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/captain.png
deleted file mode 100644
index 9da56bc92b532d025383878bc84005069c2131b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004GNkl<Zc%1Fp
zA#cJ!7{>8uy*U)fIs7RS{0P+(ThRLg@B!vY_yP!Q^+H1kvI+eJQ}c7PQ<Lnbt}ARI
z-O-LL`TtCtrhVUDb60bZ1OPy=)k5w+_rC~z(Ad~X(#_RY>(_xKY4@B3*E?7LD71NG
zhgyy^Nz!thDYC=jrJ81J?4oW@QMac}XDWXl(m&_}cu8t>f4ftXnp4VzYqj@}0e<xX
zjE&uDAvfvglB7*%s!=}ErZbf!P5QZ33%RCd!e0NwLATmL{VT5-V`EodZ^!ui>ij31
zyFUN`000000001h<4y@M{6+ZUvZ=y;hc-#Kl6FBglGMo9fs>jGU!0T=_=&NxI}A{S
zY?u3I%HfM9w%u!;0e;|~4^XV<VfBjeMMo;tb#=~$TKDgl<4mJ`_I2_7tvLO7d8#~(
zeFUaZ3PU_zKj>~A*R~{TDN-f8P&KqrXDt8#000000N;E96IGzTPa`p@00000NkvXX
Hu0mjfo20vq

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cardborg_h.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cardborg_h.png
deleted file mode 100644
index 2a8fd7fcf755e93347d644d0973b4b512f97ff02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005NNkl<Zc%1Fp
zO-{l<6bJBsjY}4#31)z;n>Iw_5g;7EM2`sx2QYdBqakGh8y9?phR_?-g(;RY({}1q
zZ2bRLEgjyQdF3n21Bi%-h^RQv?L~RVb;)m)N$z>q%Im(rfIpjR$30j6OO4zS080n~
z-(M&P2_fLmribww@z0W9rvMg!XtUWM?+z4AuBnpz7bPYE02qxY7>y?<$LVo~6^&cT
zTj0o`Ka?KVjdlUTaF6-?0|4;${(7kN?af`Z+wBmBdxO)<&ab+zL-#FkkX*d%ye>)=
zK(*L97NK?%?zFqPKXz8@W$o5QL_|bHL_|bHL`3upjQxL}Y)(k-&&QAJ_6*3Lr^@jY
zMuOxuEdY9r3#Q{`DZM+K6gMsSvnf2cryldwxKKErOq@d}UKS$-h?^FK5O{uh!sEmJ
z$(XFJ4pqFg(RhMEe+b8EXvND?dUsgHaT*x(hv{aClk*~EG2+FWWV8UlcM+1xG*HN5
zm|i?!=tHp6?nbTFmGXKJY_)f6tB5IM{1uQ^cA~5G(h7oY6;nD=c>(@9Bi{nH-Gu48
v<+;5m4EM^ow%x>Py)>GWh=_=Yi2jdHX4u&1uk<<&00000NkvXXu0mjfjT7sl

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cargosoft.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/cargosoft.png
deleted file mode 100644
index a64e36d6f2e405a5413873331deb93573515f732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU`+OOaSW-L^Y)gZ_hAPKwg=|h
zrj@NSbH2m%DB#SM{SV(vGyNg$rMCRie1%IF^YnrWic5J#CaEfgu$;Xxt!c(0-RDy#
z9ntVDx^nP)B$N2Nv(tA^cxu<s(edJb&?mnwKE5i)ch%aL--|yPx*;{o$$r(Mwb!pD
zZxcRH8IhAKn3C(T(?f8Z@Pf716RaI4&Nx$di{bPYmus#kwlYjLGMKx*peEwz>DNN+
zuk`L5XVq$*X1sg%Z*!AZsy@%PO<paHk=*HJxBr9a<CJ)xwE3?M-@jyTzJ2rBKgRR_
zgcv^T>xl2{Kn5DEUoPL-P`L2+_o*4e&ew{6Ke>~!ZcWtE%|5<7Rc9lfw^`?KmfsM{
zl$G88wB_@n$IWrZ!ROS<QrZ|BE=nFRTjBBDqbScPnr)@6?5lg<EfyPx=>!Wa>mRte
zQj6iir>aT6lpg+_DE{D;+TUXTYBoU_$bG|oNuu@PpBTxRz))xKboFyt=akR{0AA_6
AsQ>@~

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/chef.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/chef.png
deleted file mode 100644
index edd84cbd84ea341477463c530f36a177e58ac4da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=J)SO(Ar*7p-ZJDnWWeKaQK|5T
z%*pVRnX_iM^se-H5Vf%B`!v6)y6Jy!voY+^R(iJYeet=<AH5wvPk)~8EfZ<9r{bUO
z?jsV)zh5t1!hfN9{hi0jq5Ko99J1er8U1a^w+C7Q0tf0>>6q&UHl~D3lU}Vgr9|PQ
pSE}WvMNXRb4yij7nm|e#iuh&KerYXbRXz#gdb;|#taD0e0svyDOBVnD

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/christmasscarf.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/christmasscarf.png
deleted file mode 100644
index e179cc20691e98ba90beada6a3187b7006159c36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0003sNkl<Zc%1Fp
zy=}uV5QgC|0{b+At4yImQhJEgDO9p^Ch%A;GeN4rP1?i|Q%C}6!9U<H1o(YQ66T$B
zl$$#V00000006kj?BtqWE_5%Krk69j%Q0^4UGo&0fR$V)>9APeNctZ4gU^h~L6SO2
zUsK#UekbWQAcv@A=PH|48ve$$;YS)i%0K)vhb7ZWzwd=#fHYR2X4UVpQ$BCCa;fpX
zhlu(9lk6pDwVoGXCAY7c&)RN)bp3y!2)m-{r)Xk-__^KY%mV-b00000005MirIF}&
zWJ-64bH_?P!0*Ss=)7N_t5a*I7#lCfEHy^fYWZ^mr=!$7r_BvCz1)0;X~(tGG4CzQ
zeqF6MH{h*B#jzLqkFjS}v&OD*Rco6YsP5r!fPLiZOO>ZI003$J0oP_@(`K!;EdT%j
M07*qoM6N<$g6$}#^8f$<

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/clown.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/clown.png
deleted file mode 100644
index 50f6fc3854b670b194bc2c20941f0ceb95eecc20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005%Nkl<Zc%1Fp
zu};E37zgnG850I$6XU{Q;*4wi28K=Efd_Ea)v#bvSKmZ7Vtj$J!fZke3n9Uf$n-go
z)>3-(4ts#||1FT~^}D<8S{UvFh=_>jP$|=n(}$|W-@VpId!K1PTdu}8nqWF;T6zGJ
zKAUnme&OVFfrpLGO54TDO>T_eBtbWRHm+&EtYg~=O~$k2d(9632mpmaFG{YRouAl-
zwU%9!*BYsHNzgem9cVJ1B@3K2-v9tgEf&A{{Ao}3E%SFEj;)L7wMHtvK_&_l5C_h-
z)qEc!3V=XFq2~KW_u0zZfFd><VEhVPK7S^G`b`J`%%4J3?gPxj5S6>ter54mBlUiJ
znmpd^c3ZmL?sc|by<UIC$K%p{WzPiw(2pYNN0Eq#e1)Nih{SD92HaQiqPM+p-FOGL
z0YpSZL_|bHL_|bHWW~+V5!@9@l+DS+@{XxDNy0XgSbET+GkVj7l$FFHM#tl288$kF
z=XcYGs_2rqNdZKW(i4!kOX>6anjb(!w1=B{r8h1)c>+wTO0q;m79}_OVu(NW3KUh9
ztlDm=P0YGT%Er2?l2wu<XVB{{UD@ZqQDfPvlI(SXzf^6qi#a;CuA*dDr8ax>Xr&i@
l6$E=TFCro$A|m>qz5$ggP_AceLInT-002ovPDHLkV1le={dE8U

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/detective.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/detective.png
deleted file mode 100644
index f3b40d19da9f56d0e42d6539405cb52e0a4bfd87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dpunnLn`LHy=BOC$Uubc!HWlK
z7MyWMohw-MA3S^a<lQq?o2K>;T1}H5JWIH%lA&zktJ(TK+ROV#e8#4|;!F$^lDEf&
zeJt+y>Ym$u{M&NxvbgxKo6TzMa#kHr`S-c@*Phm^-){W$*NEJI@lkzvuHnA+*V*4H
z-#;?@5-Sh19tav1zFN{Mvwh?3Z7aRgu4+oncy<4I-ky@Uxk-*ISM~~gQZx5@zEp(M
pb8g7HD{gbX&lNOgWdiBz-OG5&AtIu++Ta0*>*?y}vd$@?2>?2ZX~O^j

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/festive.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/festive.png
deleted file mode 100644
index dc3dccf6c9b23aea492fb63668a65c09ccfec49c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^Mh}aSW-L^Y+$8FJ?!P)`!jl
zJqh|Zo-@ALcJtUd_D_mIQIW@|ZxD7A*rd?3#AxZe0|`Axd<=ZLvM1)uoFMy%>sS5R
z17gqb?fp6tXs~SAyqPMoH$I*Hl{V?h`DyR{S3e6WUTwQ-@2iZZIuD$tOkF*Hd-UWb
zHpbGf(}lusYgj$KDj4>8?U^&J5!TuIsf_l~9&xigE`9tIJ;OF@j?lD(Js-HZ*VoSV
zn53q6>gUxsQ&rgo(H5oaZhczb{;Oig^m+DQP4%wK<_~_9^?K*Jd$(m}@9g!eTOfY6
zq*B;K=UML=cA!V0;7|7MoII1OPM%pEYc{Xk8TjnyweIPadA?f%CUFV9&dJK#)4HLw
zuRkzrMeC-^%s~E}t$o|hRnGD&jr|dyyAWzh{T1_b_paPbULl|c67h8Pb6Mw<&;$TC
C!JwxA

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_cakehat.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_cakehat.png
deleted file mode 100644
index b521d905f73aea773855a938d468aab0eb79dd77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=FFaiwLn`LHy|q!W$w8p?Vd=30
zOd5?F8MPO%{8Cidk>#P$$dz+oVT<;GH#!F<-agto`Qv{fp^ECw6F#~yFueYHX?guT
zeWjpZ4Dn~}Bjqc~V#^+=vJ}5le6~E%!|>RWopP!BGJ_4>N((|m-{mKE|4cv4=)@6p
zz4Y6@%6YmQU7xSMe<^p?rDU0_2d{6NT77v(E$h<f%s_WRfP96Rc-=yljcv~tnnyRh
zK7V-Wr>3o29?aazeg4v+d8|C!eX~w+-@4S49@e)~VWUcT+=eM)Hk*rLwyn_B&+y`&
e7YQ}z-W~?Vh0lIY`LReFB;x7n=d#Wzp$PzYYIukM

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_reindeer.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_reindeer.png
deleted file mode 100644
index 635cc731f1651f086f3d9c9b4a323a355c681e84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up!qLLn`LHz2(T&<REhF<MONP
zT&>L)&i>Y@{(?pBz-E@XRoNcq0=L*Ex^Qb}MQMtv@miTY{l8tN{reN)xvl;z3?F7b
zO<K0=PP%h__;WV4_TuE`qP=&nn+pHk%H;9cY0`y!A9K#ysn1&dZm$0(|LV>Gt=m?4
z4_1Es8dhz4TfFFu{-#?wvU7LszqDV7bzax=%gfaT&o9^FvQd7&FZVCwgZwR4dQ&{U
zUM-Ef_A9bq5$IwtxDXuc*EwUBh2TY*2|wJAF}*1AId<hlZ^uD~Yr7{;-5Mv!onRvw
t8Oi;_NOjSxe;WIv&DVZEt^n5hV!n09&a9l*<!e5J_@1tQF6*2UngE1kfIk2L

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_white.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_white.png
deleted file mode 100644
index cc1610ed4480cc24a15b2cc90db975bb8a542b91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 505
zcmV<V0S5kwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005NNkl<Zc%1Fp
zze>YU6bA55aqopv3I&H+=o^#_+EHE9-NBb=(+2GmM5{01;I1y}QqT^iZxCop5QK{q
znlaOLkQ=V}uZ=fd{C;qUn}l;tPA-`aKtx28TC?G*f0@78a8;=Q<v5Ni6`+<~h^_o9
zX_G(o9{~WhN*=?}6acWbS;zTBH&x6u`F-C{u6drfoczs(tE7}Fj^htsAdX`trOf;!
znE9oY$x54lEo~tu#~mCVx$m3JI!=x|XnU=+;TATV&3@d^YoX&}cDL=dAcXi(z^Q+h
z?6WwEX8!$yy-)XVu5UBVPeepSL_|bHL_|bHL_|cUAPAIRf0-9(He6-KvRR|HYCB*M
z1S*%yK`#K%gB0_|&_fphV8+U#3051RUtZ4*L{WsR%P!V89Mmd#=$HCQsQ^{0<gvct
z;OerAD2f08LWoS7V66eVFd+oOFiZ;X^#eSQ2N;f~czOMOAmil~E5p$g&*K4l{Q$sw
zBf~IE8f&u&)}|=Tq9&6G0O0=a;nQ=!O>TVk&)C`B1^|@H<>XqmTD4NUl_1~!=-OTj
v#bWVKIi!@z9KA7d42Fn^h=_=Yh$w|OK7#nsmL36N00000NkvXXu0mjflw0Q>

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_yellow.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat0_yellow.png
deleted file mode 100644
index 90c5a20b5ea5f72aafcd829ca0b02dd675605af8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005jNkl<Zc%1Fp
zF=!J}9LMo*k1iDgSx%0#=@97Bp$;O1jP20a(TWa&Qx)CZOArxvM`@e{2gSOj*ddNm
z5QlVdDRj70IGhB*ZufV1^m?Jy*5@Ty_<i8u-re#3m;d`;miGq{5fN{#CU&0V2mcZ{
z4zVPKIK;-Ch_d2O_y$i>cfQbA=EL?T05cK1|L8ZTPyC0sr}AshULA}leyfQkUCjEC
z#UVCVcPnB2$dc~pE1?)a>5?D5@x4ERYY$T9XWgpL&${tA4ffMNj?e0^%B7gy^);x?
z)FJx`!374%9`~LeJv)k0EXKdSICbp)yWYV_<BN!hh=_=Yh=_=Yh=_=sTO-*)?X-h@
z7k8tVdGFM=n%K(X(GLFICt2z5J6ZOGopxYLjVvE;^jr%|wE|!E&X$O|I`;jCJ1@@F
zX$Mwz61*EEPICC;Yts<`TiXFUyHKsTR+>0Gy?Y}Lv4zGm)e7wFx;X%9(-BLJY^b`*
zP+B$*Uu^ZpMP9u9HgxaN^9-K~czl0&eTs9JRSBgh0N~c8D*)Vl`RUkmr~MzC)Z_E!
z&Q$<jfBl?a`>zu4yT+vTHCMV5ms77e){ktkpANO&6sZkHL_|bHL_|cy!!NxRx+yor
RK1~1s002ovPDHLkV1m+%0Q>*|

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_cakehat.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_cakehat.png
deleted file mode 100644
index 12296b1d4615cc7c820d8e55d93f0a5b50cb5c9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV4URX;uumf=k1-1xlD#44T<hv
z6B#8Km%5!|={aCG#hjN{S%K{Ylc4e(7w3uRGL>5!&fY!w<4>*ctS5Ei`cJDB85nF7
z-j!|qBCVma&S}q_e#3Q68x?oV>0ipe;cMMT_80sgCjDl=fBWs-2hrD4>%;dq)!liU
zbpN~I)8%!tf7f`v{B8I1aQD%qFPc~6_y3>uxnbSwLq$9H{H|VpS@ZekU#!1R2LCFw
zII{jPP}%$0zCU8tyZ_d|pnsbk=mQu?J5k%vwv%7LX+@1~4Ilpn`2)2Ke@lw*^ylw=
zZ|Cs1_B*50``!Et_+jcn^nMGOiw5n=P8?J3^UgTT{6)BDmrcd%ii1<!g}=;S5dSKp
z>EDKb8Nm~a_9S#I=KOW|S0uYq-p=wp39G=o#Xc#oJ~plF6MHfJEi;n2{%6+JAAa+z
zT|g`H>%7m*U(`RnpBHg?_q(;<v+tH(KVM!tDGN-0wR2dz``xdf|9k>p#unG^{s%Y1
a<_UWb`~FkKo~ti_#5`U7T-G@yGywof8_+cX

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_white.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_white.png
deleted file mode 100644
index adc52987b43d8b858c8def7ac96c5c5b6cc2f849..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 496
zcmV<M0T2F(P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005ENkl<Zc%1Fp
zze>YU6bA55mx4=+kR?m$(g$$K;35STf;zZa5V{sRB~ht;0{>1vgQJ6rpe_Y<^#Sf+
z>6k^@LE%ov>4sEWO=DUVz8~D--dxT(Igm^TAR;14&G!QN&-rJ6li0Q(@2}6WEy%PR
zVe&sdJxo8p?*-yGj?`-vk+&DA*DB&T&eV!9`P=Pww5FEd_X5#ci`H6f3sSFD#I_Kf
zO}Yr*3nUCf(OOFwhS4(nar3AC1ooRPY;6aan_s}zc7Xk6D{ZJ$dcEGa`=n;Zxg78A
z?%oaxg~C7qhX+T|{^ay{tk~n`U*A~!^8D)ZdZPJ>h=_=Yh=_=Yh=_=Yh$v1eC1(9*
zUcmPPiO0&aMkDonz$i*7$>;Mh3jk~j(x|$LU!YNS#kL>-5RWyfCS*n_H88EAloIpu
z{eC}D6XJJm3o<NbmNjQKL|_Ul7K`Y1y93Xb7R%UNc5!xolPF)K>dM9a4cbp?;5;6?
zTrOu)d*%%QfKI0a0Jyuo|8noA$&F$EjFr`806?i!iq8I214jMm%ot5BmrIpLYb~Eg
mZ{j!xLqtSGL_|bHl)?w2(;YzD&S*XW0000<MNUMnLSTX&E9Rj9

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_yellow.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hardhat1_yellow.png
deleted file mode 100644
index 415ac90a4d0d753678f93737f6dcb9a4707b41b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005aNkl<Zc%1Fp
zJxjw-6b9heY`RBE`~U+wIMhJ|$ygC%$0`aP#6iVE|A7P%@gF!y>*OFP>eeENjxOR*
z+#D*j3c;;|y5%^8)YQ*5ra|F-;0{SH_q{zNUG4#hh=>9+4ak4aSAG+$sgQx81T+;A
zbs@a`ijC;=O#?ElLo$mAk*Bg`785e8N4E(tKWBB;M`Zb?0g)SBq!bfPb&H^>5Gln(
zZuGWq!ZaY2f}2+<pgz3oR`UaY0@E2A@j>A3_5$%i_c}_|d;8n#W_7eO*<an<8qn9T
z1I{y`bfH=)V`b}Y?&)P~Yqy%8n&|xS{N((lt@%VmL_|bHL_|bHL_|bH|5jU0Q1g~j
zKgB&hcLJZ(ng(QM;_U=~dD97fzk&M$zLK{TnHqQC4Zv+-$)=M{H!ft;NzqjIDBQo6
zzp#H&-clO6HS(4s-jA=<YE2cvKUY)THQuio=AJ`)rM!(T&30q==&|A1`i_ItWD?u^
z#isJI>7<;T6|u3}_=5V^4(oFWy#N3(-!lpTnA^MhFz=`TgU@<=4j0A%00$4(^?QG+
z0ADpG<<@|{-WWPY>_9nEib?g}ZfL#nV;c++5fKp)5fM=UuX9x6co9qH6aWAK07*qo
IM6N<$g21Tl)Bpeg

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/helmet.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/helmet.png
deleted file mode 100644
index f75f4365f71c68bd9ab432afedee080f17441626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006%Nkl<Zc%1Fp
z&uSAv90%~P5(&%Jv-MKaT?h=gX&NeJMN4kQ2k?~k5%!|bp)aAHd;sZHMF^D=vW0-q
zP<m=lEtn7n3*$j%-DLA`CzFWy{hYFs+23z>lAX(b0U{zI`d{5KJy8guT*pa{`-1^G
zosMz6ztz8B+Pq$`BM5?IERJIUP^(x3-5&sgAke*y`rkEa?m7;nlu6?_jv=Ll>o^cX
zsJu1v_7B4lQp%(^07xkjhGFjhxqmI+E336N7xxO;Q-9tn^m=`qb-yp|U+{c?UjabL
z^D^I^ce?<9k4Hyy_cwY3uC6Yz{^rZO%=pWv2d;bHq-1XTW*3!v0s8$PL&vR#e^`Bg
z_IA?uww+&GKyQBi!5|qQH?}nE4<3$v&L)l9?k$8+qtCh?Tg5db7c%X5mAx0ahJ`jO
z-zz5#m$~r~5fKp)5fKp)5fKsDVEtvrXm9~A3oqEJGmFvN;YrfLiBxDon>)Oa4nSzB
znpQ&?xdRfDj0;YrMNu?YctHrEqA1FYFDry$Z6$YVHC3rrQ7je#{7!7NTdmBzZzm^H
zd+yX~nVTC|cUGNwS$zbw<7PAYeEaIdaFC+mPd#^Ze&O|t1HF)scXusa;UCr>0Ub;@
zZZ=Wc+(2n_1J^gbp*gLFe>kho=$z}DUQ$mltj!RF)g4vu1CJ^d0Kn%@Ul)FD?t5kR
zZ0`vG;I!Rdc^uD(@0FF#4x}>#CUr*Z{gbvT+iI(_J@*adolitWL_|bHl+Q0IjRS#b
SI?A2^0000<MNUMnLSTX#(i_MC

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hopcap.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/hopcap.png
deleted file mode 100644
index 0e8bc7788731e9e6f95547df1d8e8fa0f876b856..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Y@=aSW-L^Y+$mzrzM1Y!Bo+
zPY1L*sJb_Gw!UTxR!wM{+GxkL{=h8u6Q{H{Y?`{zIEleUeTKl>Lm^9CvNSuE%AOG@
z5Sl9R%Btzmf8A|<G4j8kY}&yfD0p$d>9@<=5~mKeh5T)oUc2{&XhLQ5vbf#*PwZd8
z_PIY>HC~f(^P>Mz)(i|Yvjusc%kN=eD5z#z^PYj>&t+wc-|c}ls}`6(by&Chz>$>t
zJ=a;^_;Y<`eH(rt_i7*)ljtf=#{67y3wz0x;STj1rzr={;C%10o_miSqyE2)`jE~J
zB=F+=srLq#i!S*WT;>Zbtut2HJo%Wp!G4Ktv#Yg2EXxAVorq*i`FWt5Dg5e&T(d<p
z4kpdeZg}dkHIw1vfBu}KZI+UjwGN^mKkZ%1$+&)p2yd2IkLbY{!VkC>ip`HOVEFx!
zZ|?JJ+dtjB?0R!%wC}mQt5)w5XW9RO(_zPl{<@^iAH$VjpIh4FJ9jqBO&JRL_sjAH
U3Or=?10#aL)78&qol`;+0AAI-=>Px#

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/kitty.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/kitty.png
deleted file mode 100644
index bc30f075d7dff529309578c55008b53ba30c33aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 866
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVAk|>aSW-L^Y-rkyhjcK$3K32
zsWL0Xv5&i@f-yx?%-_MYdkTBO6s7fInzsBCge-$@O<7qKv~Jfkt@!4N9~~3+W}iP)
zXCI{X?@!y;1fM05E<lqR7;fax;W=Gsq?7yJd7u4Hd%wNO^PWHbefY82lYku^Cw?DZ
z{G{?-iQtL%YW7B&i)yO0{_op+^6lr%e}4Y;wzJ#6tzTaK@TXV5+~THtOD<XIQeN(M
z-glqhzmw?<f)jsV^<vA^T7P<JOziy}>vfWK`=e&=HTra3Dc;59+2^0zmrqOHKDqwh
zPX-1BgUveH>5<1+-42{OEAMw;wraxcW`Aauo@RcqBVojcTdL=dx6jKrk)6|{c6);J
z!>_-0y6yX2vzV>pam1vHDd~E9-#z}U?d2xi`S`|@%#-0~%(H+FDGjXI{qexY+qo0p
zoBdxNYx!#x=bUxo_m)gska3<TEZE{!cYJjFy;m3FexLfrpdq&S7Ry%V`{nz-W}EF}
zyP+&JF(X!lZ{Dd@Z1P{?j_=Y~V^<Yp;-I=om+hF6;BK{on+z8cud<jlsQRC)SZiN3
z$Fza{KFgIg-A>CcuT10IC9=M0_D{!D^X!01<%*IITR(^1*jM+uzv0$(`?u?pZvE7<
ziK>VB4@@6ueO0ua=hNM%<wg>hzWPZ%*?szcCPTRJzLObBK&0P&^kjdbWo%8}&vojn
zeLwxTX5KO5Q>?hF$nlLlm#%y%ymmA9bF82F>}R{@t;yT^Zy|p~$2&FQted~rF*?Z_
ztccrwtT8}(ZMv03fr-O|42Cx!QZJdFs0rL5k@HV}!TFqu2N&EMzHL)?e7^c!#iG4;
zyUO;l+^a!xVZ-TCz2bLIwilNeESY6^J&NVi?z8r{7=SJ-yLTsSwq?cipSf8(w){!s
zb(c<<uuSOq#x>oCs<L*RmDzLpkD2L?bLMLocGp~%in;W=^>h@k+@CXR`8SI%pUWu2
zUHZP!tMtLuYl+iRpFX=Q-)SH#V<V+dV8T$fw3hJ*Yew?lYJ27l?2Yliav0uje7@kb
nt;Fu@`cBsIO!-bwH%9$qTp*|OX{VTAI7r0P)z4*}Q$iB}ztE2(

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
deleted file mode 100644
index 74359bca88..0000000000
--- a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/meta.json
+++ /dev/null
@@ -1,219 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "beret",
-      "directions": 4
-    },
-    {
-      "name": "blackscarf",
-      "directions": 4
-    },
-    {
-      "name": "bunny",
-      "directions": 4
-    },
-    {
-      "name": "captain",
-      "directions": 4
-    },
-    {
-      "name": "cardborg_h",
-      "directions": 4
-    },
-    {
-      "name": "cargosoft",
-      "directions": 4
-    },
-    {
-      "name": "chef",
-      "directions": 4
-    },
-    {
-      "name": "christmasscarf",
-      "directions": 4
-    },
-    {
-      "name": "clown",
-      "directions": 4
-    },
-    {
-      "name": "detective",
-      "directions": 4
-    },
-    {
-      "name": "festive",
-      "directions": 4
-    },
-    {
-      "name": "hardhat0_cakehat",
-      "directions": 4
-    },
-    {
-      "name": "hardhat0_reindeer",
-      "directions": 4
-    },
-    {
-      "name": "hardhat0_white",
-      "directions": 4
-    },
-    {
-      "name": "hardhat0_yellow",
-      "directions": 4
-    },
-    {
-      "name": "hardhat1_cakehat",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "hardhat1_white",
-      "directions": 4
-    },
-    {
-      "name": "hardhat1_yellow",
-      "directions": 4
-    },
-    {
-      "name": "helmet",
-      "directions": 4
-    },
-    {
-      "name": "hopcap",
-      "directions": 4
-    },
-    {
-      "name": "kitty",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "nursehat",
-      "directions": 4
-    },
-    {
-      "name": "paper",
-      "directions": 4
-    },
-    {
-      "name": "paper_words",
-      "directions": 4
-    },
-    {
-      "name": "pirate",
-      "directions": 4
-    },
-    {
-      "name": "policehelm",
-      "directions": 4
-    },
-    {
-      "name": "redwizard",
-      "directions": 4
-    },
-    {
-      "name": "santahat",
-      "directions": 4
-    },
-    {
-      "name": "scarf",
-      "directions": 4
-    },
-    {
-      "name": "sheet",
-      "directions": 4
-    },
-    {
-      "name": "sheriff",
-      "directions": 4
-    },
-    {
-      "name": "sombrero",
-      "directions": 4
-    },
-    {
-      "name": "sun",
-      "directions": 4
-    },
-    {
-      "name": "tophat",
-      "directions": 4
-    },
-    {
-      "name": "ushankadown",
-      "directions": 4
-    },
-    {
-      "name": "ushankaup",
-      "directions": 4
-    },
-    {
-      "name": "wizard",
-      "directions": 4
-    },
-    {
-      "name": "wizard-fake",
-      "directions": 4
-    },
-    {
-      "name": "zebrascarf",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/nursehat.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/nursehat.png
deleted file mode 100644
index e1362a6e9302114d3c14d63673f7471c9a015883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=$2?seLn`LHy|ug0$xxv6;nArc
zxf54ST-$iSWPzR!<GV)%(hmi0d@_(@lHRfF<p0)L7wt@DXDTx=9H{?#Pxs{fZK^xJ
zzq|SK@7&wp?);gVc{?uW{eAmAKfKfYG?Si4p7s9p_NU19euK?F@4J1Tov}7@Qgrrh
zQAVJ}P;kQ|E$Y&FrlX4sk9}%ga&_PR``0+61Ov10P7QigU}G!uxWL9$Q#EVtZt-bm
u*FPO$u_^w(K5TZw!y>!<B5|l0?{+dVs!m?VpXzuTB;x7n=d#Wzp$Pzg?riM<

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper.png
deleted file mode 100644
index 3924013f33e1149c5f847d13dda5d7620125ee64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3|4aSW-L^Y+%p+`|SUEf0&;
z0uHiTG;p0;FBq}m0z*EdsLoA8SB2I>C5MHbHyHn|SJa9Ap5U~qLWqIkMWENpx4-0{
z@BeyFB6-cEEjp)z%@VKtS;yO9c&&2Y{+Q_NU(cH*KKXO|s(jw<Fx8W1rWA*9Jp7@z
zw4}z&xbnTK=eeDyf1aOJ|C6)e+}&><1e$`pj(;fodhhg^wtqjvXYd1E2?h731id=3
z_|wJ8weOma%-p*}p;yy)i)8LM?=Hh@L0)^~t3TJBlG@A3KY!tTQSmcAm!4Pty?V)M
z_V)X`pL@vLHe}9fn`$6e$9k@d+cN#>9M!+;wp@62_xT%N0WSfF4G!DOg>L`4de-N5
PIY_|M)z4*}Q$iB}k1mk`

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper_words.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/paper_words.png
deleted file mode 100644
index 3924013f33e1149c5f847d13dda5d7620125ee64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3|4aSW-L^Y+%p+`|SUEf0&;
z0uHiTG;p0;FBq}m0z*EdsLoA8SB2I>C5MHbHyHn|SJa9Ap5U~qLWqIkMWENpx4-0{
z@BeyFB6-cEEjp)z%@VKtS;yO9c&&2Y{+Q_NU(cH*KKXO|s(jw<Fx8W1rWA*9Jp7@z
zw4}z&xbnTK=eeDyf1aOJ|C6)e+}&><1e$`pj(;fodhhg^wtqjvXYd1E2?h731id=3
z_|wJ8weOma%-p*}p;yy)i)8LM?=Hh@L0)^~t3TJBlG@A3KY!tTQSmcAm!4Pty?V)M
z_V)X`pL@vLHe}9fn`$6e$9k@d+cN#>9M!+;wp@62_xT%N0WSfF4G!DOg>L`4de-N5
PIY_|M)z4*}Q$iB}k1mk`

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/pirate.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/pirate.png
deleted file mode 100644
index d977afefa571a7149b7e11917aff2ff5cc291937..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005rNkl<Zc%1Fp
zF|MjW7>3~&8;q@CtlYuC9<(%Wf>p2z*I>y8taTB%11qsKA+d38aU7z?>jlK(<bF>=
zObq<rFwD^WfQX1lYt~w4t#zx_$^riPb@@SuYus%B6h%@08OJgE{r;1>t@8n*DB^TF
z0d&f5J5c9?i=rS10-SU8Zyd*zWl33<U23<=H^u-Eh9Q^B1)$DulRs!0Y>aW%T3`IF
z+u)orrmt=BGCvH%hu<#wO(&q9@hr<ol7z)#@$mE)iv>xNkY!nYZj;ICn*V&$VHkGG
zZ@f(XZ2IEB!#f}deo9$u>wUT3?|a(@)>?PJ-{1L0zKDp3h=_=Yh=_=Yh{!MZmEPHX
zSGFw6k23nK^-AvrpPQ&r6tUaw0_U6q2z(dyFYeEq&1TLwLw%>W?@4If9{(3(jJq8e
zV;GOeq-hHLbava;^Vg(l%6L4+*Y!Dljr-%-e1787=@fvfsu&CgESF2x>osLray%Xz
zt$@j7f-#0PP1$TVT(4I~qY(gy!vW}TMf9=){LQCnN>x=<RRzHLd?wFxhQr~*cLh!A
z4TnSWJm-8q1Jrf>s%lg3onH3StB)t1MN!0dyKS@r=JWa64<WwwJ`fQR5fKp)5fS+h
Z`~eSW=p}4jyyO4?002ovPDHLkV1oRz0`dR=

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/policehelm.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/policehelm.png
deleted file mode 100644
index 1f505517a8fe9d188086955dca91c8a89cb5fad3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU|j0y;uumf=j|;+52io~_7C-U
z1z30smwIpn$sCDvc3Ir5U}7n~MP&ykpW}l`3!*Ow>|ou-Vrk9FuGcHXyOhOU(Zyq$
z35#R%9=4s%PKxv2YrXj2+`PN`&hLG{@7?`k*U-`N;{L1&l^QRuvoicRRQNq^cN`;w
zjZNv2XMfiIP*&e9cURE(a<TLA`}g7tB5gme;aK(9Th+>1UZ8vRYz^`9i+?kmXMa+h
zXm{lASIfBh(evsV{r;>^dDQ=vo5A7bmYyeNhh%@Bj8B*l_}KrH%7n9`3tp<3+;!2K
zTz-D@&ZaXZ$w%MYr#$jrKP@#<X^TL?`q}-uN0JQBhtKao21_(<pO(I|h2ey`-imqo
z5=&VlZh7#@>|Q-}3D<(6eTh@vJ!AX3>qWfb^2Ve}T`ke)-&SeOdB*L&J1+26^MWl5
zipEO2=C)P8<vxDg>xSlv&o`MHmd(yE)BBgk*bpc9?NYP>5A#Z&dwcD(E-4y6Dr=OH
ze|vaau8hd}Df?_5I5Pf<oTkcfAajYqnW_0lH%pr{y)cbsNO;UD2nCv7IHO-Ko$!u%
Sy#_Ge7(8A5T-G@yGywowBGH=w

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/redwizard.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/redwizard.png
deleted file mode 100644
index 5e296fa16acfc63b3172bfc17731d88f2e4c4532..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004ONkl<Zc%1Fp
z!EwSc5QX8FOj@7-I`D};a@i6{O;Cb5!A<xMMJN|*q9`&Fwj7+v|DBLwcGtq-gP#Nd
z_`hD37C1>hUVk*Gxy7E7gIpzlk$gJTZ}h&5{g?E9t!XrMypuGH>+a5HTMNB|d%a6D
zz122MkG&`BLDJDV$;_{LNuDHsbWXjQ_R;ZfV$PDPK|@nXx|wN^bQssM-b@GQbT<3(
z-keRzolx%NrLQY-FKIW<b~Y>atsW{2bBv1ThD+59QR<u44I3~>-!@{G%vRHP_P3HN
zzUIGkT6=1<AMN{`+eZVrpU2Z~hX4Qo00000008&{nm$Te>)GID5+OBOB{$-FYo<_&
z36V$4O>UG@C^hxws!E8|Seo4M&iOQR&_%C99-ws!Wmb_jk{fXlqK`HrSFdFXWmCzG
zG=*}DPBPTY#dDUVP@3liTO>EqjmXssmi`o)-%eU4H%Ng100000fHiyquphdnaw7`>
P00000NkvXXu0mjfvVyt2

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/santahat.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/santahat.png
deleted file mode 100644
index 8056d14327c3c6574ce7f44acecad447a686e027..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KhtaSW-L^Y)gb*I@?<)(7Fq
z-p<{;dAl;i88^;ew<r80FUxraTjztD&+rDRSd=7cwz&kIaH|tH63ULAY`AsB`)F3C
z%KWrRp>+)%9WU-@$?R@ed!YD8O#iOjmPkH^9lmi|Yfok|`&1a-P`eZMz|!c|w(a-0
zH}47RKh^r0XZuF|`^%1Z=2pyjD(@#>QLWsy{+YjFtk3+{Kb5y!TUs?|8t=uZ?$^6^
z?EWN}W|=29kAWfbSI^U;&hCq<X^$Iy|DRIpE>-pu-pT*`#rNMYzMW%W*!+<paoXWb
z(}&k&cSWsL@e}5>ai0<tU4H$}dh6XDnyQ7fa?S>LdET77{afgPb!QcokieqFRwwrV
zd6fU<WYXWYJuf#XA9$F?uXUDv%0|lr31SJqb&6|O+-#0AKcG`rTyQ8&c-i4|%RMI~
z^CnCYtLXD-m+f5iqIQ~spK#}*6-Ak!dn|livULk*bp&NS&uLm4wO=#%-1l0GwQA?8
k@2#Kfqztuq(f(JWcgjvDmhI%;2#gm7Pgg&ebxsLQ0O?r85C8xG

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/scarf.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/scarf.png
deleted file mode 100644
index 0108369138d11366277d22e5937af643a5893ce6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;9laSW-L^Y+%o-ev=yV};+#
z8dL+8oe+||=$+D~;ceplWS)b_-LDEeI-38#-{`R|d**U}L7;XZc(8U(ap=`uUuTMj
zuC;tFU%jXL+idsK4EL%#4fp+dH)rycNi70q*K=k%x*Vz2KmR;9$Sb)1{oaz;?Nx2d
z5~nkFoJg#%vpjt18tWUW2OX2+S3mvZ>as6NTCVcb{40AJR_{2&<iycG<x(N<`A_fO
zm(Jvd*a{@;jZS`jrg(DsW~bM2ySdK@-`w{;{?o5S2_Nw{b7oidtf`t2aCOzHty6+@
zAAPRu4LTKay(sN+Mvl$NpYFody{1V$LdiDuGWE;))voQRwW#{dI^(zhbNxfC3<vhs
YG8^pM@YGgv^8t`;p00i_>zopr049KwI{*Lx

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheet.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheet.png
deleted file mode 100644
index d71f99f848b99c94edcd612c417d692b43cb5d5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1130
zcmV-w1eN=VP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CrNkl<Zc%1E9
zOK-C}5FJ8HRnpv|NLkcr7hUrIe+<hkAXH@$H6^9N)a5R!v5Ya#K-zrbNC<|9&&=^)
z29p3xm@r|&gb5QSbVL}2d7b@F^M_%WCrOecscK&n|Ev$W<2VHyw;jhBy(fm|pP%E*
z!^4Bv{`~wrr>S4#@0<aM+uPe(du$BF-%Eh`T%R~q`-jGm{Jk^4Fbt#4z83TrfH9WW
z*<&NivRb<>dJ8}ZskO((Q2f0G_*c+NfGV{wl?A`XABJJx24fXNWAI=7E%5#QeHo&*
z>W`HLI)2W1Vcm!S>NDV6bP|AbK9(Q7_-C_OVciF#WWZk&st%otXKdUw&9jL6Vrc$p
z4Cs5Is`jPReklId0&vbDiXvgF&tKV&qG)hID5ZwVuP!n_rL@)CY3HXv6h*)o)4q%_
z#zqMqfg&{Vw+$Wupwm0N@B2Bx&j2J(M*#r5yu1_we|mZvZGND-$hiYb|GUh*gj|_j
zdP;o4gb5QSOqeiX!e0iK&3~<}i@^8&oO7NJ;rNhk=`i?&i0}J3rL_0AIvuhs14`*A
znK1f{&^b<DZR*QQ9LK%V*Z2KAj^k2$LyI!{FB+E1rGbtgk4FFia9vmX&hB|$4ghd>
zcL$VGFiq3ooL@&4=z5=Xo}W&q!uIKO$}vzGp67|<x@*VEg26K&%d*0B6>figd^BFm
z7!&KoVo{p*QrrGBP<vnPx%c;XvFLgq;dx%++`2Z0%7RhG076Kq$9KCO094=qcnk&F
zY&L~97K_Cgt~O7Kwo#f=TH2SUDSUl>wF+DZS%~?34mUS9rE|hCY;31#a<=jy2CfUP
z4r!VKz|RLu#u)5&yUxKQJkQHFn+;f&CFcEgLev38suDuG6RWwlNRk9>+ZJ}3ra}M!
z=p_OM4*)^{Ie3+`31Jv&MJQE*b;0Y(TiwV!o6Ud_0+waL;c#f}q>97g0G4F|A*A#P
zoDfp!j}BF(bfHz>_w)67UFlGkWd#D+u38U)I*uxTbXc#~B@tS^3uIXaNs=@Y>GmCu
z$6jNA>$(P3j!hh@KS`3b?tqd2I#mGxY}*Fgwo48FW?`Z$l+aJK<zqTggaDrBiQnPl
z$yMpxq%I!cZnwRk002K(u-$GuajLc&i{m&T7h{#TfG&9XHo!qh9gM~*SF3nbKJ`{r
zV^ARka9!63f}lXCb3#rr+qMParRsE92>DTnepUI62!f!Hm8JBI<G3(N5<+0V-vj4d
z6h-PY7>f<Og$N;Mr@su(^YZ8CXA$_@+ZzBBi!|A%Fbu&oO<1i~rQTmImj$0n?*c&(
zz~keiu(6miO%q;UUtzUciJnJC@CQq1-{0T&4z>!6F;P<>pDa8M(EI&f9A}Jy{5J+U
w!x6O;6NoN7iPsL*`)%5lpY3wB*Cvkt0s7pPwk_cEvH$=807*qoM6N<$f|j2dyZ`_I

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheriff.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sheriff.png
deleted file mode 100644
index ac29b44c025bb0984d49b1815d0884ba3d793e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 586
zcmV-Q0=4~#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006JNkl<Zc%1Fp
zziSh57{~E<guta~AT&)&ur_3o^dG1oh(j?tD7C2&1RZr0(oWI23PK||c9RHFh$%$}
zOK}h<|AK}t!5A$zjRcO`ln!5qm>Pf8+;MFYKCkWW_&(3W!*jRX10o_KuB_x|4L~uM
zF~^a=lebfc8$P!OJ4x+&4S=229ycGAT*q^&kWHI_<p&@X9Rc9t%)I0LC!8MW?sn?x
zC#LT&GJWeum_jyvsMGMT_)e$6QOBxtezO+1gI%xj?qiFGPnMx_9TLyTq|S0K5hfh8
zI6wG;(R+KIPeXOiZ{BQOp}F1SZKX*(7X9h@nUfZw=m=vwk9*GVxB&xwK3;83?T=k5
zJJ0jG8KC_dOpU(e%U5$~4H)S2u~faxuj3Ex*YVQOlB4{ti!A0craSrOhsu$E1BOl|
z_OI=FjcX4Uk1W54h=_=Yh=_=Yh=_=Yh^Lz)UTlFJ#Ph$Yf7%?mksrk8TX2-inA_&*
z%+_ze!QE_u9K`X4NH5mQYmE1o*l5__?<}~8(mu1%uo>?!v0h&DtiEoZb#o;@YdS?v
z##b3mPVl+>n&tNw00;-Ip7#d|*|ceHxBeRIbaKqIN$_L>in)xj>osDL(0;+}HUNl4
zLWF}B0n6XhH=&rzn1JOc9JGi<LhYNo4Th5wOvYD<MMBv1+Och>iHL}Zh=_=Yi2Uci
Y0fGn1ZPu$EEC2ui07*qoM6N<$f|+j|Jpcdz

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sombrero.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sombrero.png
deleted file mode 100644
index 2f199b9ef044a4fc8cbea4e91218e00db40dd78c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005fNkl<Zc%1Fp
zF-TiM9LMo*RS<$9CB6_smP$h*Z_&-cF@g{Tg-n?PrAwjEp*V??WDo?GQplW1P!K_I
zb<oKvVrkPZAxNTB8d3tSuanPctBEi7BI55e<?=4~KmNJPk{^hOJYmmz`EY(A<6OS}
zu)N;WS`Ss<^QQ9)8E0zJCS;9qUjN44eyOibFjarRkIg+Mo*K~JeSnZP#?+*J?MV8`
zWc{ITChg8Ao#(@Y0OUq$q{_!wzZ$>+*+7Y6(<TU{sujj_QK!&|0Pv&rhv|)@p0CAv
z`qkB4AE@6sH!&M_@)wpn&TN0avwp|TC1%48z{jB|??=zv_X~{(Z(p9f<F&6Law9c&
zymA`m&F>QczHFU&Zi3(SyV_X$H_)l0Ugmdl^8^+e5v*7oz&(Kg^=id^4(3jvh=_=Y
zh=_=Yh=_=Yh&+D2{BdY9I^%Z?$M}LKqci=8;V2?waxs(9m43x=x{Ann@p^laV$-Ho
zt&oC_(V73na3~)WjK#?YN_<K$`LfTR?$d4YmCfJ;*+2<^V$){s=b`&-<urV2YGZdk
z>D*@>6A>I=;wu1FEY6G79V0(j-`~wR^=jpx8j8S(h=_=Yh=_=I@E4n5^kb{ez2*P_
N002ovPDHLkV1h-3|6Kq8

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sun.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/sun.png
deleted file mode 100644
index 730dea902e53aa04c43f68e5f88c2e5f047ea059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRaG=Ln`LHy>*(i*+GEeg0EzB
zlY4NJEyv2FgI-Kwf&$SScu&uaaXR77p~hvor(7y+#>~C%m#{D}97vDVyf{_J^0~zE
zkGk)?I`@A6A9O$H$(&?Gknup!U|)PA`Nd=Tzo`;Ip`n?xmWA$~wXCyp-sP3K?{^m8
xfB)&8uk7nzU;Q4eUfdadKKTBj9FVSSyO>^FH)Uac5?u!3db;|#taD0e0stGdP%Z!f

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/tophat.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/tophat.png
deleted file mode 100644
index f723d36da8e4c2cedacac1c6b2ffaad646ecb987..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dpunnLn`LHy=BPPq9D-vaQkds
zgIkv_RPa{mpAOv9#@qW=>dhVDoK4;iNq_cB&EPz0@>zx9K&@?&USu|Za?h@HmoI#;
z%AXzNb?bZV>s@JkZ?5{cIc#$HLG~?q3$})zTbeoR$(+gG;~raNMT(vMyhdWN6UWl(
zHBtZ9HzuyNt+S0zme{tAALtGUh>5uPH}d3zLy?L-x7Q#4*>H__%QVpmKbEBwJX|B-
lHZd{CXomv_6GZKbSIqiF#j+3g$!miIJYD@<);T3K0Ra2@WZwV)

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankadown.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankadown.png
deleted file mode 100644
index 9b0b85e2bc81adba6dca217b91d1d46ca64d579e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000CKNkl<Zc%1Fp
zKWH0Q0LSs~Nhet{s$|EGU75yM#t@QV96YpEhs1#fnjt1B)R2;?gNF<SLx<44CPPc0
zLkBORP&}kVLpo$|hnPU^rbXbP6kBOsYDcmy**e|H`gc0N4#sNzr}dqDp@F;)976Z*
z{obFudm8jWk|arzURg?`6+gQEwm1<A)W2^Q%6#$d4-M!2UmSP%)<|4*MuMcQ*XcWb
z8lS3S)@nRkSfI<h%38j}mk(!O*hJhKi3@<NRzUH1_6*=exEa7v`yMBa-?(&M<hRN!
z7-4#Pd&y}UAHFw1PSfb=?Pb9Tliw<H<I;KIB-gId3;p7GM(24(-#H;b)DOXK+31CS
z+wD7=004cfOiwHZ!0oX~e*d_G+hdae^u%K5TV<z_ww0<i0)CZ%Uqw;&cU`HMm8vz{
znT{vmpYBYK(fiptcP7V<6VouC>a8D*QX8rCQzAk4sZ#)qe|jCru$Ia2=khXv|E}ta
z!v?&2&a7FEvTQFFBUi2nk^6&Cu!-z;gz1@?19dN7yeQf|c?zWpN^1`fA3btyF&vJ^
zMFgFIUuCV@%p1*>1J|q+o9OfxDOYRc3G;aN=*7_XE1+u{p<okRf#{)w2bi9jQMLk6
zLcu0<O|u(qOII|CXz9k|Q79IREM_f?Vg<9d^SPL{C>D!&JPM+vo33coR<5HppirtD
zIWS$*D3lJ~o#RTS(*US#eE@{i3P#l;Q`q?osg*tDyVoDZ_5?hhomC8_<;cg%?sbh=
zO{G{!CV4tPuWb8U*?&BppH~)=Nmf%Sx0`-Byg4vn>-XL6b&@1Wk|arzBuSDaNs=T<
zlJtsk?azy=LuW)R+6ut#&XLVRnXKqw>cNAC+WFwxHPNoD@5uvLO6T})?pIg(?n=nj
zp)(>BY&x{;t#{sMJ)33X?p;T1eKI~SI@;U$@%wKMEiaTRu1vzQ_6O|e^Lc3w`e_dO
z0m$YHj0{iE`DDs*R_Bu`MusQI<_iGzT%WJ;y#R-4Xn(+dyLUg}Q&GJhYSuPtAVjQt
zfY0ywFwdFr^H+{Ce>wLqi}!rQ`b|pfzu{F(RIdlGqF|a9|MtW=<;p8?d9Y8!qHXoT
zm$rR~*Sh%n{(V>SZ;p-%#YhqKnDsW6(i==Cp1mBefI*nW&A&UgtXV|DVK<@yh=ju|
zYZgoC4Qkdli<=${+{t%k0_GA4rCh0y-q4A*ML2sB^1ALuG_aF(_9R5xBBVET%9RRp
ziG(Xpm#d3lxoQ#$`pFq3bi;5hS2qlDMu||+Pq}KkmJ2RUz+57s7=%f#WH2qu)h#l*
zreRtZ$(0NSVb|{d3o$e}D2C&4*Ec8($KzsXa8Pc1kR(ZxBuSDaNpizqu2ZK^al^E<
P00000NkvXXu0mjf&;%9Q

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankaup.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/ushankaup.png
deleted file mode 100644
index a4ebe9b46329f2bc0f456625d8d746290f160633..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmV--1Bm>IP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009%Nkl<Zc%1Fp
z&ube;6u|NCdcDGyjdmkkM@WG{PceZC3b7-6%b}-W(gykmR3Px7hC(4Z7uw{|Q+g-}
zax8&DFCn*H8c1+R!9l@>ghDU+LG)|Q%FB!*TiPB{sZHxZ#$A)pyblOTBk9f4dpo1U
z2!s$qh<BECln;GgDn*TF&*-#TXswx@on>Khk!&WzcjfYtV!kQH$*vcRQ4j>wYc*C2
z1r`?;XmvW=-`pg3>J+Z)^8L-5$6ACq8!%-$d9_w!HwaiQ6ae__lWzc6Efm-d0)Bh?
z)HI}#^<pvV`aa!u8?7|}T5G!PHeKImy;zJ);u#fSy;zLGUJo6HBoYa(mdgD8<sw&0
zWfF-5It-ban=?+rM736<QLm$v0>DWmz_L(E9jO6E1!%R~04Svx3<g{;mw5l%7T3!q
z27>`gDZ*ZF^1ir@8}QPX2OP)2vMjo-mT?27O%kYAtIW^M;d&m8Mg!Y%_~Pr2fi}ba
zeO%8Y8V>0mQvv>2*!{ua#RJQlY-XknFe(7R!ElJ$+vDfEcmK87Ea&qPKr)#$4f|T^
z)heUWh-usYYtXVFiomj%vTc-7^sCj^j%l<69z1$vDW!N=sT{h~j>mu5+&s2lfn+kt
z!Ei`6mwR!`W+(T9=g*I=_-~End_EdqX(q1;A%qY@2qA<JLI@#*5JJ53VmrdRytWnr
zbec^7biYsA_c@o(^W&X6N1Er;ix;C`D;3^Lr<t9Z0bt?eNdSJjeLI%ijsGBVn9FNx
zQK#7?3_~)x9J=4faU4#hQk-8|;mXE_@p09ajg9F1$_gh^DICW^_xogWIl?fc(`-%(
z{$IsX001|g#`8S1)?~6-wAQ$`;?jj{WbWNEj+eQ2i%S=-;o9n@n4ah1rqgkyZGJp{
znDJ%LpNR#&55VcAWxl!r_R=(L{a_Sxd+8%8Hx4+x1dq43349+noknXti64hp*3oi4
zAC1>2KraljfUTXKSmJ+p_G}aZsrmWInC|yqc}#C2mMZ|Dx3|Y|G@3kr{Nzb&8|>E3
zj`hKrGtq7k0ANo|;W$n#v13c}@8|MybmmRXA%qY@2qA<JLWuvrKLGqXWRFVlzY72W
N002ovPDHLkV1kUiqhA03

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard-fake.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard-fake.png
deleted file mode 100644
index 3cf764298509e1d88d8adb9a66d6e18f6393597d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005XNkl<Zc%1Fp
zPin$I6bA4wO+sTg-DKmYiwZ#y<}RKjXX#12LeEeTijXc`yKy6dSf&ekX&guMXC^}F
z_uFao&6}5K7Wn`oBKp4q*8-u+b@TQ2$D4D_d#?H5+Q?+8kffP&BYns^Nt$6YRTl&4
zqjdn+iiaxKNt!`dC8QabM*5Jo#jUm5dTKpm*9uIg>g=_yO1z{oHlOQJuY^$LI-4)B
z-Bk$Uq+S~U%H78Lom>5MYBW^2j%G^$Kzt~ms}jfO#l`2M{kk4PpC)dtYrbc0UdRxF
zI6?I^0{|S0RqMK)o04W^5XWM5@fkS=0I%`sY`9(#a>fDRt2$lw(SD5}PN1vuY!J<j
z1Kox`_^jB9k9kKhYd422`fOa><zIUYwx7qn?m|RFL_|bHL_|bHL`3u#d3}^L*0aGe
zpE)`uL`*)D8)EDfiq`=QO>VTMP`cC`D)LpxmfQeNO_!EO+h)Gtarv&z_nMoRJU}*I
zV1r!yx)KHz8Is%pP^U_4$&F?TCEEWcOl<Xhrcj)c8)itsHMwD?P~t;TACsE4cuton
z%r)L~f<BTP<{)gfgzHbid!oW;a)T)lA|fIpA|fIh!w-&c0IdQSjL!f7002ovPDHLk
FV1ltd=wAQ;

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/wizard.png
deleted file mode 100644
index 3cf764298509e1d88d8adb9a66d6e18f6393597d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 515
zcmV+e0{s1nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005XNkl<Zc%1Fp
zPin$I6bA4wO+sTg-DKmYiwZ#y<}RKjXX#12LeEeTijXc`yKy6dSf&ekX&guMXC^}F
z_uFao&6}5K7Wn`oBKp4q*8-u+b@TQ2$D4D_d#?H5+Q?+8kffP&BYns^Nt$6YRTl&4
zqjdn+iiaxKNt!`dC8QabM*5Jo#jUm5dTKpm*9uIg>g=_yO1z{oHlOQJuY^$LI-4)B
z-Bk$Uq+S~U%H78Lom>5MYBW^2j%G^$Kzt~ms}jfO#l`2M{kk4PpC)dtYrbc0UdRxF
zI6?I^0{|S0RqMK)o04W^5XWM5@fkS=0I%`sY`9(#a>fDRt2$lw(SD5}PN1vuY!J<j
z1Kox`_^jB9k9kKhYd422`fOa><zIUYwx7qn?m|RFL_|bHL_|bHL`3u#d3}^L*0aGe
zpE)`uL`*)D8)EDfiq`=QO>VTMP`cC`D)LpxmfQeNO_!EO+h)Gtarv&z_nMoRJU}*I
zV1r!yx)KHz8Is%pP^U_4$&F?TCEEWcOl<Xhrcj)c8)itsHMwD?P~t;TACsE4cuton
z%r)L~f<BTP<{)gfgzHbid!oW;a)T)lA|fIpA|fIh!w-&c0IdQSjL!f7002ovPDHLk
FV1ltd=wAQ;

diff --git a/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/zebrascarf.png b/Resources/Textures/Clothing/Mobs/Hats/corgi_hats.rsi/zebrascarf.png
deleted file mode 100644
index 4fd0f9603e91fd316246dd89a5dfbc73fce7b0eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^abaSW-L^Y)fuUyFhW+k^V=
zJXzkpJnjn~3CT@VzEQ!Iv?jB6t!cDjp_=jJ(20fD|7)v0w5?6}Ea%_?1z)CJv+~e9
zd~0jSk|~bae@%|<-WtB|np(nI-eVFavE|=mG+Cd^%vu(?_xUs#h657Kg)$H4>^^FK
zY=O?{_~#omZ$_jlvOKF~WAM4$k|@Df|MR$v9H-)iZErtTMr1qR|E?JJ_;QlnO{Ql%
z-e>3R{J(q7%3lor3=P-+x9*pJ<8XhzUqc51Z1TM18f)g+_fBAW-`48pRQq+SR_(5<
zjlJ$^=k~@?YiXY0qP>Qb!m=&RAMAAx6xscZZOIhHcZw|x3>EJu&)f9m_|+)sM_b&s
zlx97N{BC)i<&<9f8>#ftZ95y^=+!gn#nwLf&*LW`7<-7H;l+|T9hI;DfI-RN>FVdQ
I&MBb@0Hc?pt^fc4

diff --git a/Resources/Textures/Effects/fire.rsi/meta.json b/Resources/Textures/Effects/fire.rsi/meta.json
index 3d99ae3043..463608d1b0 100644
--- a/Resources/Textures/Effects/fire.rsi/meta.json
+++ b/Resources/Textures/Effects/fire.rsi/meta.json
@@ -1,12 +1,12 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
     "size":
     {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd",
     "states":
     [
         {
@@ -77,23 +77,6 @@
                     0.1
                 ]
             ]
-        },
-        {
-            "name": "overcharged",
-            "delays":
-            [
-                [
-                    0.1,
-                    0.1,
-                    5.0,
-                    0.1,
-                    0.1,
-                    0.1,
-                    2.0,
-                    0.1,
-                    4.0
-                ]
-            ]
         }
     ]
 }
diff --git a/Resources/Textures/Effects/fire.rsi/overcharged.png b/Resources/Textures/Effects/fire.rsi/overcharged.png
deleted file mode 100644
index 035a1c7297d884a5f142fc6b05623ec0a46d16ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4849
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
Xtc%)_F;RZA00000NkvXXu0mjfFUV9v

diff --git a/Resources/Textures/Mobs/Aliens/hivebot.rsi/EngBot.png b/Resources/Textures/Mobs/Aliens/hivebot.rsi/EngBot.png
deleted file mode 100644
index 250bec06cfea52083bf2941e4ea8371a31497aac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1750
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

diff --git a/Resources/Textures/Mobs/Aliens/hivebot.rsi/meta.json b/Resources/Textures/Mobs/Aliens/hivebot.rsi/meta.json
index 0b1c99fb26..e8ab6145cd 100644
--- a/Resources/Textures/Mobs/Aliens/hivebot.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/hivebot.rsi/meta.json
@@ -72,10 +72,6 @@
                     0.2
                 ]
             ]
-        },
-        {
-            "name": "EngBot",
-            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/meta.json b/Resources/Textures/Mobs/Pets/caracal.rsi/meta.json
index bd8739d946..7a8a5a6d79 100644
--- a/Resources/Textures/Mobs/Pets/caracal.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/caracal.rsi/meta.json
@@ -1,47 +1,40 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from someone on Discord",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "caracal",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from someone on Discord",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "caracal_dead"
-    },
-    {
-      "name": "caracal_flop",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.13
-        ],
-        [
-          0.2,
-          0.13
-        ],
-        [
-          0.2,
-          0.13
-        ],
-        [
-          0.2,
-          0.13
-        ]
-      ]
-    },
-    {
-      "name": "stanislav",
-      "directions": 4
-    },
-    {
-      "name": "stanislav_dead"
-    }
-  ]
+    "states": [
+        {
+            "name": "caracal",
+            "directions": 4
+        },
+        {
+            "name": "caracal_dead"
+        },
+        {
+            "name": "caracal_flop",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.13
+                ],
+                [
+                    0.2,
+                    0.13
+                ],
+                [
+                    0.2,
+                    0.13
+                ],
+                [
+                    0.2,
+                    0.13
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png b/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav.png
deleted file mode 100644
index 67ce7095228cffaf12ebb68ae6984ad0d43c01d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14692
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
H`u_h1U85%%

diff --git a/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav_dead.png b/Resources/Textures/Mobs/Pets/caracal.rsi/stanislav_dead.png
deleted file mode 100644
index c7347fc9e7f1e1754992342f165373d2ddecdccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009!Nkl<Zc%1E)
z&1(};6vcm2ld6qXGo+>sjV53-iVC)kG~x%SxF~d11(%Ju5#76TAqZ|=3T}jM`~$2|
zq}U=VrZlM)HzpOTHX3WnOlg~_E%IE%na(tyrgdcxJZ9#-ci%bOd){SW3tRZ#A=Mjr
zJ`xhf`)Djx_c;yq2If~FtLN(t-?)IyLRkS}#V5+G{c{0f#U~n_&Wa-X`}+XsRr@w1
zz)^~P@9tf;Z-CwIUABDzzlVW=O9cELn<1^J#hevA(6n<qjZP<xPA7}{GFd%uj@x(c
z5%7EXFgwq+>z8e7e`C&)0u~mRZ6XXIflw!bP$w=|69WU6Y$9B)CfleLMJ0$QzerGQ
z!XuH3mM_H?bK~aSy8A#)fvTzs09lp+=;`TUcz76qTsHY{8&O#CiA*X%CY3<bG;_YU
zw-;HKakVH#F_Es2h;)@U=6Y0AZY@JwsGFgoAxTwLVa>$&__!%7`#A|fE>|$&+hn?G
zW~y!oD?VZPLRD2^h=8?{0BD*<CY9hP4W<cWlhsR8SM8$Fs0apwBoYZ^Sw_<|Mn*>H
zI_PC(b=5R-EhxGLm9W0y8048$g44(LoAcJJRYO%1o{xltF|v9dzjBgbFleryjdT!C
zevypcG5LNDC}e3<1X#OUi+ioX%*@O%8GFj`&|?5o#L)vXZJ}-k2M48EL{u$-m2@<g
zlA_AVvWFUJZ~gvVsH!TSj6EV6jfy8@kIX$^Kk2s8)NMlJeKz^ZY(yQ$+r*OggC8ra
z0Gv5-j^`6&X55(*=a_i&f@XOK(^DC#ZUIneHo07(ETgfM)N#B`?DKl~HaAc9>ynMs
z!1IYQT3VYi_DxS^q`$fa)!=YC*yr`w=HAW5Iph!XZZ>X`JDh8@4gl5d7Ja(T)eU6C
zD#F*^YMWaW>7qFU4XWEM0J?$uAOH?u*i-UZ3DZ*<Y0>f@u+!C8G)zHye$4}_+bsgy
zw(;TDFK+2N3E<(C_Oe9J9u)ffdJh=uou?GxZQolqelESh>z7G$e*<76zY5Z`2Wjcs
z$0bTVt%tc>P2^YX1g~EvrMdJ%P2}*W=9}pO1D&UoqOz?g2lx$w-*xPRtRf8n0000<
KMNUMnLSTZO<eJt1

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png
deleted file mode 100644
index b70cacbab4524d5fff0c4f5fc97062bdb79b40af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3056
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

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png
deleted file mode 100644
index 3c7d9924e55b68d2a69658d51a3d298c0e9c4efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1F?j
zi(^Q|oVT|&@*Xl^V7=IVgfFsz^-}Og*2#uU+$k+3Jq+9it`oX-CP;9<{<r#$$~6CN
z+VdxPGdvMu*vaCc$2h@S<U!HSwd=1>KL6bI!pgghryf23dCnwO^7!Xl*)7i23v~9C
z?_~Z~w?n6Yp-gkG&vL%E4fDkJofHJ=MKT5pb6r$JSUzjk`CwIt)!Ui&&sctoFXL<2
zf^RlEnX~>Zxf<R0>HVg!r+=(}*RTl4x%J(<kD-XOA%;m|I>QN71oI_x4dcZeucuqj
S>#zcS%;4$j=d#Wzp$Py=Xm=6-

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png
deleted file mode 100644
index d523e5ea19a7e461d69b23d74d6edfde5dab763d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gs&
zi(^Q|oVT|Y@-jJ!usz(_;%3mWT%3o~HGp{*(*zC{DQESP;*{te)!R>|{_{_K(0cOS
zs_l+?j1#;Wo(M7QWO2v~Yq&r8<HyF|vm2+*l3DQg=U=ft>mBnXu1h6e<E*HS+`ES{
zcz?wXgDu$??B?hHxYw}EHQ{LyD_lR4QK(F9?hD!B3#$A)8{&2|d7sg=X53rGy6X88
x-W5M4qKa@SOlLTu%234F5W@s#&apcnf9<64!h5?74+A~Q;OXk;vd$@?2>^;OZN&fp

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png
deleted file mode 100644
index 996cf0e21114c5aaff97c7f686ecc30efe610a41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5c
zr;B4q#hkaZY_kqK2(-#8vWSH1IeEn^v}%7}SIZ%<rG7#&X8CvBm^P7hInJvx4zX?X
zP=0&nz_Y#lJ!_68&FKFt_~UM~3@3x75JQp5f~OB}Kdnu^p19F=QE(c!#@Y3!zUQf)
z5ehKfukG9(r|KgXVE+HZjytz+T>qLgT~F0V=tKDD@`%TuAE*BR@+WKiUC)eLENg$>
zyJ%?f^tjp9+^&9^oV&NLY@c2DYyZs~KP-9wSMnQVai-q=U*q0>R(kU^2i=7{b64DB
z?(t$`J7(^<`1!H=i<&@(Fg)>KI5Cl7f-<9mJCj2nO9RY>3{Q4&o;bx-alKG*!c@_Y
z6_<4sw6z67k1Hz)&lBxf^H^{q=UFb7>xH*jHg96OS6aezuGRpkAa?oB^A~&8IHb&d
zrV7%x>hUJ_lvGxwS37c>A|n~!TUoK9+5)luGcObOlLl_~OK!mMXYh3Ob6Mw<&;$TP
CJgidy

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
index 5ec9c5fd23..42d20702ad 100644
--- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
+++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
@@ -1,28 +1,12 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github), Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord, minor resprite of the service borg by Kittygyat (github), red cross on Syndi Medical Borg changed to blue to avoid Geneva issues by CDWimmer (GitHub), xenoborg_heavy_rad by august-sun (Github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc, derelict generic sprites modified by GoldenCan(GitHub), xenoborg sprites, created and modified by Samuka-C (github), Derelict Engineer, Janitor, Miner, Medical, and Assault Borg sprites by _miket on Discord, minor resprite of the service borg by Kittygyat (github), red cross on Syndi Medical Borg changed to blue to avoid Geneva issues by CDWimmer (GitHub), xenoborg_heavy_rad by august-sun (Github)",
     "states": [
-        {
-            "name": "clown",
-            "directions": 4
-        },
-        {
-            "name": "clown_e",
-            "directions": 4
-        },
-        {
-            "name": "clown_e_r",
-            "directions": 4
-        },
-        {
-            "name": "clown_l",
-            "directions": 4
-        },
         {
             "name": "derelict",
             "directions": 4
@@ -343,22 +327,6 @@
             "name": "robot_l",
             "directions": 4
         },
-        {
-            "name": "peace",
-            "directions": 4
-        },
-        {
-            "name": "peace_e",
-            "directions": 4
-        },
-        {
-            "name": "peace_e_r",
-            "directions": 4
-        },
-        {
-            "name": "peace_l",
-            "directions": 4
-        },
         {
             "name": "service",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png
deleted file mode 100644
index 15a75518da7c874d8845f40490248af18ac6e19c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2016
zcmV<62Os!}P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<Yl1W5CRCt{2TRmtMO%$C+9)xs4z#u622NF9Gi+~U;1c^aVvCt-n
zC>C}`3-MW~SZHDuL?S2_0YOv{1A>JJf`W*Zf*=|QB*ZGIf}rfTXTF^M?#|B4&c3(n
z@{t@!-oD-0d+wZ_-@W%W)hfrD0BV(EO#rpZ5hTEa2M;11pFDZ8VV-lH=ebT%C4a5}
zFt~5uK7IV-$B%^I@ZrN|(dhH%&q|gZ9UYCv#>P4l0eqV`Z&q8jY*9TuJ*D#pcL5l@
zc=4io_3D-WzPPxUx(;Ie9XobR-Mo2Il?_xLK*gUuduH|F+_`hQ+?Ow3g6#$gAS*9P
z*R5NZapdvi$6AClXU?dyFf%iwKX>igrS|XNpYa2r_}~Y=eft(<J68boBQ!f(<sUtI
zq>m3AIFPyrPE1Tps7{-|<cA2hhhXwj{I6fX2JyEw3$XI&o50JLFEb)k0bk__i17OL
z>tLI?0$?DybLUQG(7Ai}ZtA-!z?(O3N*M&nA5wV&-2wNMItZFLd-iP70@z3Yj|dU~
z>SOQ$(8Ta0@Wj#d0r~XN2Z0waUZ`8QZk6Js$?ro^ey;#%LYFUJR=<AzN~S;Qh^ykn
zg$ozd`}gmow{PFJ)eZ9aCEDc=?gDTEFdZQzaTTbFzwj79M?wgfmzP!9D4Rc5fKQ)3
zCCkvFzyhjMRL$=dAnrfv;K75c9hC9({|0|>7l6Ugr%*-HuZlkrKr9-t+tQ!w*RNNt
zR!d#Gc1<@!8umHDGH8A$PMlB!0|QFh#HVe6QWt-d<d|+y;QROQ>gm&`(UBuZQifp=
zPMAbCn0*hnXmjh<tqB*MsFOd{1+bljVk<W&I)R<l_U+sCG4=tr9huyT@g9P<-o1OL
z?%%)fT+-IT-=z8&ZL!-jfoAyd;X^etGNQk8M@A<A9CIgzcL5;3a^(t}UkWITGN`Qj
zw@Iox`3tQB<aQK<=Bf;aQKrmy0af!S0-%54Mkt3S6QjX?gQtM=SFc`86qLm5b0nAQ
zOIsT@Y|z(bU#^>93qU2st1OPt`bHeU5jue;HaR(&lqazyUm;G}ivJ>V$$_d)ek}l-
z6*m;>ziC5}90vF7*`tX+eE6X5-Mg0zG$1~G`n0~japT5h&=F41rUrQi2M1N%{8|8z
zLlG#7xzmMBn>OiBH~^)6*IfWPDvUvIdU{&b&94Pub8x&!Oq${B>}+y!etzEEVn*^h
z`<`hGl?1uus*}Ho#lY0mRD`|-Rb#_eCqR&=uyNhG2gef@T)Ir1{JI6;AU+`@Ew-B*
zvBFU&*JB=i9sO07sgpmM1}#l0gIL){C)XX0)ylsX9963vYXYcMj<x)N5c1IYJoejF
z<_7@rvNyt7-^P!BLqkLQWl8Dz0elVRiqkPa;Kq#`>iF^FstUk1H$blNI0Pv2HabWE
z#{PWaY32%Cx^zi9ij7H`@Kv6`_IP-BSZ|J&mX?C-2ImJr1YhN4t^h<RGd}=LnU#0t
zBoGXb_xARp3zU~1fIjD|{NKnG2<1U{2+a{_J3m0emMg$_Ze`>Lth~j|%}J1`JU>9<
zZ{-S9!P8cLfP^nspiG4F@NEx#zJC3BuHClt0|*LYIwW3ibp)i^;4hSie!^!n0AoYj
z`2qZnX~zbJua6!*+IE7(-o1OHCr_RP@pN~0r~C><+xY>e12&WqBxO)EFCU<2#fjYT
zIFv_J=Fp)-scV1!{83$9UCw*C90l+si?#yXgHOf;eF0IMFVCMp*Ab;WI0b+Mh{|H{
z86O|l=cEWEjG{<28veSSKYv~q4HW_0xQDzhklR&x*uXla)oMAp3v~foj6SdORYG$A
z{{34uo6Xq8<wB_>Rsk^jqxoY+g~a4oz2q8ZfuiXuSVYB7HE3Z%Zr&4$xbk>FJs70%
z^x-pF0P5i5&IrJ%4|6DDa&UxUYW68p1lcldtz;!GpF1s?+&_Q*OkMZ!;5#did%;QH
zecaA2;EL6o4goSYZ_C)u%L|Y|893YD-><f9+oo+WJH*9fYmqW1;P&m?PQH`?dAS0B
zYz0spu{umqr%s*H=W)y}se~Dqx24G78dLKn@_6WrYt(1nfUOl28U)d_qzH5hSXfv{
z%F#J2PB4@B;(b2gUgQX2j`#7<C;C?eRsqad{qEhno!tPx&e*wgXKJBh`^APUFTls$
z4i6xG_T?l183D{#Jq+=a;bsVd@Df7QXs+f@WEiiPP12SZV1kPtl$8R&mX8O%$Z)vy
zd2Vh_=NFkFd8Ytotp4N2k12!rE<xwm=g}>AjHw9I5S{|yaza)J;NZp=tXPTqcqHg6
zeFr!0gH0@o%pGDzfRI={!_X^1MhzLUwMB1jc>yNC$=?M@gz(7FxXrGaW=CWM$cfc!
zAPnsYK}Yfl0C);aSuyhhB&MdO)Q%lH^f7F+N!#q%c!f_HFwM@^{ZazBas|w0?@_xE
zmyOJmEYI{cTO^nva&XIgOm5|fFuTg54$LjGac5e9Emj{-H4&yCs0^aMzCNcTp7NQz
y02_B)MswpHyjqtw;u*ln8DEba<+VMR@c#go4p8-EcVlt@0000<MNUMnLSTZD3dbJ+

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png
deleted file mode 100644
index 3c7d9924e55b68d2a69658d51a3d298c0e9c4efd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1F?j
zi(^Q|oVT|&@*Xl^V7=IVgfFsz^-}Og*2#uU+$k+3Jq+9it`oX-CP;9<{<r#$$~6CN
z+VdxPGdvMu*vaCc$2h@S<U!HSwd=1>KL6bI!pgghryf23dCnwO^7!Xl*)7i23v~9C
z?_~Z~w?n6Yp-gkG&vL%E4fDkJofHJ=MKT5pb6r$JSUzjk`CwIt)!Ui&&sctoFXL<2
zf^RlEnX~>Zxf<R0>HVg!r+=(}*RTl4x%J(<kD-XOA%;m|I>QN71oI_x4dcZeucuqj
S>#zcS%;4$j=d#Wzp$Py=Xm=6-

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png
deleted file mode 100644
index d523e5ea19a7e461d69b23d74d6edfde5dab763d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gs&
zi(^Q|oVT|Y@-jJ!usz(_;%3mWT%3o~HGp{*(*zC{DQESP;*{te)!R>|{_{_K(0cOS
zs_l+?j1#;Wo(M7QWO2v~Yq&r8<HyF|vm2+*l3DQg=U=ft>mBnXu1h6e<E*HS+`ES{
zcz?wXgDu$??B?hHxYw}EHQ{LyD_lR4QK(F9?hD!B3#$A)8{&2|d7sg=X53rGy6X88
x-W5M4qKa@SOlLTu%234F5W@s#&apcnf9<64!h5?74+A~Q;OXk;vd$@?2>^;OZN&fp

diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png
deleted file mode 100644
index 996cf0e21114c5aaff97c7f686ecc30efe610a41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5c
zr;B4q#hkaZY_kqK2(-#8vWSH1IeEn^v}%7}SIZ%<rG7#&X8CvBm^P7hInJvx4zX?X
zP=0&nz_Y#lJ!_68&FKFt_~UM~3@3x75JQp5f~OB}Kdnu^p19F=QE(c!#@Y3!zUQf)
z5ehKfukG9(r|KgXVE+HZjytz+T>qLgT~F0V=tKDD@`%TuAE*BR@+WKiUC)eLENg$>
zyJ%?f^tjp9+^&9^oV&NLY@c2DYyZs~KP-9wSMnQVai-q=U*q0>R(kU^2i=7{b64DB
z?(t$`J7(^<`1!H=i<&@(Fg)>KI5Cl7f-<9mJCj2nO9RY>3{Q4&o;bx-alKG*!c@_Y
z6_<4sw6z67k1Hz)&lBxf^H^{q=UFb7>xH*jHg96OS6aezuGRpkAa?oB^A~&8IHb&d
zrV7%x>hUJ_lvGxwS37c>A|n~!TUoK9+5)luGcObOlLl_~OK!mMXYh3Ob6Mw<&;$TP
CJgidy

diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json b/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
deleted file mode 100644
index dc41fdedd2..0000000000
--- a/Resources/Textures/Mobs/Silicon/onestar.rsi/meta.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/discordia-space/CEV-Eris/pull/3768",
-  "size": {
-    "x": 64,
-    "y": 64
-  },
-  "states": [
-    {
-      "name": "onestar_boss",
-      "directions": 4
-    },
-    {
-      "name": "onestar_boss_unpowered"
-    },
-    {
-      "name": "onestar_boss_wrecked",
-      "delays": [
-        [
-          3,
-          0.9,
-          0.9,
-          0.9,
-          0.9,
-          0.9
-        ]
-      ]
-    },
-    {
-      "name": "onestar_boss_screen",
-      "directions": 4,
-      "delays": [
-        [
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss.png b/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss.png
deleted file mode 100644
index a4ee0e46eb1dc1f66a88b791d1c39a7901c519f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5815
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
B3(Eii

diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_screen.png b/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_screen.png
deleted file mode 100644
index 6e33c292b07d33f514702138e703556b7049c963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7488
zcmeHMdstIfw%-sDAC<_pExsUDZ-?HZA~J$Ckb~9{9Tl|o#YG5}Dt1%?1qn!!6Z=p*
zK4NEdfbxhlj$%bYOnE;Jv?_u?tcVapI0#DQ8A1pl$vJ1w4%+$p^|mu}=g$43oqk`=
z&g<;Q+3UB~@3+?eWK&S!v?;Tv005?~Tf6!#09fcFD`3(@^p>HT(uv+C$E*#B1HkEq
z?Xo-T;WP(;xx?#LuiTQDF`%hF9%j@?_2gZb>M6|ys@BYvYg|^8Pg)hZy>#;7RW4tb
zI+y08-#bD%yfRIb`myF+XRnYKKRSI<aXP_XQ=VCTcV1Vn=IO&ph4aoN`TyQ@t2X}O
zm+E$IO%jiDdX{eC?{p%at1_-Jtq-3Dz`QrnasrN_MmpUNwXfKtX4M4Ld^8C)lblgA
zeLiaDtwznaZ}ebG1NkcotjbD>FmB(0xslzz5VMw=8?aOPHz`?O9>-$LT%R(-02c`T
zVFP|54G%Yz*@LQIXOtv9(z#i?xGgnN!oe57HtkwgMAunGGN&jnjI*^_SG`7Lnv-R%
zbUbhJFOD6g=rorgzlutea&#HS+9zT^?1y_@L%@dPa>-LN&c`^R6|-h@G_!8H!(SRk
z#5*#auZTIlhGg2853Ov5P{B^p^F&U%Que{H0k1Zl6NCLQkid(8>*4oQ>XynRyAAM>
zhwG&MH&}b$1Q*Zpp(ER3O3!tQq0DAsuo1K}y0ott*+MWlO`S`w(_@E@v(D9yh*KHW
zsZ82aiRmqZO2)<DRzB_0MT#Ov9|m)P8j42oKW_(xc?XrEXl`FwHY08woxS#TC9i^Y
zx7x$*?U@^7q^525OX@7R&dBPhEu?i;>gg3faLTIoqdm}$PVy$q*&kA9BiYu6%Ln^O
zs;S1rQX0Q%h2^6<;rAKlAGY96{>JOWAaUfv+hwr7Pv~3p;Fi}Oi2*9|(g`ov)z^1a
zBG%q}a)W}$XpW91n8$I+2BL8EHcKY=Gu~JZt+JZ4!O@&PvmleIZl{zxsjpcwJaJG{
zA;Vfrb~BOvdL5a}z|k@?xkJx^PmWi}<n((5N_;y2+aA~7oQj)TIb;csR~8o)L#g0Q
zf@$7&6k~=JU3ER`uHy7v+G{llg^b^nUV~gR#y!eQFy!H(X7b7HZ~4PWEB2~yV<rJJ
z_{;SpmUgV5B|u-mCt-Xy%rWs2JMxcK@`mITl_HRR@Lqe*2~+37F<QC6vC3%X)0SmR
zGWGnO4m(7WI8pvEap%*CRU;q9SgM6eRlfMDaC)&b4-~>zq`O8rl-SV5r>q~x9yFLY
zZxRovVJo+Z>pHa2QPPw~{%ZQpME&PIFQ1ET8^Fdg7goBwWHg&NRPaTmOA)yG@Y4xZ
z42O|R;-j{(C3VpG3pD5lPHrOuzL~Dwi8(qrpz+j^_VGi!p}Lo(wbkAo%ibPYluOMm
zpT8w$XiC-QH+~0-h3A_54Ivm>k;4A9-^8944*8t^tXC<uFzhmiy`}S)giXG*(=K&`
zVX+gn-b8qAaD>OT)!~zFbjt_L{JCSCW*Yu}0lJkdx~p)-K-PXWtW^G2TDx6$M_NZu
zRm>r3u=~NKOFYvZt2`GhluSDmJ8>*64-1Ndrra0G4<3ARgF@bBN*Vyg5{Gv!{!;x=
ziV4GhYlZG8;B_%R0$8_;G0Dtq3x0zcz(3k(2zE^3rYz=+7R0ux@MPGe7PVt{@Qw&#
z$SJ@?b`OtS6}X*Pt$cjA$lM0~kL@UL&`!0wSsRwG2xJxq08rKYcOvai-cP@mU&fz$
zn;Vefutd|-B_OO7j&4xTuWYrBspQdlCnM{rZaMEWlCq|e)C>bh_rs2Abl3SqerWRJ
z!!^NKhjwK^x~8knJx9!NYG0Bzv2pF)nrOx-IA29|WBp!+bYlENejU|R-TsbjU_YJo
z;(aYN=7n=9eTv+5dk`7kLq1t+-_e}c7xg-GGemk*>s#Yu>+egL8wAWJ=1>DRVm#a)
ze=9lmWs1>$%IX-Vn$loiyS3wR%|%_!V=W;{euB#vOqSA~Oznud^FJaEqplKzXDUf`
z>*@*EAzUi1EOxkfjtAo}M0y$GpF}!Oa0wUvrqp5Y1w3Ve_0<kx0@22uac!);yJObr
z+14W5S_E%umyMF`(B@!GD|MaqrfTob8kL%lwIDxrrTmZ8BljEW<d+X+D?L)+%NLW~
zT(GhACTwvlL8}SclZS@!OlzdR<zp;ZG5uIQ-nuBDX)s$G&^sl7e&KezN_Mmi0|O+3
zUM}*MRvY?P>T1Pu*$%KJPr6|{SWJ=H;~w*rB06@3l@RXkxSHcZTM@yH5)Ca=&qsMd
zMumH?=(qJ(L;q3o9XLRfc>0~DqROP0n~vhZp670p+TLwoLKs#u-^c|UDOuI`NRoeJ
zNBNFo`-b_NYHC_q*tDhb!kv9chVJ<7S;wlh<1Wl#K2{kg7A0sKk%IWcz9)7uU2W!k
zeVxkDjXO><>XuwK01-*Z0g-~r{*a-A{KW6<)QBXg!=3zLusrcDLB=0M-*#jzC~?^P
z{*cc+)WLk}@qvJBAy|?4YQ&Ted-P@Lp|*KXp?O;z$M!X?WYAKMiVxUE>B1)<P5h55
z&Y#WuHwF36+w=4G{EsZ{Uki$={r;AFpKFj)?^{qe&UJxjY;^ae(Gxi|ntVy<oV*NI
zogn(;>xLq2o_dH1R^r{A&m?8RBQ0nBFF@+m8Nqq7>jV2*0z<^m$db+ohv)lml^D)n
zVW=qc1W<qfh<CtyMpjknwCw>$<an6TBOqrU>KBZade`+jN{w_2Tgo$9IJ=GB9Y!rK
zX0}c^4I&B)Gwn9!=tye7+}B$K4kXjE>(BnE6WIB95$3>Dl%0NAPi8?{PQ~{arlLjv
zjSTl+yLV`=A6clYUjf|2J@*GS4Oa`CcS{WEBsFezT*$P@MbV}@_acP>mlzr}H9<uF
zeRGs6dd5w|&B>gFv~oHCOT42NhtJ&ZE9Y$e1{Ier43c5*?wl3IuAus73c|vA<*y*x
z*b|+>#p+O!&#UXTMw$1x0;7Gd0{U39uSh1A=T^cZAu)G1Co5UlgWtNs>S&S;p15wY
zJ58%`)hxR++b~u*PPdr&gu~OvpS#~`Eh)H<MLw{*CLXZ7mIJ{TNYLcyh+N6kwX~5>
z;`EdNMhNNzhnFQmcWk3l07tPe`|&%}JKX{$Uo!P>?RAu?EbT+j0~p13xOG1I@&DP+
z&<sBctSFqMN<n3bwYA6h!J7M=EX$+8sT|lyZ624w*q`bJ%rKR+oXI>0M8<Z<^Zl6`
z&%iWu10N;gDM+>Ne)gZ=$gm<3<z8DVN=I*xH9TF4G&E@g9FfC=ub;xlfmMY+xWYPz
zY$JoiH($%)+uMw)uw8JJ!Td~v_uz>T#{l}}b4buf6;Ej04M+J|NShLV1YKmphwsmb
z>~H(;Ub$BvxRgVH-hQHiQI9vn1Zxu-c%6CCwO>51xjYLM+hQs1PZ<OeK3Qg6N&-g7
z8w%_eo<y)4uL9N|QNU}We>VK3A!C0N6ny>^jt`e;JmhVSjqvIE>;zqOv^YnLIeAmu
zdX(#=<Et~No5}>?;xKf>B`v(7l|RD@3v{Tv6<p!O`ex+se?(bV*VUZ!y#)n<x6Xcj
z@HwUE4-_KJs%KD2zZ6eqN~bB|BQsg>$c**bqR|(c<wA)_otbz@eC7bZ%obb7V;qn%
zgqWk|(SJT5&NGzUN+A?m76k}&k~ivnGW;zM6kiou>>|QwBR)51mmd0>XyppfW`DoZ
z;pq*p<;g=mfdk0_ea~nJV2Fm|o8>Uh*9I%TU2*ISjag&th)^-K#S+t)#Zo-SDMAU8
z(hq_&D5|`Lkk-{1J+|oXGpwO?4~I&F1`jdHLrjPxI3Vo8{E#SLiLCMMdh0)Hjvubz
z{#Zx6KJu)rXRGP0vFQ(qLG~Jw8<_dHd|+^AX+|c=sI53%t4+ugy`NlYt2zU!MvStZ
zb2*ie4|@w@pNtH6ZMTo8^$CB2+fKI4{-p{}r{7Fz!PQFKJesPwfFg-QOlOaA^By=V
zfMIi-r1u(kmM_VT=3$q6^Pq+CEFZgHJiKlUrNR!j?8$Z`e-BDuTM!x!8fiHyGDJ51
z!43FQV6BbH1PZ*4M_&@NMPUp&9k^>4heoBte(OWy=4~W=(-Y&~3f*3_bCLfzHT_kv
z^cqq~`}cRDp|J$Z$q=Q^cDC^M%JV-~<IYFV_J3qowC8eC6lcnB5?ncX$wJ|Yy+_MD
zMHJT%h&TrY_+yA*w0`g&s{<8KXYMwdNfrJ685<vU`{Ib6u&DKH>CtdW!il2XQ<p7N
zUatRAiFc_jU<qv_=svSj5=XSqRcI=kC^^$Cu(P1j)Xd$w8=i+B5_F2ncENHJF#?t+
z^?u@&5PkA83NqOorZHynwL8yPNsT8-toWbBQ#a9|c(8elU9|$CWE?6mDfEynT*SR4
zhaV4xN;e`Zbw;cyTY_R{eJbC6;{W=<=HCbrw~=WL>4HHX@|ObVt#W8|m#Zs=YX|x%
zcU-T~pyL#UfdveT5ir(U!Cn(0X1<9En~kbWE(=5iA=5tBsIFU$W}LZGge-1&Bm_Gy
zPxa(2%N5<Lu#b7pLv~<^3xW(=S;4JCnMWpa{qc<E`8e*u{$95luWsH-I9!rAAh{b&
zIf3<CN!uwz7pg}Cka`>i9P^?j?uavVivsMVCHnPMKXmf;6EWmz=%D)bygybRDa=H!
P1lIj3Xm#$Yh!6e(-ri|*

diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_unpowered.png b/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_unpowered.png
deleted file mode 100644
index 0ed394772b8219db949ed9bb8bce7a43afb1353d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2310
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

diff --git a/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_wrecked.png b/Resources/Textures/Mobs/Silicon/onestar.rsi/onestar_boss_wrecked.png
deleted file mode 100644
index 3a0ba0d2f827744fd9990d5ba23ea0e1d90a2ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17336
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
b0rXdbu9ohPP5%BB2bhe6qIkWiap->m!wT>p

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned-unshaded.png
deleted file mode 100644
index 9b72b39492803a112ab679408d6b450bf93c7b8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&VEXOp;uumf=k1-qzS#yMtO3hj
z?YdE37a3`<<tE6~eDFg~abL(*#kVo(#~g3)mP-INg20Qj=P&NJ@V)$g{_(;+sRpLc
z-K&4UW{1cj$ZNirzx-ak?T`AgDYO6At~v6f>g@l?#vLz$=4}0wIjgNuMt)|?&Yw$<
zUrDaJ#?oW;`|VSE({*?LT*~i}`#js8d0F4}3Gqcaw$J3}HGCGIRX;!dTk!R^=%3!@
zz1rsWXP<wb$j|Uqd+*dBqy1M@{jMpsJiof@vjNZl_3Z2QihK^7vfX;TQf>c{9X<!x
zzU=v%%B1G<|NG-v%eU{}_G$m|fWtcw4rO3i5wQMm$*1Jc`rDJY-t$+tH{0)FpKuy1
z)cu8d+Z~Y5|04SbK_F#cnVD=}_}Issj1&0z_xbxc=6NsMwRirSbie%HI~JSU{Nb-=
zE9`&&$9eSw<J0den>Vri{QE5ZJG0(;?q|nOKdwIgb@P+`*79AyI^_;Xo-V&}S#(?W
z&+PYKb|3rt?N34U@_$mF=1chd|Gas<Ve5*WwsHRo&-xum?65z2djGut-_O|pn)mbK
z{g%kw<W;#g{z&28(6Ux~;`8T0$GvI_0_*1goPK*_(07(8|BkHt^Y7DUwS;%Pr*ywu
zKG}bEe+`?D?EPxJ=|FLQ{{t`TEPlQ}$6hh>N>EjH<i4#T)Aj4mzB5gD)&2DX$lvwl
zOy9s^^8bR?j^}k&KR5ooc~$20>!zO{KUF}2ZQ+XGzYV7)|7`=x9{k%7z5L$R<DZ@`
zPl;zfSM_rFWck_kRZQoaJ5=`n{R32}`=hSh?f(L$J%7J4LnFcA=(aqUdGozxwLcy_
z`l9At;Z9lYQh$e+@--!PPg8vl+>xFV{bITDwWr1juYTMs-nr<r=KBvUJ@4AP&#^bK
zFWqLeZJX=1ZC+7lp4a_i<XkF0AplGXROtV0*s^?iomJ9Hc9ki04o-Kk@voTA2ekFU
ZZTr2iwC2ogy}lIW22WQ%mvv4FO#mbvqW%B?

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned.png
deleted file mode 100644
index c583bb88f21bd6e5250ced9332d3f2d4eed2945e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1589
zcmah~do+}37$3$MO}VX6N@J`fZObUKHkl!pNQ`J>!+xX&5s69Ko%uxW#kPe?ve}r_
z$>f@@Uz(zl#*&7_U=)+lxXc*Mb-%HHw5NaeocH~`&-0%1d!FZgF6Ye)@ZYYBS%pC$
z5V}6z9)a-rr+VvX!&tzMwm~3Javu-3-N!CXU2;hnjmLTsa<i?@TI3h+dx+b=^cUj-
z*9_e%@$&l2#C+>o?~CUyYxYOUb7r_v$?P*-mR2M8?W~xG1P%F>)*BIq8|<S{S}RTM
z8=MN)&W?{qvxEbX5A<0mNtB5fobnbXQ|eVJ`JIq#E`t=R0lE<1a`+C<5!WwU(<_vI
zgE-8zY%Vc>DUn3lZmjLrb&Ny@l++n?^T5<KWQ#Ve#G`%#K|IZX&-)O*K$HDIp%4fJ
z3T0j-a>#cgkZEZv=#aAMLVtUE&Xh#fP4L|1@FHSfrg(Y}0RdpFsU6uQ`!C%}-31{R
z+SFhPMb9b}hbR;hiL~7FOjcwJrBs-m(r<GW%)pzO)gR!S1)G9^RGOybxu`4)d1Hs2
zEZqz&2c{hR6K>~~lh&9CN{9&tTF*xgdyhK3`ot1)xK1eKDL)=|t7UjKLM{;kW#vU3
zf}{7`vix8ycwi@|D|WV;XRS9O1=-OddUeF_kFlqKkKFSLXXg>Im>Lj^t06qF(tzW2
zM3L7rlSd?c<~!}xQnv7BQ69GlYSb+J7J6SdBbzO)U2^AW=cB%1$$Kb7qqr0`D&e#D
zJYx35b}v19qhv%f4r`;uvq70$Mun51cfU3BN5pW0+T*go3FIh4KbOm_Aez%_z5<Af
zx67{-yeTHq?plEZ8~ylff-lqt%riS*J!oz;<aksB_}A%|k~TCKk#r}*LYEjT<(uTa
z$}(xXJ1w5mL=GN@s9`~$CzVmtsRE>4F(%G8R29No^_UwSZzhjxnDew~=hdY|*O7xa
zGgJE=x0)5L2y(@Py}~e44p#Zy(9qCy@IttRKiz}YY7g)_Uk9Ckh8wkh5}*u~=;j*P
zye73RVYz>1*$G6|=KhW5AHrVX_l50jwV!9xFb@xG-PwwhyZ<KdYX>|lSb)29E~<qZ
zmIm_UO%~c;qle1me9lvFd{nr_wmL#C(wLEnd(ck^{{u$rG}ntX+%Sx&6Ii%#+wcY?
znk!sTnD6^FWQsIO-!WKBvE&od_5nFZr6*1I{nRr8WfF(~kfkg%DTio}u5)XmYH3^4
z0XU139hZ5>e!nJ#&#LMuNLKBJ?>lCJ(?**+`BYj<oKIaHOe^I<TTrP}EZyEF7N}BM
z>SPE?xH_jRtp{>ng5hFXQre7C?iF*~R|q#FNX6I&zB4961Y35ZGj?SIIR{Lmb8<AM
z;}it~q~lb1jr=E}NZvBdk)3ragx9)X(N`ae9)>D*VS5wet|_RzR$z)fpHcdTG1*X>
z0}_=lSa!brp21l+XJwkymoawx3<rlww9l10x(>2au5_Mn6Ww0PKBv6fetBRH=ub0^
z=w9C^xIb9|*&0J+b-n`s14$O@EM7hA<=`EO(T0;d1D8R_A>$38*IxkGvW$0=oC8d<
z_qa0QwCq*AeVJOJr?yk5IE{arHqkS}k#Z<f;%YjV&ROBbW9aJ?UeV80_cf%v5p*ku
zh@;=+Qvc<=Qq<}rhk*$Et%JgA2mOE@6?&@2()7P^V*WItQU4f0?E-usX+mBU7{rL+
z4}A>N4nWek6_lngM32Ff1AP1f>-@FgdCEA~9chwyGO{JGsMUUF>o^DD(S_DpY#5sB
z;xpB1RZrc0G2hj<S@ZZ*&xw+z3qm3;=I64{pJ1hJQwAJp%oTl|BVmAvOLrW`29{yd
zM;uRKrRnBbMDu4!gA7weZ<ZJAZ?!nmpb3An3%#EZQaDK*e8#j1J3%z}R&%^2k+xN2
z^xg?%y^#gXTfBrh*inyo<c=gRdhDX14X82jO+<NaWcLC1J3#n&`g_!Fi^%u~A%`&C

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead-unshaded.png
deleted file mode 100644
index 28bf165122ea7c29a4bed6f6df7c1c37efc18a2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQYM}*jv*Cu-k#gY$)F&>e4u=z
zyxruRk+(S(m4|jY1hFzO{K<GDHhImRyYA=i?BNIMVCbKrx{i(Mo@~AWi0A3*=d#Wz
Gp$PyfVIac*

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-banned_dead.png
deleted file mode 100644
index 7c5b468885aa71a7856e9142bb89a348e7eae7c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004&Nkl<Zc%1E-
zJ&uDg5QSe5jT=INVo_vokSlO14uRxb`3kwgrigH5Xi_>wWG{aq$u9P+1W%%14E}~O
zW6R^6l+s|u+5uQ~0Ac`8N|C@1hXbhjvAy{^9<fi;AmB!8d|xg-8x`LLV4tRFv<~9H
z)Q3{><7W*NqTt6vLtWQift>T%_R#!j_yA+fs{^kTn(qQ|KA*iiVf*c}sQEDf<arJN
z$g<1}xC^(uE{l>M0l@WoMO9U!m!y<loT;j+Hwu*e(HziKQ54>sct;`lI{>CTGq!CD
z0Jz<5kW!*33IP4lu(nTRf59Y4oXyVo@9_VsIlfU!86kw>oEyfNVT>6(_6UnzwqMS<
z5keTHlxw5p&!)f{G@AlT>NhD6f*%2ob+IhVMS*iF%d)o$Q1Z7Fz?K4A3anbIPk|Wt
z*&Urur$wR9WO=qGNXd685DNZ`Ma7?-1D5{%KJ7Cke-r>8@K5><%^%eSU)Ah<D>T0s
z0LrpB72gG*(K_hC#FUMK?*cG9sR=DA{&qM@S@Zi3x&w%1QN~tqHsk;R002ovPDHLk
FV1n-x%*g-%

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty-unshaded.png
deleted file mode 100644
index 6539176b8487d93162dd7df57f3528eca69df99d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 109
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQYM}*jv*Cu-k#gY$)F&>e4zZr
zd?oMbXfClu<*^DALKqns?4_)qs(8P9w>UlTK08oH1G~>>eKw}0-xuEo@)$f_{an^L
HB{Ts5#}6My

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-empty.png
deleted file mode 100644
index eda1f4bfb568d5b1ea19f15f24d9242cb27defa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004sNkl<Zc%1E-
zJ#xb!5QU$N8X8-bshk`5cJe9qR=R?25LcqYZd{VW1F`<&2-r-dH^Yns8ot#I4<yK{
zs<K$IG61ViKn?&}YZmzNcmy{;cQ+rW6And@1bj0FpVw=vj*IUTa3~7gj7bu}(2H{M
z^RWgFaq#nQMbk7<fl8^#_SF1c_W>zo)Bxs`n(q@(*L5!lA_@v~{l2pP0^bTDtPsK~
zrL2_FN+~U#-v^e6{PmLJ`c+DKmTP0?!)mQ95e)_qDu~wrh{$TKeH$mgHwSb@M7Ufo
zbB{$+Y<>p7zRryI`yBxAcszRWt|#9K%=vG>-}^c@<NuVuL{t3PAsC`8u|Q1ztOfqN
zCM^(Bzp+3H{tkGqi)C2`1x~3f%hp=V$=@u1%>tVRR;|@rAP2txj?U+EQ0SN(&+Q3v
z^1TI8!N*u!{J}XO^zeJP&y@UL0%E}5={q&Qw<kEaXBS(k`K<(SZi{pAeFARABt4iI
ts^j4M1awboQj3ef9gbF2#T^5yz5rC2*?>5Oyi))G002ovPDHLkV1j~s%9a2C

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old-unshaded.png
deleted file mode 100644
index 63616e70b52120b670f04f00c276c707f979efe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2483
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
P#2Z_h+mXsmy%PTd$R=LN

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-holo-old.png
deleted file mode 100644
index 3dc7a301d865c65907c7c3fa0cde98ce717cfff6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7280
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
IluN|_0b@DVZ2$lO

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai-unshaded.png
deleted file mode 100644
index f3ba4b591abcf9615ea0cee2d2ef3a5d1e7c42a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6255
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
MrlCf;x^2||0(0FdR{#J2

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai.png
deleted file mode 100644
index 3c81e3a751ec86844a1fb383a91185e12b041561..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6761
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

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead-unshaded.png
deleted file mode 100644
index 96e953660f8eaecc60da577108813a81695c3102..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004uNkl<Zc%03b
zJ#K?A7>1ujNNuMuM7Rv8xB%yAu8^IjQ<bSm9H3Vq*We0VAZmsbPh@I4xdVy$Pg^C1
zzLI5Q1J7%JA3vTXNun506JS&W7J!s;6u9F!g#mzv#e$h_4+1{qId8iiKxtrR+Z^(I
z5CheTTGfHiucu)Q@Y-#l(6eFux^^^ejeCaq9a2(CC8bnC2!*GLf`Q^GC4|sCKv@8;
z>jE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc
zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l
z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg
z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n<Ni
vwc7>`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_)

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png b/Resources/Textures/Mobs/Silicon/output.rsi/ai_dead.png
deleted file mode 100644
index 96e953660f8eaecc60da577108813a81695c3102..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004uNkl<Zc%03b
zJ#K?A7>1ujNNuMuM7Rv8xB%yAu8^IjQ<bSm9H3Vq*We0VAZmsbPh@I4xdVy$Pg^C1
zzLI5Q1J7%JA3vTXNun506JS&W7J!s;6u9F!g#mzv#e$h_4+1{qId8iiKxtrR+Z^(I
z5CheTTGfHiucu)Q@Y-#l(6eFux^^^ejeCaq9a2(CC8bnC2!*GLf`Q^GC4|sCKv@8;
z>jE&J&&^HKE1RzCYSt8Bzuyyvp*eU%VHlF8X=z|gO#mf?&>h*`d(qhbd~qCabbGmc
zJb$uRRN~{lWMvs}Ou{IN%qF2%CSepsItfP)0Tdz7rMUue9P7HT-F0qrthxf4b^H?l
z{}9CSrj~Hk<8%Ghu|8e&6#PkEQ8k}}DL|U01VM0RV!whQxco)b48d=fyGx^ozykDg
z_`ZK-YPU{2$8pLK_`Xk;t&GF7Y*m|RcMfa~kbCagHedpN=H4CugzI*fLDdZ0-n<Ni
vwc7>`c|PdIq-Ef=QyE(0Z%&gW8I#X9TE>0xyqkY{00000NkvXXu0mjfY`w_)

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/default-unshaded.png
deleted file mode 100644
index f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2005
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

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/default.png b/Resources/Textures/Mobs/Silicon/output.rsi/default.png
deleted file mode 100644
index f14b4ef0fa6b3eecdf2106102180f93fc8b3f4c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2005
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

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/floating_face-unshaded.png
deleted file mode 100644
index 05de742794341c5e5489daa52bef423933d51512..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007*Nkl<Zc%1E;
zPiPZC7{y;|6^w$`BnUl<(c;D8MPeg8iTICzv^P;HN)3pfgiudCSb7x#H7G^JV-Z9&
zgm@`-Q+jBL7l}>lu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^<o7pef2M|IC`F{zi
z-jK{1!mH2B%|7Ml2BqJrD&Ch!cz4ViLdPWN(3c)$GHZxaXHLj=M=@XWH4}8{D`kNB
z#WVY~qC;PL0wVEVg!eWkbbANz?Z?0S`-v`nsT55W>f-pJFgDiZR$yBQ*xePv+@gsW
zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`#
zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w
zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3<YO7VtUJ`-oOPvAE)7Pur>vV1g
zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l
z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+
z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4
zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-Q<!F|6&+kap3x2Vu?nW~{s}{g!6S
zDY|Jh-$wd`5JCtcgpjQZ{Q;`t^an^ne}D$)51>DQ{s8&|=ntSjfc^kq_300g9R&RW
z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1M<qWT#i00000NkvXXu0mjf
D+wWaa

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/floating_face.png b/Resources/Textures/Mobs/Silicon/output.rsi/floating_face.png
deleted file mode 100644
index 05de742794341c5e5489daa52bef423933d51512..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007*Nkl<Zc%1E;
zPiPZC7{y;|6^w$`BnUl<(c;D8MPeg8iTICzv^P;HN)3pfgiudCSb7x#H7G^JV-Z9&
zgm@`-Q+jBL7l}>lu~bT`J!B6mjtAY%u7W$0>~vFnzti%~?7m^<o7pef2M|IC`F{zi
z-jK{1!mH2B%|7Ml2BqJrD&Ch!cz4ViLdPWN(3c)$GHZxaXHLj=M=@XWH4}8{D`kNB
z#WVY~qC;PL0wVEVg!eWkbbANz?Z?0S`-v`nsT55W>f-pJFgDiZR$yBQ*xePv+@gsW
zr+2ly4Rq>DXTaQ|2>|#w^V*ILTph5lryft)*9Vekfi>AD2dm%V)ge`=3jjEFFbn`#
zt<2-io%2|&%%hku0r+*`IOER#*8R<*Ti-K1Q-!*)9%hL};=Q&&F<*jpIxj4ls8!2w
zp4JOXt!)F{`kq^$RxQJfHr~C~d)Rp*Th~3&oj^3<YO7VtUJ`-oOPvAE)7Pur>vV1g
zo%&L#namoZ|7Z`shr3+y$?*{!?!SN!(=RcU8FRIDnx8TKuHs8Eq*GsdaChI<1OV*l
z-sg%xyZ-=}Zr^alzOJkT0PdZP_*Mz((pM^lrRwnC7_+m!m%=*ql}h11_hK<$!p5f+
z?AhN9l{&pybm%LskaHEDKgr?9xyyFj`&UnK@yaj&|5v|V^Z@{|bWV&e3o*JZL~Jl4
zVuKkGzctZ_rE^+;G5M|E)GWo)IWctY`d{(MM-Q<!F|6&+kap3x2Vu?nW~{s}{g!6S
zDY|Jh-$wd`5JCtcgpjQZ{Q;`t^an^ne}D$)51>DQ{s8&|=ntSjfc^kq_300g9R&RW
z^as!%5cv1`p!EUJA7BrH{s8&|g8x1rv_2t(kgd*7uk1M<qWT#i00000NkvXXu0mjf
D+wWaa

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/horror-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/horror-unshaded.png
deleted file mode 100644
index 10efd5ee1dbc3a2dc73ab315c035373f285779ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1777
zcma*oeK^y58vyX}NGNT`4oA-9r6eh#E;O;FiHRw%m7(UPL)M}uMq4HwDla9mCQ?bv
z#lgciZ$Ej7jJ6XUFO%inVl?K#m_0ks^ZfBVe?8}q`@a9Uzt{D>zW4S0TzA@8jEkm*
zo(2d6(nPzWycG4$pP{Cz$Zd|7IUtZK3ynJI6PGV~4xE8`=yn1Lr@7t>yyQT1PU|>z
zAobEdGnAUm;<i3Dw=SYh(gxUz-|oj6zx!hqx^$NR`q9mEYC0O|N3Cw-Ny5ekl_6%{
zb3SdT$slNH)OC|=h`LgE+wsPCJNp_c7^!A-7vl7PQx>3C$yz{+IxY(VI(dot%71_g
zp1duln7_0Fyo)3O-x;={eZtnB>9LE)4n7I(i*PPKS`*KD>QS=8mbOzSTQTi<$1QdV
zU@xVCLFtUScO+4w1w6@nyWRE1@f|Ee9SCNJb1w<9FT9Ek1S=ye62~bP4#U=nL$X+z
zYler<YY4>mDBRLZe19&%`)7M?t7of9w$_@JYs#5SdHP4NMW{0dKkw5xUXM_mI>$Kf
z?<md=foe-dQhF<Py*(F78#;mI9Lm)IS>|`Y-$zIxdyLXASe)!GcEO~Q8_2F>vn{SB
zZ%+u^4Ye3@Ct92;`|w0R*wFm<^3zh$I-RR|{JMBy1xv({L{~&3Vno#Tv@%|F^4$lz
zlqFbja1K?>Vjaxy$klcGvifDQGax8h1~n`oM($I*pc^&n2WmlwSvFQj?%PooIc3&b
z1|4Y6+hdCJAA4<maUqsR_zb+j+gP7ckL&2rrRC+-tN#!}%J;{j!Vg?dOvTKcmmXek
zdmbJmESy%kIgCe+hlK8;d4DPTM7g>dIrSkdT)WMjVWq8tkI<q+i0+k_Xf8mwpRwZd
zs>$1iiyV5J2DMIQs(W#7_TwttA%l&lWk)5eZ3giPKiWQ;{FEGy4Ovw~YWFQ?ryOxX
z{6p#M*nHgB+641<i*rnb&gFTU!Rozl;XFA-3MCP{Oq}%XiFX<WgT4a0G!{vuwK7~B
zeZ&yAd=ESAQ+RILK1#Z=n7K2y2FuPXD2&>Ad@}J%uWGUHH7R~QS-T}MiMM_l*%)@e
zxh#s3nX#$<LQoKFM4I-AASR|knIDZ{VxE8^cW_u&z7zbe_-`T0XSbatqDDH7f;KKs
zxfKnB_Zcxf;QgDD014;56}Nc*@Qp}M!Ebq=cl#$r&jiJziUb9~?vaHKWaZ4DpKI<J
zAPm^se4Gd;py23hq)}hSQ*yx8-8h|_4eZ%4oCvoICdF?gyvYp{dO87t2=?4t?O$H$
z37K<D^EYz8HFcv~I(!aTG0nfi<zJ$*0y6xuna2=s<O^#b1Q|hr)eX)i?|&urEczUf
z>1=+}9J*Qm!shrcb(5Eb=R=#WmjCubZ^GCAx0vem_=#_%-xM+)V7~S%?Sd)3`~v-O
zDgf7)-I!V#UdJlh5D1>rd#@vt$u;I$N;l?QVxnFeryvKrN6af0J@E4?z4s<IcyF7o
z5?g^3L~WJ#BRuDG<i{M(&B;Mj3b|qHjitiN6e`>XJYdZ!R=$&0;UgN(77k1{(Wbm=
z9O@-q>c0~Pz-BOg-BOjD8M=DwANwO8K*hjcVbT-3|611dA0|8tCgvDkmV18kPpMhc
zI#s&SydjI@m{(Ag+iNiCuLTvsv@X5|$gcF^A6e%aWjQ5k3=9^kP>>p!lHL6an|~7U
zl~e16x^|l2p6#x`xEjg+50Zxwlu;q<3}8ZG^*s@FuF%7%m{}`pm%%Np=&7^(u$Yl!
znoINDSy}$xCu@`u6y?-!)kF>3BYSosO~PO4G_Jqc{l7rmV>=to6g~vb0#;)omc)B_
zb$*Z1TO5g8{e5b-(-CwcU;hY<vRMaaxmxrZKXh0ojPkO!$Wo}-;Yx4DlX#$t(HyN6
zy)ta_t@g}B5VCz*ligG5_^RjDpk!5GuzNn79b@Hy7}_*RUaO~Tx-mv1{H5*Y$dcw-
zakd^NEF{Rc4sdbVQsEJ}l@Ny;Wq*e^x2FZnKr-TH7Xf)eL84Mi<=4kU=UEyr^p3%s
z<5Vvp%CTmW;V5`$E&A7Ih2#h13s%$YepCWRB>Y*Y20n4na$&?g^MHiEY@5t)(w$v_
z@il}oLgxIfcH0unOuDP-2M=yT<mXQWP9cO#y=MDUlY4n!Ptqv>PvJ_c56RH8%sJCr
x`nAe<pS=nSu^keD2Eu6aBQ9aRNbVWB4$ci(+y>Qgj#8{L5ZW1os&KkQ{U=i>h9Up}

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/horror.png b/Resources/Textures/Mobs/Silicon/output.rsi/horror.png
deleted file mode 100644
index 0a807c0c2354086be2730017fb4e4a7eb95afdd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1404
zcmai!e>l?#9LK-y80+ka9x^|+GHuC2$u(+>{AxWyQPEag57H$jg}M8NSy$w)iI6qX
zg}VH_{8)>=l>8>)<T|I>a7N9{!WMF?r@QO^>Hhe9KF{;|<NbbrK7V{t{d~NTt5K@~
z06>y=yYE-er1zx_SNA68W1Rq?=|*;U4Pf%5yoPX-Fw>TN|2@_oBkM7)H?M2yPU+bf
zG7%R>3{9hURO7Fv*!1bma7m9=SdHv^18c9xY8O3yrr&n(?)pr#wsrWc0hnZu5XS=Q
z#s0~ci<UdXJZyUvM7s6x;;6z&87=!R?yYkYHuQi18ZDPTjBZ{zs}clhTAbr@xq#^P
z;W*Z%SIfTs^*y0>0ZW`7j%AW#!JrI%kdo&K1_G0Fi*Se1lO_F<xy6e{NY5pe;!H0)
zjB%83D2_t~@R#8n8nJ%J=gawq{DhWHt(spm<K;7vbq**ZJZWIqV&Qf7tKt_>?SfV9
zg;Wv^@{fo?F)FCx4d6`CC?SB7*Fs8MQAyh?%60-<hz}!mHm{Pv@HeT##ty=Qd~g|!
zYpq|oG5ftaKv&g8fbs!Pg=)UrD`9AA`U=Gq$ptWw6EymT@TlN993Z8GqBDfA2w7`g
zs0n&a{fTC19iX|FuAi=)S2_Yr=$vBTY5Nm~UhLxnXqy15IkSIE*Pwt8kMUp3#rc)X
z?mM@3dCH}7T#gxS;Nb1kORcsMfWx9Rb(MDp!betBU4sDbfXnA3PcpIZK-DiAfYo&0
z^Nqa6b^x6@V-N2fj0|R0qET5D!zK$zE%kr{_iy7y4R-j@FEP^40wguA`_y5G>n4C$
zGjIFy8awCEm9+~YrjmqGnwpK5Z2alGLKfVdj}x9KyZ=t(Xfc43z4U_dVt*!2kM@Xq
zCbx<gO2tDWjzMD=(Kbc&$oYcS;uTDNEhv3CmcmDD<!A;mXQ!7#ZbVV+4VwAQamm1A
zHoN9=XLeE9UW>Hi&3_PxzIp&aG!WXYz--x<%@TJp2$M+Ybolrdnq)mqB5Enia!V9P
z2^HIkMpu;ROc^uxSh>mYRaURg6iU~)-1l-W3)i#eNb3?VP&_m;0h3g-_Qm{I+N3-)
zn|Y_Q?@vRap)e5LwRd-Q@Yz9BcWrerS#ix+=?!)+Ju`2toA9n1z*~A>D+~_%-PGJ7
zNK6^^Li@NkcqOLzshpTvQhsg__f5jLC^wJ-;v|8)qR5vzWWmP^;!DNFe9Lc!_d@4W
zNsI)W1Yd5UHGf-wi_%&l%~oz#=Eu{Do${S^^}C_8jxMHLI=ii%mblcT$W~U3(8OV)
zDrQHFaVjY-D8L94niY@G&*w0VY~KB#JPd0q(n!Z{x@CBi$jz&;Orl!p;wDOnJYL0Y
zR5aAl)UNtGn41kz+Z{0Xd3q?`!I3sD8UtUAw~L3yONdl3N$_6uUm+t>iQ%ok(G;w(
z^xlyh*3kIs@n$^d_(V7YlcVpFfhA`Y>OSAF4qK_HL11%qHngeiQZN&pm}H(UTRR&1
zEMN>5xPWz_v3t5ARL}Kkj;n^F@PR8!8LQUNL({kKrhh8*q~~t)mXE070kEm$l*!r@
z#*16@tvdR@sXpF@oPnKW*J#5LufYgdyXF5z_)ka*0k0>tp~2UT{ga6w>4$-isMmO+
zbq%Su`D8hH)yWUe?@@`3ONZ4ETvJS$#|P@LHDaM`AbQiPwmA}N&)09tCn7b~UlkyG
L__&wvq9^|aHQlu+

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json b/Resources/Textures/Mobs/Silicon/output.rsi/meta.json
deleted file mode 100644
index 35de328fe0..0000000000
--- a/Resources/Textures/Mobs/Silicon/output.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/2a19963297f91efb452dbb5c1d4eb28a14776b0a/icons/mob/silicon/ai.dmi", "states": [{"name": "ai", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai-banned", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned-unshaded", "directions": 1, "delays": [[0.7, 0.7, 0.7, 0.7, 0.7, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7, 0.7]]}, {"name": "ai-banned_dead", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-banned_dead-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-empty-unshaded", "directions": 1, "delays": [[0.7, 0.7]]}, {"name": "ai-holo-old", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-holo-old-unshaded", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "ai-unshaded", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.1, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.1]]}, {"name": "ai_dead", "directions": 1, "delays": [[1.0]]}, {"name": "ai_dead-unshaded", "directions": 1, "delays": [[1.0]]}, {"name": "default", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "default-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "floating_face-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "horror", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "horror-unshaded", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "xeno_queen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "xeno_queen-unshaded", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png b/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen-unshaded.png
deleted file mode 100644
index 3ea194039f4fee0b41d8c2f4b5f602592936f88f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2484
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

diff --git a/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen.png b/Resources/Textures/Mobs/Silicon/output.rsi/xeno_queen.png
deleted file mode 100644
index 3ea194039f4fee0b41d8c2f4b5f602592936f88f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2484
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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/icon.png
deleted file mode 100644
index 9ae3ed95994f790c8f6a78a156237ad4fbb49ede..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 842
zcmV-Q1GW5#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009KNkl<Zc$~$S
z&u`mg9ETs<acVo6<0Ng;s;o^4N;M>g*a3>f9j+h^O+s8aaRO;$2ZVqLu_1mOkhmZY
zNL)B_;)DR@fSAPSD235QrAkSgR%?EcHfbE!er*o?1%9)o@7<3ceZHUf>sP5(tDNRZ
zjPvnpZ@(Fp7nb;^+2qq}*OZA1h(nL{-`6=ga-|vSI06rq&T{GEMXXHfbOc)6HjS-1
zVNxD5)(Cv>gkNv1;*aD<FqVK>&~fuUGMarl0?IkT`!9XWPisF&Gsfybx_E~9LWv8N
z6)t~uHJYfv2jAR?rY(m^2nyM0oTZEuN0HrxU*7#9a%>wN3ojgS*dNf`*yo)W-i@`8
zVt3$;&)<q{dx}S%ULa*yBojKCXQH4mSd4!gq(+c0Wr>J5=(X8x?{hTlGxUZ`nHp=G
zYq7c@bqfx5S|qY6pFLTj*B#*G(p<S+hfpQw6l1ZZ1Pb#76jZL<u45(*-0c=&7@{c}
zl}F2rTB8RmkWD*ystZI6z5nO#i-14~L?~jhqy&ojIbJT02>p<Zh&YY}TYZm@Zfz2X
zAQnrigvE4$oj>-lEekzsB1A-GW`=`12Sic4eI%8DnY7sYv(BBL|6*<-kD{q)X@l9v
z=VG&@63~nUY8Y|ud<FM;o$4zMgb*0k)MNxwNsH2BXBobCiQm#~>ctM;Fksq`|0<Ib
z2t>g2)G|?^@a&7PbG7;$PBDXL=#vp}{Slp;Ho0edD6UT9y9T4qfPgSIOR9uw5Yk%s
zk<7AAu9(4zN^Gp}0`dRIQUX4L+58!7LuY669*UwMe4nJAn~cD2dyn&rGn8j-mY-N;
z=tcC00bhT+8k;56fz7=dzM|51Lw4@D1cBhlOOUeDtZu}UkV>G|{F@I&2V2Xd1S+PL
z!g5jw+mFqXO5o5P(Cl`=P%$zFu71q%sE2!eLT$SiizSu7ygtjx(4%&98&yOkH66uN
zF^fr-mLHDAik-kGuU=O!I4k`7i%+<(p^h>HJ(KQTkH+_1R?1JsT8Gk)())G(1Hd#Z
U@j1_mp#T5?07*qoM6N<$f&<ixtpET3

diff --git a/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/(mdr)grapejuice.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/icon.png
deleted file mode 100644
index f47d9dcd9b988087953acba65ec1e8cf19df5392..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ=bkQ(Ar*6yZ3-SR9Clz@#<;ci
z3gcoviP8fJ1q|Glv&w3oSG4)wY5v?Ua#nW3)2sK>?WT3j-*8HH|EDwVJu_9@C%j=0
zi_2r<X3YCK>#h3y<jKhiKOAROF0o=@+wimGcsbjeK<7~QKR>^?O=@gxJQ!E|yS`+n
zZhMZTghi!?QU8;e5AuhjG%9K(x68;ml!+MZ*>~oE!iv)eKKwJf>1JRM5X5&tNBoMc
z0{b3$-o}GMOd?F1iWq<YHR#e^c7l;-(UhasMhPm*BlrD0D!#_GZ#@gY^2)S{qD)UB
iTDW;Cno}U2VPN=~Y+H9Mh<zK-%M6~belF{r5}E)~4RQeh

diff --git a/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/banana.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/icon.png
deleted file mode 100644
index fd7a3b98db19db72992460bf0189db05db92e9f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002}Nkl<Zc%1E(
zF^YyT5QU$*Q;HC51P|f;D=%P~8(0P*jm<0EDnH4pWPV(*$y8zTlJ_w)A=Nz3cr)r(
z-3vegC;$bZ02BZKKUyKlL#q{$>fZo@@i>l2zHQrJhPtlNG|gvkS(ZZ!k_8xs0mc|u
zYje`%3;;OivRZWurfGtRB)P8ZZuQn$kUVl#P!AzV?E4OqpPcvpQXBFjQsrjn>sLVX
z1QCPWLES~R1<tt&z+sF@AOIvS@!o?ZL<H-)hI7vW?jnYWEAnTZodFfVRTY9+YzP3`
zwyDk405OD8cX~080piR1zCVFzd;SREso7P${uvd30`NM(FNoB9nmYKuaR2}S07*qo
IM6N<$g4!j4761SM

diff --git a/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/bigteacup.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/icon.png
deleted file mode 100644
index b4908472cbe7ee9ff2055d200d8586cd3f2f8a37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004NNkl<Zc%1Fl
zu}cC`9KiAKWjUNEIVIvDW#AS?Qzl5b9SPB5Q=3y`Ah^3WI4I8k0Zrz1pvz6dfe;wv
zASdA<35pIbuOX5^2;Wh;+;4lo$GhK$_kNFeO0(Hyld-kY>Mp<qxBwRbY&%(`siyco
zw&w}u-vF9wis0@Z-oPOMi^(fs3a1FEBhXY+_&l?fyw5XR*_A&5+!P`|&S|PCWFb<3
zY`;h*A79C5@^P~LBKAC?*z<&P6z;8!kOIVN4GgVCYm}mz%u!9|XpK@BT8mh%A@iwa
zNHt;o;+W{$kgJBl^z;k>fA1OVp+r3#qSSv90PSvU?S_;BbdnY9{R5(b06XXB0K6CO
zvF|2yk`>xrA$=1RnLnbjHzK0(5GM_TY5frZ|K&B7o~HjYB)Awz1EhK&xELtqa0p9J
zFLRcjrW_7ADh`r6@D*ckMD%WT;IlEE7IzHz&Di*3<N{oP3vdA&2Ydh(l5w0Su6`W=
O0000<MNUMnLSTZTa<t?C

diff --git a/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/britmug.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/icon.png
deleted file mode 100644
index b85ec1edad89a663e810e9f14f2282d769f84011..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3Qrfukcv5Pr<~+uP~>qnExpk_
zZJyJz>1TXX5>6~qICWlg#@mVVXU@zilggdT2h;!oeM~FXc09i;wLHHmY{5+N6RHQZ
zZtyKI?c>{YV%rxE<#MNb&#29Y@7BuJmNH-a>YlP@t;e)4KJu4(=6)7rWMH_?w1?rj
U@#*NmY;}-%p00i_>zopr05d~CT>t<8

diff --git a/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/broken.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/icon.png
deleted file mode 100644
index ee430d95ad6b8fa99578846ba1867502c3711c37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmV<O01f|%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002FNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dAF=?I&MhlVf1`L7I7_IsgW=yPPG_#cnpAcuuN01D*&+9WeA9
z;KBJrs%HDiSCRX_{6!YOTDJE&Ipx663xPr7faQ)n%meBGYJmZF09i#b3okcDu?sPX
sw0eMS2auE9aDf4jf>8&II$+cR0H7HvBmY^s5dZ)H07*qoM6N<$g4~2(n*aa+

diff --git a/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/brownstar.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-1.png
deleted file mode 100644
index a8e5eb8580618804f46f5db75fbea6381dc690f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 170
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GKAtX)Ar-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIegj0@-<X
zFh^)y)H!&XfBotBntvxe`XqZ6zikX;@3Bg_!U$8lhnazihoL>3%lhAD#|=Pp89ZJ6
KT-G@yGywpftv7oB

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-2.png
deleted file mode 100644
index 35d8cfd1eeb2f79eeb50779d42b9ebe002345077..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GUY;(FAr-fh{`~)Mf7pTPSRi|kRl*g<#e5Q_2Uak*tzlNF
z_-Sae@5i5s6W1v=yx}O)k@sbW%DTxKylMbxU|?Zj;$e8ZG5ui8RJPqfQyDy6{an^L
HB{Ts5Ycw|T

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-3.png
deleted file mode 100644
index 511d7cec1de0a73fae49f0fb45443db8e2b71aa3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G>7Fi*Ar-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIegj7|R*B
zEoZ4z{5)tnV>zGp;cwdeADVFN`SEAsM3K!BC)e^O_BpUEiSi2+SrF~k_f(|yK!zSd
kcOZL@Rl*Gm289C*GC49AS#08G0j*^4boFyt=akR{0Fg{W%K!iX

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-4.png
deleted file mode 100644
index 93191f93733fff47977a82b2b06b5827ed97a609..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GrJgR1Ar-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIegh#DYv!
zqPhgu*gTW3KkTulvgb*No6w#=3BL2J*6`e3|EKM;!iPtn-Q9xDB&lpSYq4aKoRDSd
zn#pk2s7PnI28-L~hY*7r0@-`460R^FKE}wv$j0y>Q~7L!-9Z(g0~kDA{an^LB{Ts5
DtP)8H

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-5.png
deleted file mode 100644
index 6be0c6a865126a8b71e3ae097b5bf29580b3fc68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G-JULvAr-fh{`~)Mf7pRZt&NdwF`q=~ffdYdvIY<M5)@qv
z7cJ%3b4N^AFty_AGgCHR=Fk266IG7+xCOmtN^yU{bR^1e8nc5#({%YYCxhFkCjOp!
zzd(v5uIAqfkFLm`C)e5x+!dIEbeC%gE{b;Rdn(d;Aj8t&RYM?qk5$4IMzCcY3K<+4
a7#Y6h8lU{vWgiT57K5j&pUXO@geCxiDN|Me

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/fill-6.png
deleted file mode 100644
index 4ac3030821af4f246a439da74ccf7b2cfc19ce5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GGdx`!Ln>}1{rUgj{;&g+S{ozVVm^t|11p%_WDhv4IaCzy
zJE{B3xwF?LIaemCEY<MaBGRZWCM=j*@%5Q08!z+c{{4w6$9&v^UNfb*KVUi%<u{Gl
z!J%oo{F;-&?NbwfPrY9t#S&NZ?}SHJWY3dpZ3gZN%t5-#HN+Q0yY)R4X+4nPX!5Ed
okiEw$;R++z<_(1m4h@V9XUeROa+=*a1au>Vr>mdKI;Vst0HO6+qyPW_

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon.png
deleted file mode 100644
index 7f3b2acd462f311e9103d67837fb0bffdc358fa6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmV-E0m1%>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy;7LS5RCwBA{Qv(y!$1Nih5-hn4j6U7
zfIEPN7)3>kw~(Dz`(k|<@yRn1DhEo}?)`5rEl9QxkKKNT*AYa8z{#iY8UB9zPLn8L
zB&H+;g#y!p9Fh(H9o9{G6d*g|O;0$SFD4?&@aoNL3>pRmvlbAvoFoTea|A9xtmR+;
zasVl~WX+!c;yip{oM0i0LW6MOqRszFF^^;ipgRH?lWIBH4#4IJax4d7MoQWPurh*B
zUZ-jrz!nme=pU_&MjbHf0J6#fQ2s~eBUja=mIsWZ9g|T9j5=VT9RLtu0Jt=_^agG~
QLjV8(07*qoM6N<$g6yz(FaQ7m

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/icon_empty.png
deleted file mode 100644
index 10848c62277d803346caedfe28963bb56ea998ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Ghdf;zLn>}1{rUgj{;&g+S{ozVVm^t|0}a*<trD)T-P<S3
z4gZ}~EAjE9v5*$K*Y$UQ^YwH+w(<Aht!uk3=+b)N<ns5D|LT7GP1Z<IS*F6$%Jl#8
zYZd8#egTaMA_7x6b~n$JwD-ymx?41<h*7go;abt8&5DM73P+1Jonox%Q@C2RiCZbB
zPvLmcqGHB{Moj^6$GIK&7O+fTbMy0jp}&i#UR=TKChHJp$#ClbiJB*?W?lKzP`D-8
k=v6}?JI@wo1|}Ycqqgg&HHhqA0Q3!mr>mdKI;Vst09i$FdH?_b

diff --git a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json b/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json
deleted file mode 100644
index d967d4582e..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/espressomartini/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "version": 1,
-    "size":
-    {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by RedBookcase on Github.",
-    "states":
-    [
-        {
-            "name": "icon"
-        },
-        {
-            "name": "icon_empty"
-        },
-        {
-            "name": "fill-1"
-        },
-        {
-            "name": "fill-2"
-        },
-        {
-            "name": "fill-3"
-        },
-        {
-            "name": "fill-4"
-        },
-        {
-            "name": "fill-5"
-        },
-        {
-            "name": "fill-6"
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/icon.png
deleted file mode 100644
index 5d354b572ce59aeffabfce07fff9aa59522accd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002oNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dAF=?I&MhlVf1`L7I7_IsgWIEOn~T#dch|-$trABs<{Gr#F%e
z3=DsF_2kdTkh6+mVBqATtpoo5htOYtp^7syGB7azC)G3xqJWW+T%D+3z{`PA2aGy^
zEC*DSr!Z5?0c2%EHW@9f;(zJk0AC3n#?1^ySc@EA2_BM52eLwd9E)&)p_vFr9Wd&E
bVdVe-%d{%NFm%!w00000NkvXXu0mjf`jl_B

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_brown.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/icon.png
deleted file mode 100644
index a872c3b66436113ca43af32fa95b4dc14549a7db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 261
zcmV+g0s8)lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002YNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dAF=?I&MhlVf1`L7I7_IsgWIEOn~T#dch|-$trAWII4?Psv0^
zbU}&iuXJ+&7gXneat)x=0c^|^+6)B)UJi^pVAKI*IpEH!%&(MYKNuh@8@?9MX8yzs
z$%_9O7#RLh;2M%0;KBJrY6pYEz}1H2T7(M>%|tlrfKdkwD+d4o7UwH{^v?wU00000
LNkvXXu0mjfz-VWa

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_orange.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/icon.png
deleted file mode 100644
index 4a7c4795ddd20ba67976a70c864d0aebd40e9f04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8=fwXAr*6yZ3-SR9Clz@#<;ci
z3gcoviP8fJ1q|Glv&w3oSG4)wY5v?Ua#nW3)2sK>?WT3j-*8HH|EDwVJu_9@C%j=0
zi_2@%J-+_K!%4{rKOAROF0pE8Y-~JuJZL%B>>qvF-*0=EcI&Vggk16abN;}A5Az?|
zAFfa7obhCRNg;zUGc&U?5CcgYX~Rj$0z3I0C|owmNjPx2F_3-2(}sE;o)s(S-{bq?
zs(Sil*@1etPn%_}6tt!H1z$->TRe$b;$-GD{)}9Yb*?)OTsYGPcKU`Q1_r4=+Iojq
S3mOCc$l&Sf=d#Wzp$Py3v2S+(

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_red.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/icon.png
deleted file mode 100644
index 88ae2d7b9dfa6c329e54c495dcf62e518d433427..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVAr*6yZ3-SR9Clz@#<;ci
z3gcoviP8fJ1q|Glv&w3oSG4)wY5v?Ua#nW3)2sK>?WT3j-*8HH|EDwVJu_9@C%j=0
zi_2@%J-+_K!%4{rKOAROF0pE8Y-~JuJZL%B>>qvF-*0=EcBilxY^)Oxdlnzs7whLf
zqp@+~Hok_8iD?J6ys!^>r@vOVAxH6P!hzF`f$Tk22?t~y!pv$uIrm8K=6M-8Ifebk
x#y_d|Yde3c>sijSZiwkFXk_$f20L>FGefA4nzch%Yz)vl44$rjF6*2UngD#zX2$>k

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/glass_yellow.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon.png
deleted file mode 100644
index 6b247b3fc7d0693a82cf09a4efe45c19d731f28d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003rNkl<Zc%1E)
z!EM4Y6o$W4JtEG;Iin1a1<U{p;0^!-bbyKhIsgn%2FL(?3wVIQ8N(TIPY+cPO}Y31
z;^JS5Ed5gae}1-}orws~)XP)T6F>q;0Klu}ClP7;p0zg9%oSY$5oxWp7-QJ)_ZVZa
z)?S6WJ3to>;Jv4+D!lgqYKW*U2z8Di7-MkGv0krn&av5S2q6&a9P9%DItZqL5CVCg
z)7>SZ&SR(20gMJ?LVevooVJe#D9Rx;<E#F`N9XJMKv51^$b_OCo<FUkE3j*hEM&rJ
z?wKvCv;SegRRHQvI9pb%=D#)XMvYXR@G|h0a5Vt%r~IJb0u{hz`EQl#4D?sKYmRDw
zEcR9W_1?6j!T&yRIBj|RETeD4Xn+o)?`gu-0Qc0>UqlHY0VIGQWfgCOx5(#!00000
LNkvXXu0mjfR`8!u

diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png
deleted file mode 100644
index 58a6f2157621e53c398a386d9100cca4be13cadd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**8>L*RBSs@x@zys2RE)?
zICSmEw!eQqn(;AMh%p>|{L)Q|!BUK2j+(C`P(5QwkY6x^!?PP{Ku)Tsi(`n!#N-5t
zq=vwN00CErn>VkxFh)9fczSv=L^|kPxhm?~A5rPrs<KIFqo}NClkh}VtFSc!4uTQ)
z?lx*|s0tPDYH<1fj!(o`WtUah8JBIYs}?V2J}Ud@>C>kgdPhIpX<%lU^j7Rj>3Qi0
PpoI*cu6{1-oD!M<e}qqb

diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
deleted file mode 100644
index 2bfce91938..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/icon.png
deleted file mode 100644
index 5243be65e8050739e341b3de1d2ebff7bc3ef147..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003XNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dDo0?I)jOlVf1`L7I7_IsgW+`E<v32CPwo50IP)|9pBQ$-uzC
zU~gai|A~yje`FdaM^gv<|BqltD?2kRy}Orzfq{Wx>D|33a>N3%qX1@cw6Ze;1H)Mc
z1_lO(^Jlh@Y!2Dw0K{ULV?K~;3?&88S(GRs7mytV3=C;-M^FMN2!UBpM=&7Kbag-)
z0|P@kl%0-GA@v==&a;$(fx#HcJ4?3Z3=Cwa0a)<QL=z(&Fp|?O-~8eW)*{DOf`^e*
rv&aeoaxB6H2E0Ks>VQ!Pj5+`STM0~)9u!P(00000NkvXXu0mjf+SG>d

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonade.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/icon.png
deleted file mode 100644
index b5b0600ca911ad741eedea31ba1a0d188422fdf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002xNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dDo0?I)jOlVf1`L7I7_IsgW+`E<v32CPv-RR{d}^hT0_fq}u^
zzW6`7+?G|13=Et+B$-EYF8GgOEexE+BS%FCAX~`5U<{?tl5GkF4oG8QV3-A^$p;iT
z0A~5DfpWlT2vBZ00|S`_5jziQd7bJGfMh@F07i0}<(pr8!CK__O7Jj}Y8F``K#oPY
kz<@VMMjbHffKdkk09V2@J3doo9smFU07*qoM6N<$f(lA+u>b%7

diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/lemonglass.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/icon.png
deleted file mode 100644
index bff4d230562ef596ed1bd82e2c766f7f2f8e3ef6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 282
zcmV+#0p<RQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002tNkl<Zc${NA
zaNq#LKmw)#wSCk9qYfB#z+i9y3ptv0eCK$EP27X?hZM~nu;ta?XFisSpRmduzw*pS
zjF}`ykn8{!UTy{p0dDo0?I)jOlVf1`L7I7_IsgW+`E<v32CPv-RR{d}^hT0_fq}u^
z!Qnr;+?JJF7#KKtNHUM)T<{;mS{N|KBS%FCAX|u_jqxd@l>^Q~Ej~-W5tKOqW;yx3
zr_ceTAwaq1WIKSJ*PbetGcb@{5>giL$bgZYX8Gn9U$7QAz7jl)q?$!m2#{kDE->H?
gl2HeYI$+cR0L<nwpM{D7K>z>%07*qoM6N<$f@FtsBLDyZ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/watermelon.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/icon.png
deleted file mode 100644
index d6688300ab668e6f5e5707567117a22d18010f72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006kNkl<Zc%1E)
zKWGzS7{;IHyNmX)MM1DOPJ%j#P=km#+?v5r1>r!P0;biW6#w9mtx!otNww0!!Gd4~
zmkymIS=7Ngltyq8DqN}*T0}}nbN4!&ca637zDP@!d*Qf`@6Yr6?*0DU$8x!hPKN5J
zdjgOEBmfBj05h(GZ4bF&xl$>ncN$>Z3~ZP`{R?KNA~pkoc`ka-eD|~<E*vtnvb80E
zZFje1CWqnaQQW_j3xv;|3>&runR&P1>Oe5=Z)n>??(p<zUrSXjP80ylo_)w#^;m$|
zDX3J6X|t!x9m$?`D__4&f)t2PfDqp!08l9r0Hl&|-0Z@af(~eV+mMvcOKZ7LtGo$P
zXqY|?(+8EbnztpXb0L|(axLvnKA+E@??3pux(GuFM2P%e2LSMRWkNiwn}byc$N+b1
z4^~c;uJ<0jQ(BMH*4PEWsTa>&cg<*~mKXiOsuN@_6SS4;Q}Fk95da?bzru~Vi@*`X
z^L}`qj<yy60DzFlc<%QDU?AfJ<;+G`F;w%|$P-^jwv9DF>3!p<Kg>dyFrqeUuLo^_
ztW{6nIy|--Rs6&J_R_;;o$c2)007WTHKMN%%{OI(%FvqoF!a{|04n88yuI2mDW;Y3
zSzjmBd&(Z8NqnIEY#3Ve{@(yutDc@cex?Qyg=RBFQoxAL7b@?-*gzld6}2_B&VjAs
zWg*YYg>eCZkK+zc=cjh>All97_>Cw5NC18T&bGI$Rc%KW00000NkvXXu0mjf@ZTM^

diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
deleted file mode 100644
index c3f85c4ad4..0000000000
--- a/Resources/Textures/Objects/Consumable/Drinks/whiskeysodaglass2.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png
deleted file mode 100644
index a98c989fb0b6b500febac02f1a6cc3926239f78f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2891
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
Sc@LhBA@)a{Y^!X1Zu}ehe{f0w

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png
deleted file mode 100644
index 963bc5c7082620077b0766c98e498e8aaabc1a7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3658
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
DA0KMl

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
deleted file mode 100644
index 770733e75a..0000000000
--- a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "unlit-equipped-MASK",
-      "directions": 4
-    },
-    {
-      "name": "lit-equipped-MASK",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "unlit-icon"
-    },
-    {
-      "name": "lit-icon",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png
deleted file mode 100644
index 9f38c2ad6783e88dd45ec2c0bf0312c45dff1ef0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 626
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6yadaSW-L^LCb@_hAQ#w*4z6
zD|9t$a5N=cx6*i(R9d+0{{i_2FV;A|eD>g#(l73kf}#ss6tv1VWOFxN^%N9!ZReS|
z-E?VJjNTW$@>}m49cDl2`(CZTmwWGYiMB)_x+Ur!vi*7G{(1H{?(<ju{&k`>HnCc|
zKxX5Sz8zABAH~m`pSwP`D}v2LeE*EIQTD%#JfuI!ceBSX>fZOBeP>MHvCEmiw2waj
z{PS4)i~d>9Tl^Wi>}P&`u_|QI>D%A!%|Bg`Z@s|K^QR`UZ<o7zX2OR3o2pB~j!m5K
zZ`#Djr7dg;M-mTxdzQ7d>br-9S=h9f&rCO5Yxz3&aKtSob;lV2`_^5$cP;Ae?~j=q
zSu1~WmY!1jtMui|!|CeFmT{()?6X}`pf~wsL@t}>9uCg+Y>o?}{2yu53;)UAz$lhs
zz$Kl~$hMdiCdYTS$B%a932d#G_!?gI`QAPMk|#n_>=-rVm=r@&_b)M=zTgT&&mKPE
zlDxCp^O-|tFR-4zAXO+N)k$a}Pwwgi{=x>1b*y4759IF54pDM_ZN%}ABTONoaY3t3
zg5t}7wo9oSW*T@jCLFc(?K>;}s<B(+)k2<MVy7G?FKwMUg>P=uJO&mGfh8Qyq8t$m
z3}#;Rv6`~*t-1i4ra*+lGKF)C=cH&jcQY#6`ejvQEC_S>_-K#diVo&m3v_=u#J>n`
j4+F<2C{hKKez7c^t-RUk+LeRAw8Y@)>gTe~DWM4fv4a#O

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png
deleted file mode 100644
index 305151c79ddaa7ced5c47e721fe9ac956131345d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmV+q1MvKbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80008kNkl<ZScUDC
zUr19?9LK+RDvi(*#Fx-Un4>2P9P|%i3rtcU3X~dzGg0dym$9O-OqV2xK1ASyK4{Gc
zBPb(=4^CtwmNq8R=xM75@3snuVdcYgjvMFTy|{7jyyM<C{lejFzx~cW-~0QWb1wF^
zuRSkDtN<Lx$*zmX;}MNFH8s&cF&GT6TCI%HXcW!MRnmb>@PUB=n9XLeEK5S1)Wd3&
z7{~<wys#j|{C>Y=zM>YSS70anaA6_-tgV3!hp7RUW!0^K9C#!erErJCAqrPyKn~pJ
z^JRof8j#vtV!tba6J>P@<d$77T($wRil_l6%D4v@hT%*m6K6CUQ;vmN@LdgXPk{b1
zH^?o<n@|%jX@J6d7;d)8g_+V`Azo>*aP=)6aDDlv3S80v(R>u}dcAPF-6`>SJPwUU
zgYZT!e&-b`f)j}@Oz$}{@lU72-1sE&E}TorJ?M7Jf=j)OL>Cj_P7~7rs&qPhTwaF5
z+J)HaI*N<(q0KJ{@j1;G&+5tia%Mirf0koFvITm*9-o%J(m~+$XKLx(*?JvYTM4YJ
zZHCy$D){kq%o!}Js0{KZcB=?4(R-l1y`8h!Y|v^CAel_k*iiQ!pl%vnLt`PWR$HFf
zuFtFIJ#=QHzhLRK<7i2dTz2LPxLhvWz14~nbv3wTsKM~W8yatGtSR4_N1$ZHH#W0|
zXEYE91Yoz@8Q<IK5Tntc?b;O@cg}gx+)yjz5oq82o0xd_L1;%d5^cfg=%}zcbJk<}
zj+U!j#pQYg-aC=^dJ4ynl~Qn<xq&`;_uxp%da+HIbp?2l{V+Q<NxwbpA4c{0(|9~M
zg1&pVDg4=saUs{zScmG9CCV$1F8(s=eb7OVU4qM@edqPadIOQ4E6^1%dR^rybq(<C
zSOoAl_9J+x_y~=Y-A_yqI1zzoMc$U=MI=Y$+<y-&$^uJWM0;ES{sX1pkDx$fCa?ei
N002ovPDHLkV1oN{b&~)9

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown.png
deleted file mode 100644
index 4afa0b60d22789c5edbae9dcd34c0ff6ac8025e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003{Nkl<Zc%1E)
zv1-Cl6o$W+ilsCLp}U)qtwS_fEP*~ux^(E1bPx)TeUm_!h=U!3+%04-NTanV7Scf?
zl{lCa8<+f3?oZA+A2;_W7b;b%RH=ZJQi)P3DbnLyTIjlNQm@yy&!qyS1A`!7JRTQ<
zIFk%_90y(3F$@C$-}ec_kSK~63<kM+UgQNx6~{5Y?@P;z0eGHAtJT`^q9`g4z#2IW
z@v>gW+xz~}0nDaN<6YnJ+D#(^b%;bM(E1kbYh%0a+9q1xlC+W^LalFcrG5ao?B24N
z$@++PV71CdexLVm0Q0A}gS<l|{si;KA>UsCvvtg}cMnWOeZ>C)fY~}OQZ5J3o_hc^
zYC4VDCXP2RcOrnJrC|C|;vqbyL;#bA*Nk_v6aXx3lar(%)#qd(uFZWRfz74F8aX@O
nu;b;vjEDhJh`(#e@Jax`#F=%Fy~axx00000NkvXXu0mjfV6m*U

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown2.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown2.png
deleted file mode 100644
index 8861fc1b03b48a0cf257318ec165755545f417a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004jNkl<Zc%1E)
zKTE?<6vcm$YBo!$gP_phmZ=IATSe(m#nRDLI=J*pI26$jQ40P;@H^<zF^iN=$t2H7
zP->}*l-kCjO>J??4a6k}0xuWtxrfVn_g#n(Awq-za2&^V9LEj9F(*x|R4T5n>yvY+
z0=$B@ZPRQv1BuWi#q;?*@pv55Gy$+I3#AlFDQdNvFV2`>0Uo;DE|z6U(}M|UG#VI&
zF%wfti3Er|kV@4jE%(0tgStq7r~{b{<hG{^4%yq)d3^BCCA)@4r>v)cy_U<C_*}Ub
zQOQiW5QDWVG%vfb$>Q=7(C|$q>Ok+N`ZxHrDxs2I!y!DEaa&_S8%5@2M6wQO<+Dk8
zyFG`lyHI!)2@nq=%zHitZ=+FKI)u(ZL?h~eds_t{NrEJaQ8085*vGi7@%xi4%4i7e
zfhmOPftTSoJLVnQpg#(fwnFy6#rbTYH~e1@e5Exy?=mLe3ki&t62rIz`Y;|rN}c##
kM#KU<5!3&Y;t>FT0F{}80#^tX=>Px#07*qoM6N<$g7?|Lx&QzG

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown2_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown2_cap.png
deleted file mode 100644
index 3deeba5f5c2d4c664b4564bcd9d4000afef05e83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005lNkl<Zc%1E)
zK}#D^6otPRw9<_rc2Q^-i94yFr53fKn+PhQZrsWs3K{AjC=?e`Y=43>fwWNyBDhjl
zy3ilcE`*3XXSymVDr6JHCbx@8Y+_Yrt~FgWXPCvi+<V@c^X_|ZppH8JcNkSw61g^>
z3eVRNC~I=jpD^>rkVK}(I<8GilNC~!s{Fqq05JI+#AifUAf3qKdM>eO3;@@2ncsiy
z=f!7)d=7co9Edj(DC^3XxSoq;S(jtWvY36gacj-p1OT%7Ht_m}$qkPrQhvU^@LvR(
z-t3SYoAVX~cHq7c+A7<&#Sw?AJ0ZQE#WpsM<AmZ2ybCJvF&g3BdbTRIHXLDlD?FD<
zKzBFnysBKiB7*~sDgnA47@wu9^S9G|y$NzpGAb&S13YMew$GSy_0UV2A3p+iLsO|7
zIA5CkGx+VPhDzxGML4vOy^^5kqcrM>bPgEn{bl*dNra{*fuSEN0ZIpe_7zSGNB%*Q
z7=g2bibmytEYAVZN(-&D_`#a@z`+EvS33H8M|CvZxd$px%O3b%{7HZN7fj*84<veO
z+yfuxs{`l7f7=83PQ%%;j!E_BV%xSvqo05aC>=qbHx>FSRtqSLs2po1uLIy0GozH-
TG;v8z00000NkvXXu0mjf|BUQP

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/clown_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/clown_cap.png
deleted file mode 100644
index 67db91f46998a65201e241efcc44aef1dff00f12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 481
zcmV<70UrK|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004~Nkl<Zc%1E)
zze@sP7{@;s2^DDw{Q<QIl0%TGOA$Cm?JY+ncoj4>wKTRj2*wFUO%XIzGzU$ROK?%!
zxd)QhFU8<(5XE1~-K*7*-{Xeo%kzBS?>+DP+#U4M$A5<+RTW3H<x|e}25n`n9#j@Q
z+E9oiV#|THX=w~W3Z)^xCk6oJ!-D9h5F|-28kjkg$%#n-%$&*I{Zb__x+(au5W^l@
zx&yYdnx4eWnW(B-i&a%+cj}^JO?L(Wak^uBf1TtyM;uYTvNM$%frwoO#J7jD18jHT
zr{K6%nx+X|=rm74`rJTMG<02eq-lE!>T#GoVU3j*E;D=WSWC)4&>P|G?y7<FdHrN?
zZb0e`xD#P~qyAbPiUe^d!ZK2F9jKZZdHe)mC^XHRC8s0Rfl{e;+S+kHX5eM}#ujG>
z(p&JdmEryM0jpe~I2Q%-QaW9|h^%s<n{s&r?)^CcJgzZ3t}y_{lk-vrdNu|5r(ZmT
zy@ZqjWBs^=`?DzkC`N+($rM!aY`jU=O8vQLnkK@x3k_Um_S*5MSlU3<M13r?cpm^?
XO@)yElN)p*00000NkvXXu0mjf!k^V`

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/death.png b/Resources/Textures/Objects/Fun/spraycans.rsi/death.png
deleted file mode 100644
index e114bf564e6a1b5c818f87f16e276b42cc3e25a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 409
zcmV;K0cQS*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004CNkl<Zc%1E)
zF^a-K6o$Vn3nB=1DHIQ2<pom2yF_vuTah%LAa-^Jiv*%6ER9!4C#JATW{V}lt}Zw)
zOKkF0!wmE0gE#*$(9+V<QiC*2Rhp)%PK^)gM%Q&!r_;HQ8x^PyJe^J)kH=aPhU9SD
zw(0l#jK^aD;y7lv+X1j#F12cY>Izg`E*IiBmTs2|tk-MN+Fyw7z;?TRY3>z7E$H=n
z_nuccj>CLD*RCawVYl1;F`i5&qB>%M-vmL>oPbh~k)KYdA^~v>J<p>oO8{Kgm6p-R
zG)<Kxi5iVYYQNvB!C;`0BvG5qMwzCm{Thl|;5ZJx?-Pb0zV9=e%_L>y0sv7IVObVY
z6aiou+OIlL;|{D=D;A3d@EyZv7xNYVErwD=0=L`kVeWdpHYf0m^ZEQ<fy3d@j6jxU
zhHcyAc}`Ij6h%Rv=M0BKvMke%f-E~ce!+BqLM;_v0vm?RUclFi00000NkvXXu0mjf
DGcvJP

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/death2.png b/Resources/Textures/Objects/Fun/spraycans.rsi/death2.png
deleted file mode 100644
index d6d3656ab95f00001065c66d0feaee47c41ec5a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 482
zcmV<80UiE{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800050Nkl<Zc%1E)
zF>BjE6vuyx1ID1D?Z7UcgX!QUqX$EV(hvgv4sw*aQ`d&B@mO#TC0`)c(Bcfm#)Awp
z8mvrKAX_(W2Cvm+FiLQskb4GC`Yn2Q;{NZ?-Mz;_K|w*m4kSsUlO)l*XdFlvdY-4t
z<??g9R|9#%<#NelvDnFkB}v|Hw{aYYMxy~h7=}!zQvmw?zLDmksezo;YDE}^(&cgk
zzVD0v{SVO{7>~zqntKbPBd~4z`OI@%*QM9%8Ec8luu`dP#m#0@q$9qBgTa6-%K-2^
zkI7^rl`=yqrK2d)^?F^;=W|`F)pQg^dNdkorIc|m5FLT*x(tUyf*`>6eY)MQL`H4^
zU^bi4YPAT0K%5)|olq&ItJNx&WwBnbflXEXiDNz}MVh8Yn&KS*`1bfnsZ`=NjybrL
zX^0GbzrWuauYl})j|Mn{pK*--1YaK>;08F|qk+G_fg7;yUgrME^2-doyWV{DIdHX!
zvtN5O@cG9Pjt$oFX6)E-(LWOzFmA<Znp&MsM}PdXz3C?>?~O|k1braq^%KnWB~*~}
Y1R|}Dh|GGkc>n+a07*qoM6N<$f<N)&hyVZp

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/death2_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/death2_cap.png
deleted file mode 100644
index ab1d5773196d3da7e4388620f0dc15bade912fee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005ANkl<Zc%1E)
zJ!{)g6owzg1!GX0?SftI+@XV)f){TZN=pdnKgdz%PF-8F)?>jnl>C8OLyJ2U8xQhe
zv?yaBTQ_YLUhYuc4u%G$A8=1VLz5ST&OM;_JV-i+1NXYuU6&_$D2`+Mr~Gs}75O<A
zS4!0`t+mx!+rNSROAn+V?RL8s`@S#o5d++Wkm}&p4tE;B7=tmUS%4%-2*dDKabpZ+
zSuz|BNs`1Fz`1XgQnuUe5(Gglzg#XU%aWofoIFKc;QK!7^}3deqKL_4;_M~<2RfZj
zEglR8A|LS_n9XKXRRusC$E;Q>sg;|QQZ~yntF^Y<?bi1DeVb*OT`U$>DdjwhMV}yw
zBIffsX_}HG3FGltVj~9t*lae8MkCTR6&D9#8}@oVJkMjd+X4Ho_?qWDR?4{zZ#4<e
zuC8dcT71lN4qnJSL;&wDE^6oRKy}g}0LSnl&#}+o_2ng;1J4@-`1Tn%2k*;u?uV?t
z4B+tX{%%izH~YBy)F8mi_m4R8!F#elANg=PJr)5tkK&>zyf6&y(^vJE9t01aTM&e6
iIsCqwH?ordm--3DkCTl(0ouO+0000<MNUMnLSTZcJl*5~

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/death_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/death_cap.png
deleted file mode 100644
index d1b01d72d6f3babf2ec31a45143f4257866990e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425
zcmV;a0apHrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004SNkl<Zc%1E)
zF>1p=5JkU2Ko}O4TgdDgT)J^#;S=}{61t6BVchrxQm4+sg;hv8fv=!aR^ct=Nf8Jr
zc0zU%6cYQx!ZNUbAMDJ|01rKM@3J_D!Z4&;@%4Jm@-x0%O4(aVDN;(&M_`}nnG0gu
zc5g3)VEM2C-a~Np^lgW`2GCkVYdtJLk|bCzmv5JAt<f|Mrqd~sBrygsu3IT3IgW$H
zV$qB5b~`jpgSxJbJXuvBgus5k@5OxI$7;1Q_G0J2Xf*2WCzA=w=f|ob%d+7Bh^~KJ
z&+}LS?4NM6+2C@y006=;<l2}^N=a2!ky46^q9E6Gsj4bU)0Cu?#?6TJ1itShj$<4S
z2gGrVAP6`%d;kE*^Bl9;40)ad04$3)3b1ovyWJv+A^@*tcq=i#qQBXU&gb)0>~uN}
z2XITr<MDR^%CZ~=pss6cKA)p)TXbEAuItdYEym-qaVG?rV>xg=nh!FP|4Y39rTvT1
TicvfB00000NkvXXu0mjfbo;%#

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/spraycans.rsi/equipped-BELT.png
deleted file mode 100644
index 7656b6d5288c95989034b0f875982347b9ccc1ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=&7LlfAr*7p-rC6NY{<jvAZRo>
zTYqh*U7k%t^m5<X3UvlMr5`A^SncHiDrT^|UVVS<*1xYU_kCQ!5t)5-&Ss@oJ~MY3
zf3DY8P)h0v6fIr7iFMAaNWr4ma919X4j_21C9Ubc@3?6Y7m$u~aEVoZdV@7YGqdB4
duQDrx*B%BZHci_ZOi{`p#h$KyF6*2UngEQTJWBuo

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json b/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
deleted file mode 100644
index 0f883ee280..0000000000
--- a/Resources/Textures/Objects/Fun/spraycans.rsi/meta.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "death"
-    },
-    {
-      "name": "death2"
-    },
-    {
-      "name": "death2_cap"
-    },
-    {
-      "name": "death_cap"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "clown2"
-    },
-    {
-      "name": "clown2_cap"
-    },
-    {
-      "name": "clown_cap"
-    },
-    {
-      "name": "mime"
-    },
-    {
-      "name": "mime2"
-    },
-    {
-      "name": "mime2_cap"
-    },
-    {
-      "name": "mime_cap"
-    },
-    {
-      "name": "rainbow"
-    },
-    {
-      "name": "rainbow2"
-    },
-    {
-      "name": "rainbow2_cap"
-    },
-    {
-      "name": "rainbow_cap"
-    },
-    {
-      "name": "spray"
-    },
-    {
-      "name": "spray_cap"
-    },
-    {
-      "name": "spray_cap_colors"
-    },
-    {
-      "name": "spray_colors"
-    },
-    {
-      "name": "equipped-BELT",
-      "directions": 4
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/mime.png b/Resources/Textures/Objects/Fun/spraycans.rsi/mime.png
deleted file mode 100644
index 8c5f3938ba1f86abc6b4675d98d9fcdbb38fcf22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800043Nkl<Zc%1E(
zF^+>U5Jms4h+I;n%>`2X0=@$!2cSWs$_>(`rO6@aasWySEXr^PL_s-9q@=Q!Y_bwF
ztf+Vud}Pn}@EL%Wm6eqlv~Bxn+x9VMk8kP1BuO4hDSy4F0ax&Py`pKFSth<D#f>ot
z!w~!Z9sp2P70R*%0G!Wf)}8^^fMXa2R8=KiKF@$V?SH_|fVCFJm^a-R18XhYfT#mS
zQ6P$<H%$WDfYus)-{W$*e0)~dHETc7XLvfDCTUY(cfeW;BEs=_e9?(WlmSr(@;vuN
ziReY+A{s=S%?3dbpzAsi5q7&B?)N)xw;Ov9i8_#`DFFD>k2Nl$3@D|LWtlhNeoBjF
z;BYwj!mhZ}xQH^)_q{LdAR=tH+hsEFdkX%gO+l0aV+`Ure$j_vSSABn>yLB4C<<t;
u*#_7d0Df{XM)Ll}2AqlUy`=aG06YN<3YtMa$;(Ip0000<MNUMnLSTZUqp8{e

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/mime2.png b/Resources/Textures/Objects/Fun/spraycans.rsi/mime2.png
deleted file mode 100644
index 1da64a56fb51941cfbafe81d31f01a1e61081194..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 271
zcmV+q0r38bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002iNkl<Zc%1E)
zF%p9y5CAus%vkaceqhOOe3QSSq_dRDKTukkio~RnJEBF{3T_5&Wez!LG#U*BF~%*%
zxM}vdOBW8quytMc8lNhV6VCI@G)*drn<Tk&4r2_~S^z=_c<%ui$FXS7N2x$2r9=op
zx?CrazqSUV8gR}XiXB080)5|OjQNOJYegp`zJ|E~zsIKu)Iub%uIr)L&jf0s7Dy>w
zC!kFZia#OnaTW8!R7$lP_^%>dmgQQ3np`eW+>pS#DcR$_FK$M}0$E}|mn3fhJOM6H
VNXcy>pSJ)2002ovPDHLkV1m_NYB>M^

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/mime2_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/mime2_cap.png
deleted file mode 100644
index d8abf12be02339f9191d0a0696dc2cc3fb6fa758..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<Zc%1E)
zKMKPj7{$LzA!AOFA**C?bdek-ix<jSTs%O|kUKbvLpud(Fr|I52AVt&<bmJ!L;UlI
zE?qjiZpflx7#=Bq97m|$*Udu+$*~3YP7HzQ`<@tM(dfDkDMfc=kuippQjs@J6KSo>
z04Sx%7!!G%a}q+70l0RcX&U03M;_7~29Q!FJ!@?l03ig`bsc$a+d=@)JFqlN&5Hr#
z5(MDA|H%6pKu+xjaLyeEu(vr8cnuf5Ud5`apc>iEz_||LJkQ4h<kaB+a4KH^h}K#t
j6~i%loq&r(^1sv*wufEMw>Sq&00000NkvXXu0mjfvy*Z>

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/mime_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/mime_cap.png
deleted file mode 100644
index 48a02d08744ee55fcd90839604eeb691323a1d2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004DNkl<Zc%1E4
zv5kX35S)J=oih?bmvIGL0S=u}00{vBB@j9!p#U-xOD@0#oIBYB$pI&1*?|Rme0;F0
zf0FlP%!=L7Fxmxp<Bk8056Meun%<ZAx~|#%z9hqqF+Y{>ToG&m01!oy$8}vNX@yVj
z3)Wgu?bieVK+`lH*S4*s6+eV&n%=M1tH<|!k2sFmK@>TVB#FoE_j^ezSqP8EBX+yp
zj60vt>j<#cq9_V)pfLuA!{P4*0MEd^S}qMCTY%OYM1<4nv{<`bF06i{5H49Qu^$j-
zz&VGqEN8rPZoNfRRn;`qIXC0D5G|rG3=sqYhzNb(W4qnrcDrF1hIJNEmSq5*+wYa*
zLX-ie6!JWu>{m)nH7-OB6h$!&9*2({7orRh5jLC6j9>K_EghcKj*+z%#u)D+c3rnl
z2DH|Td%ta4Xsy`-#DB#^G~*=SUo2o0@%>pc{0#tj0Mc!o#U<NH3jhEB07*qoM6N<$
Ef-Z8YJ^%m!

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow.png b/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow.png
deleted file mode 100644
index 1dc442a5534fa7cd59803ee9cf4c74f4a7bcfd08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004jNkl<Zc%1E)
zF-rn*7{-4}B#NlyCbTJWi>r<I1^fn$fxA;<iyuM|0tuouX+Ki%Ho*dqhR7r_B0RIg
z6VV2{!fbi}S55bu?w*(TeV=>o&vD@6<KyE2%d!@hWi7nS2&y&~3WY@|6#BgWR|D?C
zPNzew)$(K_pt4-ob>i_jnx+9@nkI%}08lQMMKd>~23$s?5vFOXwtF++KJ9NHJ_Fqv
z#OnH*9;@qgYjOih3GBpn={4gk+ICFi(l-9yKpU`u{fM@rSAaY5dJl)NqT2Wk`F9{U
zV_qDt$@Ah6ax?Kb<pel*V?K2N2yTX8sy0TRz*Ym&B>*P<TVAf)OFdm$)`X}hkU3;#
zKSBb?oP(n_Mw~#NG1XuXfM_;JG@AtAG<;8<vDkoe0w=*9gum_`XRb6yeg=BLPp`W1
zQ4^w+z|CNSb`eo&T|=C}>lHkmt?LifWlf6m85kU?c6u~$-0uf~#d9LDqBm{Zt%(pf
kxa_4;E5BeW%Y6Xe0jTqLD>H|eKmY&$07*qoM6N<$f=-aaUjP6A

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2.png b/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2.png
deleted file mode 100644
index b5ae78216173fd7b52000407bdd03ea2ef8fb5cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 336
zcmV-W0k8gvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003ONkl<Zc%1E)
zF>1sx5JlgHCGMiVhE5Q7(OJ^?3OT~o>Gl+XoWP}01eaFjI?WbZQp8|z3R@0rWzQ^5
z;|Bv{!DzlmBQ&tFv9X~bgwTf&dd(hp(!io9`Yg*Pe^mh~VO`f$RizTKlO%V}VT{3A
z3xM~YvMd2OolcAP+%FZ7h%w^5mxk*Eq`$odq8@P0&03p-r~-MOV~pYBW%zzPg0)su
z8Synt4S4OZCIH}VGz}sFZQIUTn}hfo0`UB!3J2v80Ce9MRlKSK-Qg7u08jrTVE=GG
z`RQR=RlsrgHTlveRQG@uk$|RY2Iq6MwFTS~m4Ng6U>X)T;W%*gF-9(32mB2rONS8<
iOhk$65loVN1K<~jU0Tx$5<yJ>0000<MNUMnLSTZDpN&rd

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow2_cap.png
deleted file mode 100644
index b1f5902560b548dcc36ede1431695f1d4bc62cc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003(Nkl<Zc%1E)
zu}Z{15Qe{)!*u3eBX5xE%p2qp1e>kyJ#4PAOL>L0U}L+TX{=Hnq_z>vVPPP!7D*O4
zPQ9BwRygm6fni|w|FW5cfs;=9?+PSMN-49gUKEAsJb}3}#YTWJ-+}$4GZDq(8|o|6
zP?Jaokj^ZGHBV>$08Cg}h|%1Hl?Y%W>RN)istAUsHem%z(Mhr!Sj`8Bu(IZ>xkrG7
zQWjz~Unuok+u;DREVB@!d6s1&0MQJjX-XW&+&$$0<T)fsg4TNPvt*wkz2Uap8vwxl
z5H1n{v~9anZ5PS@1Ea1#oZ7+h6##VaYo~sv8|bFDFa@~$8-U5hxy_>}@(*wmyx3ei
zgw8YIDiJ_k*M0Ilgl~XD$_e20p$`}BJ%q#NYnrBE-E{zzWr@~Wv=xij=*<n-%SwKf
Z`UE5fb+3F**i8Tc002ovPDHLkV1jaSscQfL

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/rainbow_cap.png
deleted file mode 100644
index 7f583cc2d1a26a502b7c2cb8d5176bf628118523..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 482
zcmV<80UiE{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800050Nkl<Zc%1E)
zu}eZx6o<bg3N1_;g=i_np@<qPB5)7;1EMK{H|G>Y@D{->S0M-@iXaGTX^a%yB&?;O
zq9l0*p%#^fX~Rq7smnc;Oa9=(d%wdu=i}V_co$k~>A$N@lB8)`xse}<M3n0(Cuo{h
zPM^LsjJZd;lp)$x0RTqd=IXqJeOporn<Qy}w%)s(nrR*Yqha>JvKWpu4<M8<Ko7%0
z-duW^)#QT+Ky(Hk4<IyVK)+t~u8)A}CIQ4ICmCLeTD;`6pt}U%<`9NlK9V*4oKYWV
z+2g+l0Pr{`NX2_BUZ2z39DpQ{1r{A%i@y%sDz_I-pwjR+r2ZL>7byiYb#^I`f$^ep
zIq?Koex>wY0KnGK3GcEp>J#XV!9WlIz1v{v<HGa@f@bW`0V*2Q$>nm@XQ`9{{5-R1
zO98Ov*<;PK2f(iV4nNPz0OB*SV@rYk`@K*oiR!3tK?-QJ)v>RbqC^w8GV*v&9Fo*J
zDNo?#-25BX>VDIVsY-kXj16h#4*|B)={BJJ<Z@a3cs5&!DM@rK2bg!eEmw0%^OgWU
Y0XtTCBvW$w0ssI207*qoM6N<$g7uWutpET3

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray.png
deleted file mode 100644
index c452a177e374d234e0d606a9160be89bb43e8ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002&Nkl<Zc%1E)
zu?>VU3`IYulPFn(Y(PoPBAJN^*nm1E8<5U3P*VA-puk-LKZtAcDzIe#A7jM;nM@{=
zfcIX#_nK1U#U@&7wJgi+ImHAe4gljg>M#uYsEJryL{vnQOuShmUDp+CZVWX8zfQ`2
z0;&UT+X8?dW6rr}3`8c9p$$}3wR>Ndg{ni%K+`m*VrQT_u&yhNF<&tT`X&sbtZ;yy
z0RX7$x&QzXp>M&Y4%`9Nfv|+)O&DTVp*k>4(<T~(L+mQ_49xS)rtbLr3}ge;PPf+T
raTz)1(D(i2dh}1lasM;o836bI&bVDv;A6cN00000NkvXXu0mjf#|U~u

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap.png
deleted file mode 100644
index 01d2d49bc0fe5bdc830392750205b8cf8a36fde9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmV<S015wzP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002JNkl<Zc%1E$
zu?@o@6hzNaBudt>H=tx2X7U8A;nEvG=NTxeNJV7FiDb@}tVsWL9Qxep_<$e?f*|}G
z&bh+e{o=ud@ZRr?zG+8zGDBw!FAJcx-keiP)H~D{7-J4;N1z(WIb#@xoyI^lur_6l
zEA$QkK;QQr04&QwFXX8Pu7GMlDFpzCF_urQ6{>-Gp5La`xN5D?I}k!(M>pKQ0}`NP
whMaT7TD#GvX~H;;&F@hGYKZljF&6;f1$#d@3sMJ{VE_OC07*qoM6N<$f-h%ecmMzZ

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap_colors.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_cap_colors.png
deleted file mode 100644
index 1ae3a4852cce19fdbd29b802efaec918f627dbf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8c!F;kcv5PuO8%WP!M1_aP`M>
z)m;mht#06}xGW_4;B<?I+NN0&kI(UQl>fG5aQT;)q}M8tm4E+C+iP8);`e`V7RvG(
z$}lj@DQ@2z#1+hCT>9FP>q8Yo70>s{6N;A|o4~c9HRHNZ@x=GunpY)~zo+kcb<O!m
for99nr6|S}9)-PE1ya`m-NE4L>gTe~DWM4fc34GZ

diff --git a/Resources/Textures/Objects/Fun/spraycans.rsi/spray_colors.png b/Resources/Textures/Objects/Fun/spraycans.rsi/spray_colors.png
deleted file mode 100644
index a5580ba514797ad5d89bcd0424d6f8782e4dde6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~Nskcv5PuWS@;FyLr;c=`Fd
znVP~I9AB+D!m{zY$<7~Z{;glc*vH1nkf61+C-QH1M}=;Qb4+~ei@njseC7u}KZ;sy
u%iXYct67?V=Fy#(=ghQz%fR4yiTC?g=`9{LF9U&gFnGH9xvX<aXaWE&KR8?f

diff --git a/Resources/Textures/Objects/Materials/Sheets/researchicon.png b/Resources/Textures/Objects/Materials/Sheets/researchicon.png
deleted file mode 100644
index 353d7b5988c8365a8deed2d416ddfc30e1276a1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80009vNkl<ZScUDD
zzi(Vc5XV2W`)ps31r#LEKxbni0Uf0UN=JvF0R9^Idk{3VsnZ5QVNehaSdIb?ch7hC
z-u@gkdl%B>MLJ7qJo4!2t@d_4Gy9$K<Hm06Wt&XJf4nSw@#!aT{(1D}qgpD`%_wmI
z9O5=V7b>7QEw~c!v1j({kKf$8|KQs@hyJ<ePXe5tp1yT{{Po50yGLkMR4ul{ZG+o_
z)&e!t)rbpMxZ#q;`R_b>aPQ}{v$GGMcYZeo@YnHI7bho2)S|q7a%71k;t(-<3tpjQ
zG>+7vM;FTc;UBy)gU7SO52nta1gN!Ait^5TN3CGaId1J+1wd*=i&8})B|_*a!<^S<
z%6c*2HBTKs4S-r$c^3S@(>a*!`3*p>Xw8JQ!sR7lctQ<VEx0$zT><RQRb*3k2e<YN
zK<J!uyBjHtynfj8@N&f%7Sz0^<bV^U>!$OY+#!3j%~QaMH1T<7QYg%$z*wkHR&-&(
zeq2&ZXce;TeYdwe0Ne80pR-nLUhy^K^8n!r2}`=MZ^3Qd_J|1k2M4<YSkJ3$@1m(e
zaU~;p#En-lEYQ^gZ|@~;y2H5!&|Y>0NMj(5i7^(cQ-ZHJ4Y;(#4SfSh<A9XZ;6&@Q
zy2&+&(3Ed^J5^k@Nmr1(#tn01>|6P@BvfnLV_CPbCfqH|P5|OP&Tm8~B_JW=;sROE
zk<cS4K#rSWBKWr7H^IKZ4NL=gQ@z-|Cwy8Xc|e9s2tAkxa{{f@Qrdo-jM{p)Qc~I-
zz_RybBn>TNN)O{4wSKP&sfB8;N-kwHIcsh2ZHny-V5-jnS^taJl*<cpT0%`Wi<{Ui
z>zp&Cl>hzd+Rgx;LRUw0Rj8|fi0KL~0|#RN12$r_lIN62DG_6APYa%|;|fF*F0C6t
z>HlVoD@u*TCOFqbX8^?ln#b5+>UC8>>IPtOe!(FlE)66tt><mlTbr5yt>Fy9e2lTJ
zSv7VBc;%PxKELGd_jmRJYx~$Rpf=>Bx!YcWZna<nw5L@ggfI#4LZ4(GfAszj<>1xN
zEPJa6+X3~o0<wj$vYT6A6XN}!ev_$BvKzax8+*A1{09Mf8nc(5Y~=s|002ovPDHLk
FV1j_2qox1=

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index cdbaef781d..1441efe2f9 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -83,45 +83,6 @@
         {
             "name": "paper_plane"
         },
-        {
-            "name": "paper_talisman"
-        },
-        {
-            "name": "paper_talisman_armor"
-        },
-        {
-            "name": "paper_talisman_blind"
-        },
-        {
-            "name": "paper_talisman_communicate"
-        },
-        {
-            "name": "paper_talisman_conceal"
-        },
-        {
-            "name": "paper_talisman_deafen"
-        },
-        {
-            "name": "paper_talisman_emp"
-        },
-        {
-            "name": "paper_talisman_newtome"
-        },
-        {
-            "name": "paper_talisman_revealrunes"
-        },
-        {
-            "name": "paper_talisman_runestun"
-        },
-        {
-            "name": "paper_talisman_supply"
-        },
-        {
-            "name": "paper_talisman_travel"
-        },
-        {
-            "name": "paper_talisman_travel_unused"
-        },
         {
             "name": "paper_words"
         },
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman.png
deleted file mode 100644
index a71f60d8b7be92e3c3e0e4e8f17e9e6b43f84954..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMV>B>Ar*7pPBr9eHV|pE_jc?L
zC_SlIHCaw+@;l4M_LHGi9Xe-cUG*yycDx|IA>!2UX)V*|+smhLXml-_<D<xH^?cdh
z9>cVI(b=wd!&fpm+%H`n85z2I=J&WeGgTQ1R=+;`c}h^&ebw*>8T*t3oGknw*!D&K
z{9nT)8qj#$pkwo+{SP>W9i)}lFI(6vm~c-&ykYl-Xq^pHZa7!%T%>Wz{{y40y<&aN
T!yr?jYZ*LU{an^LB{Ts5FdA1(

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_armor.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_armor.png
deleted file mode 100644
index 8cf6bcbd255054244be1181a23cd6a55353c2c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<Zc%1E(
zu?mAQ5QhJhV%^*wJGyqt0|-v-li1xS=tGH{kVT(DicW%?ozkHM6s^5T#pS*w;d1=<
zU&0Z9VHjp-1T`^968$SjN(lgP90ySpk+hFg0|0Q3<4Nq~x|3L*=VVPQ0|4;!eE`5k
zk1wPYpN7wEYo&LvH85BFTWk{prjY4)xHo4?DYBmR6AT%eFueNSN@LX%%oU!CZD!z~
zuz}sjaP<@{6})8`9z-4T4P1)?RS=-5Ym`Eusq4|+tW^*|dmdGm{uu#)3PUZrZZSuD
j9%P!Xn@NUYm_2v{b}>akB4>jM00000NkvXXu0mjf@8fcN

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_blind.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_blind.png
deleted file mode 100644
index 30cefa4863a95e6e9cf1b78c58c1fd802dd4c7e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc%1E$
zu?>ST5JkVENMVEk4LgucG6WU$Ou#U#5_X`8TUt^%MRdr*QMfaTlHy*2G4{WQeSo4U
z%8xPJg>Boqtu;kaEaR%GSlLIe001;~9n77QB$(^_o}DQY0DyCve*8X7lPK>X6&MWr
z*1jXakr>C3oh814(m4#q1QMlt_2^@sMR`#tur5qeF+}wM6{U9)iIETs_=S845|bkC
zfwjb5q6A37hfX24R+O{53Ev4_yN<n&eU3N40YGjo?pe0{DUJOn09=^aqKhPnEx5%M
cMN$5OCn@PmJMBr;PXGV_07*qoM6N<$f^ju*asU7T

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_communicate.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_communicate.png
deleted file mode 100644
index 05ecd08f7ddbb25668ab186bd86bc5d859ec1667..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003ANkl<Zc%1E%
zO>ToQ5QRT5Lh%jqv*8Z(COrhJWX}n57_QRZflXMX3zmrx;I3@BO)5O9qGaJuLLOlB
z<}pt|Boc`{nIyEau4}W@Qxt`(tEvjp&O!|U9QJ!xE2UUzO_pU0!@xYx?p@O~!I~li
z0PD@>=9$*o)qUTK^irt-fX^hkIqj9EGD%UlQtHRh(inFFl*W+fIc?hpYl<RRY3+tt
z{NVuOI7%et5&T}eU)%eK8t_fri$IF_FIb8|%D*GH7l{PX2CkQj8|HtpfB$tpiwuZ1
zFijJsF@MHjd)|-7V9ns2eSiVjbseYemR;8YxY|Df-U78np;;44gbt5HB9WKi8?4A|
UB3G_CI{*Lx07*qoM6N<$g8f{KivR!s

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_conceal.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_conceal.png
deleted file mode 100644
index b0f97c6916e7c7af5d3ff471764f5325a5229f77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 335
zcmV-V0kHmwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003NNkl<Zc%1E(
zF>Zq}7)BperRD$`NEpH$+$o3189c$1?o24xU}9&>Au`o>V2Lxbrjt7$C{n6on;{+i
z7A*hP^M`*6AP@)yo=jxBuqX;Mw<b-~ah&J5mHX8;0Kmub_%QdjT0P7)O=InJ3IGsq
zHh<Q;u5<D^2N+Og2}uHR4C^&wzxVRIcx^5v03yqNt+#D!?Q%W=6-5Zs-$zwdh%7^0
zE@S=ces}VDwLnP;yB#D6>U>5V4n7*dvjw8A5vS8npveiiviK4%d3&z_!Wfj4h`R2B
zJgWt&EKya}hgi@8Yl@;UH?7SaH?7Sl%zm~9tp5drG|`&tc1xl)z&M^h0p2a$)&Zs=
h=CIv75C{bR1>fZTb|0s<|LXt%002ovPDHLkV1l%9irxSK

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_deafen.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_deafen.png
deleted file mode 100644
index 49fbba7ed35001249abe90834c8df3985054ce95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmV<a00IArP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002RNkl<Zc%1E#
z!3}~y5JexxL`o32&;xd25uET&1r$Ro+5;CCZ<Mee$Px_(W)c&OnRj6`Z2tfI2Moh7
zHYSo@tn1pZ-O2NOI+tZB(%wr009>kSHao=eY}U4|SW^`M;Fu%;+@kjf7Je*f7zUM|
zIzTWFhD$REyKk7o*g$Bd>pHQXx`AN+X$6J%Jo;Xx_n#}!U@O>s1?m7xuMGdrO(WJ5
zN4|mw$eiPzrew|mOy}1xz)7gB>MVp<LuzgqhVc_T0pERIGT~mDY5)KL07*qoM6N<$
Ef~cTnumAu6

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_emp.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_emp.png
deleted file mode 100644
index 74fb815d9585c47c277999549ec4935e7395b082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002ZNkl<Zc%1E$
zy$ypf6ofybNMVEk4Lc;8WC$wKGXcY}O0ok@+|rVYR3HKhem40l-q-lavhL3IfubnN
zj|rp)i=yakXVNqs<}AxZ+FNM=fODSD_I6=7+pDTdtmza0U>`-pd<~v2dFVQtrg75S
zxCU4<_rWWG&AhJb&jqlV-`mzn&$$CjfqcHfIl$Ot`WilXmvG8gO9<<qeszF%n0p84
zZ~w~tRF+~baf>d{0VKw7i(?XF0ET(I0vv_fPBrdB*pQklilY1l4+ZW$<&hD-<NyEw
M07*qoM6N<$f=5Jg6aWAK

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_newtome.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_newtome.png
deleted file mode 100644
index a36e1e57916586d588cfda038a1c9af924ffd74c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002`Nkl<Zc%1E%
zF>-@25JjI6!&n7<Y&YB?xk(N|<@B6@!*G@44m6>q#KRy+g~pjcyc@<z3cZFMvGet`
z2nYlMfj?#^Z7hmny490qnXmIa7iGs%0f3kD+1JJx_SO=|F@4`Nj-!89Rh2kXB>?bn
zIDA>N*7~|_TUDM~0N`!6Jl)4>B8nnama5wr^J%jsk|d$7>-z}ouSUHlF${wyQYWy)
z+9ZBOV7?1mBsNcA?LtcV(O)pLb^L09OV^R6DX@O>OV`~`z&Qtee{$y>&t*v|%oKmX
zSC{}!O~d=~$f;=ne0}`{coJr-ZqO`o3+d*8Kp^lh_yA87M&qkn8iW7<002ovPDHLk
FV1j}@gZ=;j

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_revealrunes.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_revealrunes.png
deleted file mode 100644
index 7baef11f34e4751493391ccffac1c923d4160ba3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003FNkl<Zc%1E&
zyKTcT6h#k%0PzU1-Dm}anZW~S2~|q}Ch!1mvw;8&pc%pe)Ts$ws&y)+uq`=o5Rnw}
zDR>%wae4V3A0d%QB>ouXyHP~k)SfKMhJH~LUfTD*1^}MR@@DQ~vACJ5s>)k4$N<3O
za{29g-}ga!!3Hjvx`ws|YoTq?O%tVa7i$1Oi;RZUnDVace%^r2bIfjs-tSLi=P*j~
zemn;0L>n-5eQL`R-87#f@GAy%o{wg>TeO?3(l43!2w_OUi&AVNbY?|Bi(t-w!v><F
zFux3$mjZ7@#2u`4Qyi>yui)**`{`ap*Vgj3TCuhkVCY}B08gIULAB$1GvC7#iA3UG
Z@Bvl`dHmRVODg~X002ovPDHLkV1m-7kdXiY

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_runestun.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_runestun.png
deleted file mode 100644
index 7cb08bc5c63dc132ec99ce81df16337c3eea036a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002)Nkl<Zc%1E$
zO%8%E5QRS|A>s-A*>DHFiHBgNdrshCxQcFFvym-J458q{*r+jSCy{7kzfGs<<jw1A
z!Q=6GzD(fSnCJOm>q*np)LE7}X-BRG0CwB0sg+Vpl7uLVXxo;)@6B0J6waC=0|2x6
zoMUji+-kUma+*%fzOHMLUMMy2I{dLd1_5CxlN5C;rJjbpGZn`%Wm%46V3H)(1iG%1
zNXnnUmVlIx|AEmB{C5JErm-e)X`1m2Xsykl*97i+tu>qd-dWQ*vjYqO%c|nMSg@=r
t08>A%0Bc8W(WBi>*l->0@pwEx!4+*Za$aBJ(cS<6002ovPDHLkV1gYshGhT%

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_supply.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_supply.png
deleted file mode 100644
index f4ad1bab8e5cf79e3f3cee1d0818c2813a551769..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800030Nkl<Zc%1E%
zyRCyT6ox-Xk&+SeXjlO`n`8wfs-$NEmS6)`xhN~pTw2<sI%y0d4+Z;3SGk412HRNw
z`Om`;i9{k_#`s<=ibCe@BuO%^^E~&`UiumUIG;{0XRG!4<*cr2Z_OYB0GsXh<Nv<z
zgY<$83^eAk!d7NG^p=G-_+=9G@?@xO+rKl=7=sld6QOczoSDWLZr5v&o~i}YY%62P
zTyPDl7Fdxn^VFHp&VYIdE0?hq!Mc5_&<U=<(Cf_2!BF}X-Ahnaz&`c7`9=#q1w57|
zrKgVf=>C8J?7NQN-Hv_N0gUVE7vSKj9rShv6La_mk3=Gof59Dk{8*)t3`;Qp0000<
KMNUMnLSTYvjg3tJ

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel.png
deleted file mode 100644
index a6fe5d43dee4c7b798b754f77f6583895f285751..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002kNkl<Zc%1E&
zu@QnW6ox-M?_`G1umf)55LDVT0mHD0>_7u8EmpA#7lD%(qG*w?A<5<b_Z@i&1OkD;
zkBOuki=xnLd(t!=$9bNMvX4>$fZO#tTRX+^Y^|y)ai)_1K&uo0nO^=OecwCf9b5&L
zs3Y-7`U_-QlW9E`t)u8=4$w5s_XKPaQ{0|EhQTSv>j>;Vuw`}=@Gb5oFztb@IA23k
zc-jM7`B)F^CSb1NJ1%7@&J({NchCSy*U>6P(scmi*!}{Xh1pI|n2}gRT09U41pb02
X4|GoyoVcbo00000NkvXXu0mjfIc0BD

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel_unused.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_talisman_travel_unused.png
deleted file mode 100644
index c65fc0e4c141544738ac3aab9b20d03a1221e17c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002lNkl<Zc%1E&
zy$ypf5Jn$Sq-2Bu4LgucG6WUrnSfzfCG0>Gx3r{kDkH>?I3qz)+-tBb>+|#72~ZS8
z`7wd?U{Mry?M#v+{W{AsQTACX0PxK7$=>C9o$OUrCC>B`0Jw!A0Cf<M+G$bRw)M(8
z`3j7w192Dk5tyTCnqvgq>xWhNbe&hmCINS$n}O8Y&8_ejSQ@^q61&X6Ap&z%I7DDv
zYA3SPnl-$CL~{~D5r9WoQVO%gQ}Y4~5F5igiinK?=-0z9z+IT_HMUM-4e8~Iq9}jC
Y7wgVL2t2yP;s5{u07*qoM6N<$f~{$Ct^fc4

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen.png
deleted file mode 100644
index b5d7fd60cd911d4702f4247dd88cf76958067af5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7etm
z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYJSac#@bByYhi~-D+ow#JIyHSmDUZvv<E!OY
zOq-a)-k`I+kb_}!zswDWWsWt1f`THY2BroKLDKn?PjC2eB8APVA%Uaj-w&?l|8H-b
z^Kfru4Cn}a!VvI5(VdYa=jIlfql`OrG9%*-Iq)b*Ftt1~&|25fC}i-X_}~g=H(8id
cZdfxgXq%bXn@e9h3Un-kr>mdKI;Vst0N!d+)&Kwi

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/atropen_empty.png
deleted file mode 100644
index de9a4aec656742af8ceef5b6b589ef1ddc943f06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0t1&
z#WAE}PI96|g2AhXK=vN1ge#1T`6T}ESrn$6t{2Ene0<nKfscW))>(UlbH+oCCO(G9
zU-BFdZ?2wR{%`u!sqCExpEmL-ub7|0UQu2B-~HL|9}YS`9Uqenwtq_#5EOI_ynn||
zwlzL_=E(%P*{2JNKBllaF|20ZmUp-7QC0xQ9GhKJAAWq?&SSrCZ~BjKZ>8H>Z!mb+
zM)EnZE!e>x$;BLPrt4nFpyw^OeX4-~bB9-p_<8xmlG7JXyvZ|#VUds`Gw;C%`W<ev
e2<LBMV_;h5@vZOX{og<zGI+ZBxvX<aXaWFJBx~dV

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
index a25dd9dcf2..2086ab01a8 100644
--- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json
@@ -1,137 +1,119 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka, in-hand sprites by SeamLesss (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "medipen"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "tgstation at 986af32e22a88dae14fd147d812a5a4d27c1bc30 | stimpen sprites made by PuroSlavKing (Github) for Space Station 14. Nearly all resprited by joshepvodka, in-hand sprites by SeamLesss (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "medipen_empty"
-    },
-    {
-      "name": "firstaid"
-    },
-    {
-      "name": "firstaid_empty"
-    },
-    {
-      "name": "hypovolemic"
-    },
-    {
-      "name": "hypovolemic_empty"
-    },
-    {
-      "name": "stimpen"
-    },
-    {
-      "name": "stimpen_empty"
-    },
-    {
-      "name": "microstimpen"
-    },
-    {
-      "name": "microstimpen_empty"
-    },
-    {
-      "name": "morphen"
-    },
-    {
-      "name": "morphen_empty"
-    },
-    {
-      "name": "oxapen"
-    },
-    {
-      "name": "oxapen_empty"
-    },
-    {
-      "name": "penacid"
-    },
-    {
-      "name": "penacid_empty"
-    },
-    {
-      "name": "salacid"
-    },
-    {
-      "name": "bicpen"
-    },
-    {
-      "name": "bicpen_empty"
-    },
-    {
-      "name": "dermpen"
-    },
-    {
-      "name": "dermpen_empty"
-    },
-    {
-      "name": "salacid_empty"
-    },
-    {
-      "name": "salpen"
-    },
-    {
-      "name": "salpen_empty"
-    },
-    {
-      "name": "atropen"
-    },
-    {
-      "name": "atropen_empty"
-    },
-    {
-      "name": "arithpen"
-    },
-    {
-      "name": "arithpen_empty"
-    },
-    {
-      "name": "punctpen"
-    },
-    {
-      "name": "punctpen_empty"
-    },
-    {
-      "name": "pyrapen"
-    },
-    {
-      "name": "pyrapen_empty"
-    },
-    {
-      "name": "dexpen"
-    },
-    {
-      "name": "dexpen_empty"
-    },
-    {
-      "name": "base-needle-inhand-left",
-        "directions": 4
-    },
-    {
-      "name": "base-needle-inhand-right",
-        "directions": 4
-    },
-    {
-      "name": "base-colorA-inhand-left",
-        "directions": 4
-    },
-    {
-      "name": "base-colorA-inhand-right",
-        "directions": 4
-    },
-    {
-      "name": "base-colorB-inhand-left",
-        "directions": 4
-    },
-    {
-      "name": "base-colorB-inhand-right",
-        "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "medipen"
+        },
+        {
+            "name": "medipen_empty"
+        },
+        {
+            "name": "firstaid"
+        },
+        {
+            "name": "firstaid_empty"
+        },
+        {
+            "name": "hypovolemic"
+        },
+        {
+            "name": "hypovolemic_empty"
+        },
+        {
+            "name": "stimpen"
+        },
+        {
+            "name": "stimpen_empty"
+        },
+        {
+            "name": "microstimpen"
+        },
+        {
+            "name": "microstimpen_empty"
+        },
+        {
+            "name": "morphen"
+        },
+        {
+            "name": "morphen_empty"
+        },
+        {
+            "name": "penacid"
+        },
+        {
+            "name": "penacid_empty"
+        },
+        {
+            "name": "bicpen"
+        },
+        {
+            "name": "bicpen_empty"
+        },
+        {
+            "name": "dermpen"
+        },
+        {
+            "name": "dermpen_empty"
+        },
+        {
+            "name": "salpen"
+        },
+        {
+            "name": "salpen_empty"
+        },
+        {
+            "name": "arithpen"
+        },
+        {
+            "name": "arithpen_empty"
+        },
+        {
+            "name": "punctpen"
+        },
+        {
+            "name": "punctpen_empty"
+        },
+        {
+            "name": "pyrapen"
+        },
+        {
+            "name": "pyrapen_empty"
+        },
+        {
+            "name": "dexpen"
+        },
+        {
+            "name": "dexpen_empty"
+        },
+        {
+            "name": "base-needle-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-needle-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base-colorA-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-colorA-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "base-colorB-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-colorB-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen.png
deleted file mode 100644
index ecc834d85b4a7e0914d4c20b707ca62b817e4e0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ewn
z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYJSac#@bByYhi~-D+ow#JIyJrGun@;|@t>RJ
z*4ITJcW~Pz%dqLrF-3+mc0~!yGuS@X8|bvIwk&2)YU6RpdYoG%DJD1bj01-NPvd#{
z_{0zYKjb?Jbv9V@$u>CkD6uy*@mq2^B%EIMlxI$t_QOB#`*k<I%8iUW<iMjK!PN3-
tLgT`QMj?YA#Rpd~yUD_wcEg&1fqkVhi_4>qt3byyc)I$ztaD0e0s#A8Tjl@&

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/oxapen_empty.png
deleted file mode 100644
index cc5f6060cc5633ef2b0985ed8286734d481e71cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP$F
z#WAE}PI96|g2AhXK=vN1ge#1T`6T}ESrn$6t{2Ene0<nKfscW))>(UlbH+oCCO(G9
zU-BFdZ?2wR{%`u!sp%E}?z8LZpWM;9pl*`vgST)0%FlfNn0cdt;<4_7cW%vo$bL9z
z$DN~#d3esgy&U-EdRUs#jN{LY=ET^{Y!o=~s$p&P_C-6SM3~h3^HMAR{7^jHpZ{KR
zUvaL}q+ZtO4&H_<lb<rAFmzQ<SZc5#^>PuL*vzQ~|K_Wg-O$a~PE=qMn989)&%RAv
wZ?mKZql>B&n^e=mc!6H1FG>%rV9wxWNUU@}eIQw|0q9=_Pgg&ebxsLQ0CYxnga7~l

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid.png
deleted file mode 100644
index 2c79d0283d7278079c9a0b5edc00666a9ad90551..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7ePc
z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYJSac#@bByYhi~-D+ow#JIyK#*{H0*bJr94r
z^>xw59o#m_GHkkYOp)P?T~Pw_47QIyTlEiLt*NP=&bW+?%^~Y?Zjq#z+{`l$90ELz
z=jG!QKiJp(=}1&GW8gCEl40Pod!oV6s5^U_@t(SVj?ln^|9NgWoc<)lmc(#SKtZH^
mO4Gsl+-|Z6Hyysm$RLqw{MqU4JTsuX89ZJ6T-G@yGywn&npm;`

diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/salacid_empty.png
deleted file mode 100644
index a846340fa896d167b1be765c0c86d52deee5af8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP?J
z#WAE}PI96|g2AhXK=vN1ge#1T`6T}ESrn$6t{2Ene0<nKfscW))>(UlbH+oCCO(G9
zU-BFdZ?2wR{%`u!sp%G#-}GYc-HDjFpl*`vgST)0%FlfN_%ZV`;iNqhXV&hO-0?&2
z@Y8*@RYxw|v6FSJ&rMZpuFTOpeDdgINe;#}d^dKLYIm)6R4n-PBCPFrzr4|(AK&IZ
ze0;pWz%tCOqxA-ZhixRE1KWZf?2%l|(Pp~o72jU*&(T+HyW4R*SC!`o!y=)FM?W8D
o(-XgNDru3dLpF*x3fLJKcKq=;vdYfzEYP<Mp00i_>zopr0C0?WV*mgE

diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json
deleted file mode 100644
index 8a4d587e3a..0000000000
--- a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/ab4abf318f293a701754656dd4e9261eb70f8824#diff-9ab5c8a5e47ab7cfaeadd859a23e32b05de1fe839e99ea767fd7e340b6385d67,this sprite made(resprite) by Fazansen(https://github.com/Fazansen)",
-    "states": [
-        {
-            "name": "syndiscanner",
-            "directions": 1,
-            "delays": [
-                [
-                    0.4,
-                    0.4
-                ]
-            ]
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png b/Resources/Textures/Objects/Specific/Medical/syndihandheldcrewmonitor.rsi/syndiscanner.png
deleted file mode 100644
index 9fa8cba94f5f94f10dbfc15d28a08d59a4f672b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0006@Nkl<ZXa((9
zu}%U(5M4zQ1EB^iC@+*)*pcWD*jZBh4b)bAgEgfeA%=!nNJ*}w5PJe4A*lO~%w<_P
zZg;s6jXMRiyEn|+c{8`Ww?cUF40r}S1D=8Z%fN|E==bO6UupJ_i-ncXG=J)I4*W9}
zAgO)XXsiPtjYLHn1<U1@X_(K84>?M<Z^L0`M37IxfS)=^fY0XhIN+P{IBx5W=UOcq
znog&pQZ9=uNZ`gdssIF3DwU$(5M;4X5Fka@Fo12=!ij%sJ6SzwwQuXo#a_kJli=dd
zr~=4w7>3kL)YWP=@!6pdIPi@L0C+c-+lT=RpDquRiQpiC3*VRk1bW?UZp8aC7>L(;
zJs!J~t2C$V!oO&@W61YTCvKZItO)4!`;p()Y$dwIoTw-jfcFtwB&PuXPGUbvY>0{<
z^`lX{AFD+W8NdV}Xk*`}tYdpbpHrv;kO0D`tV6rtTM<ANfFRLE#_1J+{)q}8f(f5q
z0caO|D*`A3m;_~jDgfFg0~C;n-i7}wD&STIf6NN_l;wZ43P9#4^Q29(>0-010uIHu
z-v#6f+?A+3A=d!83n2Rt(ou)$Ct8Cvd}JT*K51KMV*+rvX~{#*hOE{*f;z@=2!eku
zd}9JIi698JK7jPIx%%OP|70l~_*T0Bg3&)f)P9!1CiznFbn=t_vv1tE0_bx%?LL6)
z_JO)QBfnYWr(TF)vUDSZy&enBz8fJr7-ex8LPT-m8xcSg;kc6{-zNIl_$G7oHl6{`
zfM?)OG4KtQbypdkT{7PQ000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$
Ef(H5|Y5)KL

diff --git a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/disk.png b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/disk.png
deleted file mode 100644
index e77f266db33b8a90dead2237365e055dcf570b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 355
zcmV-p0i6DcP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0003hNkl<Zc%1Fp
zF>b;z6vpw7ih->|2L_JBzzN(NbgaS=%FcwiL<SCk#L|OwtW-9(c1T=VD5~lgCzj#=
zlcJcA__H3t(~|%I0C1ls|Gx8C-+s6{uR3q3=XEpKMa-Ky{~>A-i}sMTt|~d_^nU!3
zbFR7g)E>cNlNumDt^hZvcLBEhmlW&BmOqVt;;}isZ8qKCoqMfk^!)e&NUC3J=^$y@
zUhw0SWj15J&sDGvL%yj1zoFL)7*p2|U|`<^d}vsR0@>ey+!DQkwgQ~gY&iZu7mmje
z=7ygQ;tKE~=~L20((I4(P;%!300000002Pg%IOanNLl>>1E4>k?*zH~1NthjKOnIp
z`vX$C`#qrC28l#ykT5-!yFVbIvibu60001_@&o3)Vf%}AX}|yg002ovPDHLkV1mAv
BpdbJM

diff --git a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json b/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json
deleted file mode 100644
index 5a34e7379b..0000000000
--- a/Resources/Textures/Objects/Tools/Hydroponics/disk.rsi/meta.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "disk",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/base.png
deleted file mode 100644
index 5b0c42d8c7b4a1aab19a105ac40af12f7729139d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFmigjIEGZrNwz6?z;M`sX&K|z
z+AEBU`6NmYtYCJNHIR@w;FQa3zUK9x^9K$bnDG2#YvLt7Ii8;l3yR!kSv52^HaZ3#
zp3~?)b*AITgYj$lT*_FwnCoOTf2>bC!u|a7id}{VKv1)DZ@1#^-?GiS*2#pOPI&OI
zcQTK;zJ1e+z#oSS{<EcVXk^V;Y{7JtaW~(;q=bYYJkM7fz5y~45_XinGd|qR{=TqU
zk}EH+jwQU@yJzadXHUy5uClN={^+@qHz7sM?QeL1K+1{owA2|pzMHrG0jif=c0Rt%
zmTLv8oK3~~4X+n401c5hcrrmZJz;?(#{@36Ju)yazG?_$=h?x`Fza4e?b@3z+ks)j
N;OXk;vd$@?2>?zlgiZhe

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
deleted file mode 100644
index 21f261d1df..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/rocket_shell.rsi/meta.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "base"
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/base.png
deleted file mode 100644
index 9a885e2b618f6ef4d68316a19e756bc50dd526a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003#Nkl<Zc%1E)
zKMKMy6vn@bF78G20=hYgf>PYPLN`&t&B0OdEY1ZFVet<rUZA~zB91~AhdM|~s;PMu
zLml!hZ9>cYy)Q2>F<jS0mda%sT?1$U4e$>DdD#b(={yw8U(cuLy;r}X(QN_%j_v`2
z+0vi_7_v?{na;!UsQ)&<-t7SZo7GDApW`e@5K;&DV7xrfkKWC41+`i=8Ye-04d8ix
zEC3(;(;P*lB4oj>b}KgK6%?unIu?SC1+!cs1CShG5-mkchYN~#KUSbJk+&hso;`(X
zmee`Gvj6CUN(TT*_JCRk05vs02H>}uXcqu@I)D<)?fQ2B*YoKuqr?nVIKWz}Z4X1~
z+NyAXSCaM7@~Er<nTq%CT5&3Xq<)_!<5x+KV_vpB6y6P9MLmjB1E^5uS27Kt0UmR~
VhGs@nnXUi;002ovPDHLkV1kcdn?e8p

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-left.png
deleted file mode 100644
index 774a92f0cdc97af5a74a3cb6685af93c4b9322ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%yJzX3_D(1Ys
zW$4XRC~^Gb{F#bXoP3I6S7&%TJ4>kSYh2)aDDqa;#iP?7Eb7j?6!V~)L*?MfrfL5J
ziykagzawx%)A5Mu6mfRnpIffH-+Y(%K6_vKZgvGF2oMU;nR>Ts@k_5QuX>k7>r8cx
zx*s{M=k2@HJ0V%@znU3~Q@TxV&(%u{X5U$JFx2b#-?zRFDt|IPjm%D`Tzu^<w*Sj7
z`P$4y(jTlU56w<yjF@_ci6Ksg`{2p0itrL<r;QeeqJ$VO?Ajv`d9_k~jjCYRQPoLy
zi=+*5V-t0E_BCoova&rB5M(HO9cAX@f(-t*z1Vm#Mlb$@p4Fyyb_;uJ(b>WICU?u0
zzqZx?B_8$1DJ8p@dGpH0dyRQ+c5@zn@%xwiarJixWd8jqa`|G%z;Gqv@ZHD8S0bEM
zRxJ!$+mRQ!Hj2|_(X9M)N-p*dxxEb~Ob7qwD$H#N+Ldx|@sxM7lcN{M&vXX4p#G+{
Y#@DignUgo|1I7h|r>mdKI;Vst08_@i4gdfE

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/inhand-right.png
deleted file mode 100644
index c6dc9eafb2e2d4652f56b4f1796a530977b4508b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zyF6VSLn`LH
zy=CvsR4Bvt;rJPWy)5kl-C1Xr9#rHJy6<p7?V(QY))$Yw3og2vXX<@$WtsFK#qqS~
z$;S414+L&#Ivz1CUC8qN_-CFfyW6tgfB%(xx9_$sgCGQ4oa421+0##~xmPXMoOsF|
zwKU3jYUSM*jc%J;U%I$jO}^@~v3YrW_4!AF(;pkmyOOk#xn!Q|iROtbO|#R?^UE7E
zjZ&@WNH04naw|4Fn@9b@?cJ*mSl`<)>tv|><M5hQTn)aLfx-*wir+Fa>=$U&7uh!d
z9P7RSi8@8D2kP4egM}|l{>{N4arOP1<;4e=)OD|YVOI5N)noyv^T5=__{{}373ZFO
z<=b=Rq~SU}eHrb5kX5E@FXp_wp7#GoRN^jqgZDtkeJd+Bn7iVat>>m2eg+DjcW3_f
zKYwoPygTJvmL}~|{3Knd@!;cA-bVor3K|Pyw5)!$o?5y{T|gx5T;Z&@;s!x%4oXb#
zFWOD$a1gQfdv>WaDgD`;iAE8pEM0)$%l#V0Y29T9o6p#K1EYw+)78&qol`;+0D_3i
A?EnA(

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-1.png
deleted file mode 100644
index 67bb78ebcfdab3bd6018115aafb1fc67fbc489d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-2.png
deleted file mode 100644
index 6aa8a7c6b4f6bd161ede88c43784769790fdca81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-3.png
deleted file mode 100644
index cd64503394389bb81631c3c442718556a7761255..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2215
zcmV;Y2w3-tP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000F@dQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_blHDi_{bv=k1SBCOmcz4Zb}-AI19so;zUd^L
zbbh94`~WP=Lede(g!#|kEBu9nC2~k=o=eUVM=Ggs#lYirTs_5f+H>&z3eWH4;qihY
z67+IC=6UN^$o2IDOSinemj~;&9ls4xd^ff1nfG|yPTq!uFFD=Mq1+$T{3e|H=6;)f
z3G3-O8Imy+_JjjZA>?Yee9a`+U2!W~mb4XdR_G+ONy@kR3y;)&kif_2DSz?BGkHzN
zW#}cW{FJ9#PWmL5$29!TBjU%*{MMtX(c;_VP5#yzzSg{=t0@PhE8juAgmOkuY)Ge^
z&oWNKtr*)m3r>$UcAz#8Y74R9p%5eEixLg0v}m5bQ-_O*CmVX^&T?cf#)Uh;*vZF9
zi!DfzAr4GBkQ0dc;R~I4%bpLDIc6RNO(qzlgX5bsJPUsJd}nB_UFJm5AGv~Gyz2{Y
zY~*$eEdWC6&Z(aKQn<SKd~9F^2<l0*BfuKlWuhs))|MQcC2D|bir0D}8@B<Z2y-i(
zAprt0lPG11#%x5$qXVA`&v)53AV3<F2fXAYk^zqMo*Um79bHzw#Gn@dp_0V_O_2()
zQqq*M-W(-VgNi0q&1&jev}VaEYtGs7=Ba98$<(r$xfQD}o?Jb<xqI<ixCm%WL&?R8
zmr`oQq%~F8s?e_xG;Y#T)0UexZ>80a^69B-&)vHB((B+M0~8QO9yWZGQ7285(o9ol
zo;H1!Sr=+;$x2ICUbcLdRUfF`sJ=(-8Mz;$MmK7FfZBTYiW<abFD7WyiEhk*7$*Ya
zwh=%<^TsSXrNkS#jae)#K|~o|>IP@fMhpn1Nvw+=*u5h6UEBh)`>VL|N63W@-Jd`%
zZ0Oz~_bqN8pf>8ETR8yjRfwE|AqC5CrC8Z<#oz72R}K7c=s#kpO+#B(!QM)yuOm5z
z@JDTBB^#tmTq$8?X<rpuP|vWSy^2g!JHAn`v&|OkQX554_M<ls*jn^un5?;=DNt!^
z3=l?L*(O%lp4eqr>uO1<jyZT?6?HBh<aivdBY5xEaPPH#uV1Be3&UsY#tln!q#~_t
z-%{nG&JznB?nL-RIW`2Xy$wn|WkIL8D}FV;pi@C?*ap;TWg$b;aT^vM5>)1yuzSWQ
zxb`mZ2YvW~g7vwFIxu%ldq&+ZMu?G2tMfz#WZ)8o{RJF_mscBQdte}r0a2Z0G&qM`
z_t8K#8zCUEz!)>q1PS}nIhTfszuS~#V64)R2%%N`5^G>GZTpuIQ3dT(Q7dujcXA$n
z5gcFw+Pk3fU7SD%kvfG9#Ta8l6X{^Gv+v#NK&DR{b1yKl%dEi;$hEIBdd?!CXd7d$
zk;3A*^_Su1RC~U|oc>XqhhaaAG<>ZLUn31ysCb?zBD~W(HoU*T_*|6XO_;wH<x`A7
z;~!aSH9W(KiUsRP_4=sZC`WikG+V|VZMRMhe&g@A^TMGuHc*Wj74NXAh^#G@?nfU%
zx1AR9LHKKek;u7sn@#$dbJUS%+i0R7!EjezXTp~0%Tz0y`M`gh1#2rFFKT4OP%qlh
zwwE#j-n@ZT32e1rU|vh)=T-X|IKyYE_A`C>39^7_Ae_GD>6O)AO7@|A&<z*LJ3y}o
zNo-uY6)LOAl2{*gJu^0BhBy!H<)rbpc=h3B@asJ`ynQDfe=%&I!hUe1Hx1gT99G|K
zxgqPPI2&H5A4lT-$4Q5d73DTK&%U1m?#KK1h2;{yYT$oEKjoq|3ReEV(gJiajwlv+
z0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmP!xqvQ%glF4t6NwkfAzR5EXHhDi*;)
zX)CnqVDi#GXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`lcSTOi<Ed@QfLw5g~$6i@1DbZ
z_W?q)%2cyw0#G%}NGIZAF25=UUlBkA{qP|sF;h=w7PIiIuY2mFx{L8F@4i24Kq;6E
z@QK88OgAjz4dR(iOXs{#9A;%nAwDM_H|T=Ik6f2se&bwnSm2pqBb%Nl4ik%|E|$BP
zl?|16nmDSc8s!T)mle)ioYiWbweQJa7%FHh8LrbBK>|xiA_WmL>ZqU!3o+U?QcR@j
zJnrEicKj)F$>gelkz)ZhsE`~#_#gb9ty!F!bdy4HAn;<_AEQ8U7icwX`}^3oTPJ}3
z8Mx9q{#p~5{Up87(V|Dd;5Kk^-O=Pd;Bp6uJn51lIg+22P%HxPXY@^ZVCWX;TXW~u
zKF8?;kfm8I-v9@Pz*vd0*FE0d+da2`d)o8+0bvw!pc)|9yZ`_I24YJ`L;(K){{a7>
zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm493=T3w0)}1y00B=)L_t(o
z!(%*f-~huw0w#t52BQubb-<_t2HXKGgcRf!)?gKX{rnl6?XLfs!PLQ=fq{X6;q-x%
z42hMiiFN=Zp^`ASu!bQmIUYm&(9shN3=9kmhxhNts&B=LdDIC3WXq7jjT<-NY*9%m
z1`Q2$I3Jgz$acVu8#hrbK(-v87}XLX%yK(x3lu&w_-14G|JQ`<|Gy?=|L2x-{7=;o
zz!w#8aPlR?9|i^nt|NySKR$oPz`zho-E0W+J&eWx=Hd)2A-W7S3jvt#afSk|LjbSu
z=@9}%qya`~2r!Tm0z^9iIh$e21@I6E(PiK+-9x={;PvxoD8(*%F^nY*P&Wi%MQTJu
z5`(Cu6yY>L?GV6LAYqN3lP?+moP5c^_4_7m(f}dA^_#q+m?Q__D(|tT32Ifx$RHvj
pi70i%R>dScV6;s*>VRSC001X^mavpDjOPFV002ovPDHLkV1lq+0dfEU

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-4.png
deleted file mode 100644
index 067849564527d9122323375ef687b8542c687057..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2223
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/mag-unshaded-5.png
deleted file mode 100644
index f07a2051f6da9a51d65770b4ff03c1600d1eb062..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2210
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

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
deleted file mode 100644
index b42d228b65..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/meta.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi, inhands by TiniestShark",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "mag-unshaded-1"
-        },
-        {
-            "name": "mag-unshaded-2"
-        },
-        {
-            "name": "mag-unshaded-3"
-        },
-        {
-            "name": "mag-unshaded-4"
-        },
-        {
-            "name": "mag-unshaded-5"
-        },
-        {
-            "name": "inhand-left",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/base.png
deleted file mode 100644
index 753a06f13b2e56d4270e5efa5ab6788f3d344a4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWNC@2)*6XFV_m6es#($c0*o$Bc5D6gRQw)?>ypeS2OkY6yve-NmueDDt_
z;^^t(7*a7OIbnf%f{2T-fRUJpgP=f|QJ9NxK#_~#p%X`48A2UATU{6vMa4yo4RsER
oaLCD=J0Kvy!gNJoi5>$3mk1A&`>*|Pfrc@7y85}Sb4q9e0C&kY5dZ)H

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-mag.png
deleted file mode 100644
index 14b249508d200ceaacdd67b67115e195f71d5bb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|=6Sj}hE&XX
zdvl}UAp;)PfP)(&rd@QKrEa|BoWU|KR@OVJWetz_GX6U`X}3HhP(4FzNa*P^-(FhY
z+u6qzH%;|gsqLKLP+g^@S<BYPKXXpoCdZt=KjX<`ecQvUR^?8g|NLh_+4(iWU-w+|
zudN2@XJGhuaec^R!RA*V<F5YDo_TZIt3Msl{fYDDUVPCP_aQIcY}c*F8(KOxurM^l
YzH^=A`@Z*eXDmpcr>mdKI;Vst08KGq9smFU

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-left-stripe.png
deleted file mode 100644
index f7582688595aba1215890b7194f11ca9970a0811..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|%spKkLn`LH
zy=BPDz`()m_-D4BoQDEWIaA$>J6b?_28OgrPm*6x5d^at7#eu%SQr?XdEeIxzYS=7
Q`U52F>FVdQ&MBb@03*vFk^lez

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-mag.png
deleted file mode 100644
index 6718d70e49315e7dcc48605fe806842d76fe0174..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX
zdvh=EVFihnhs9GuSIlfo&6v?%Iiqn_qDN}^#tBRk$KPL8vXiyH>j~5W1P2aQ$0zrE
zeI=v3_nerw<|)hbr!KV?uk#Ap-d=nz^!?wpbqD9|d@8i<TH`T^$ZS!kj9bN9-_88K
zzEr*Z3=hNz28ITA>B!6TuRYdH>N$M-@kG<Vzppb|rcVv3O8Kd^bc<)y<`;8r9?-k~
lO;0>ynY+9k1H%LP8ipsgoi4<h$z*{H@pScbS?83{1OQj(Vz&SQ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/inhand-right-stripe.png
deleted file mode 100644
index bb2a61120f96914cb68b5c21f9b6a96583d97d2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Y&=~YLn`LH
zy?Kz6!GMQ(<D30kc01TNI%rN*v)CWY3RJ;xAa>H8ycbg0akg?GE)Y!nw3nHo<{g7v
Ww(#4ze-!V6#5`U7T-G@yGywpXcO~Wk

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/mag-1.png
deleted file mode 100644
index 04bffabaab1d466f039a4258be27394d671d259f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o
zVGw3ym^DWND99h+6XFV_udFx!cFzA|m;Z_kAC=$IUO*w%k|4iehW|hyb3qMcyp*Sl
wV@SoE<b(x^2_Zp74#Gku3zoJnZn(w35PpK;_)$d$f1oM`Pgg&ebxsLQ0L)@5{Qv*}

diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
deleted file mode 100644
index 7f4a648178..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/shiptest-ss13/Shiptest/commit/662c08272acd7be79531550919f56f846726eabb , https://github.com/shiptest-ss13/Shiptest/blob/master/icons/obj/ammo.dmi, inhands by TiniestShark (GitHub), stripes by SeamLesss (GitHub)",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "base"
-        },
-        {
-            "name": "stripe"
-        },
-        {
-            "name": "mag-1"
-        },
-        {
-            "name": "inhand-left-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-left-stripe",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-mag",
-            "directions": 4
-        },
-        {
-            "name": "inhand-right-stripe",
-            "directions": 4
-        }
-    ]
-}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/stripe.png
deleted file mode 100644
index 7490de7df2908bbf476fef1e1f78f283c9737237..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 705
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0KH4^X5Z`4qdr&<=L}m
zt2DO90EHM!g8YIR9G=}s196hP-CY<uSY<tc9L@rd$YKTtZeb8+WSBKa0w~B{;_2(k
z{*qOUk;zomYqdWE1CzF=i(`m}D5C<?{l7pJqhQd6fQYfNB8uZM1O$OV07VIPIh&Lj
UyDg9Hz6LVY)78&qol`;+0HqHq=Kufz

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/large.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/large.png
deleted file mode 100644
index bb27b759677c3598b917a68218f0adcc1d29a830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy1_3@Ht_KbraBy(2u(0s+^K)@=
ziHL~s@bE}XOmuW~^!E0SiHWhYvhw%$4+;vhv$ON^@_Ka7iw&rku_VYZn8D%MjWi%<
zx2KC^h(+(!N!~)tiX5!Ya`OWpSNy-tb|%E^(Hh~hu<Z*DJpS13c)r6{jj4HiSMmlA
zjc7fA(0iN$!oju{`VTqn{#=l4_t3nWopR{O(rd@`#lw^<o`>B&87jJ3@Ox~=L<SEY
z@ik>>?_SN2=yu@Cet-8q$B#^3!M2VSGj~qd+qCRK?*qpZRiaHZx0Urx*{zUTBv-kf
z^C-8^zCRCzmOOa!;HSy+4aYlv&(5@Kys`XAd-xHvdv9)E-+6GqR6h4Y*3v|-6p%L<
NJYD@<);T3K0RZdselq|7

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
deleted file mode 100644
index 364c0db123..0000000000
--- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/meteor.rsi/meta.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi",
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "states": [
-        {
-            "name": "large"
-        }
-    ]
-}
-
diff --git a/Resources/Textures/Structures/Machines/traitordm.rsi/meta.json b/Resources/Textures/Structures/Machines/traitordm.rsi/meta.json
deleted file mode 100644
index 6f167e8f19..0000000000
--- a/Resources/Textures/Structures/Machines/traitordm.rsi/meta.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Edit by Tomeno using small parts of autolathe from https://github.com/tgstation/tgstation/blob/acb091f9744e9ab7d5a27fb32dd0c03bd019f58c/icons/obj/stationobjs.dmi (may be an earlier version) and tcboss from https://github.com/tgstation/tgstation/blob/e32357e6b0ec0f0a1821d2773f0d1e1d6ce7d494/icons/obj/computer.dmi (may be an earlier version)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "redemption"
-    },
-    {
-      "name": "redemption-unshaded"
-    }
-  ]
-}
diff --git a/Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption-unshaded.png
deleted file mode 100644
index 66fde4775bb59938525420ff1da24998bcb3264f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<O~T98#a_FNPz$V02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00M(aL_t(o!|j&8OB-Pr$3KbX
zz$oNyFmg1Z4#ARuAQVfNPU2+|+FR<<$wHS>5XTNWlr9~l=+MonL+fG(p_o6Q7J?86
zO|T?TNg(tZd@u4ALAcn#^IB_uo7BZG9M5t0ygc9cdA`r{zR(Ap1cN8-`uh7p;O_Xi
z?@9@Df*YMU>$-k*1aw_z&T%f(_VMvC?-Ye;%ksWGh5nUbb-Bh!_6MuWHTM4sIvWf!
z8w>&v4u|O*ftPbX`SkuXwec(f4~K^V*s509s#XCgl}i25z`kX%`eB6H?JWLpaR5F_
z$t&CTve0u47={5rCX)f+!Ltews_T1}0RjPUT{4;Mo`7K(n5K!8l1wJU7hU(Ms!Ajh
z@qAvmb`2;Ni`Z^9W@cs>cFWU@MB61$RTbw^?&N!-jI*7in1IMO7p$Ftu_rNKPf8F^
zr`b!VPt_iaH4OT%?F0?GU?CJ@+On9oEN+EPYu--qVxq?)EWLfpO(|i0oq>&*@BYqd
z{l|8wYX>%py(6$@7?|$+{QNvCD=VJJnqhHqv3D6z6vb2X($Z2#yHgaUdjfAPizy-4
z-QB&^VIzd-J_Axp^7(wj|7XLg5hf-kkWyamEQm&<2q73sCNJzpRaN|cf89q_)!t|z
zpU<Od8ovw!?SEcK7D6Gm-3+8sDZ;4~rKu@2?GFvxwlPh!?)uHm&2uBW5e6FlxHmLJ
zArQcE9PaGx@iiXzf(s!S92`VZ6poILC=?3k?7_hSqobn$93CE0sZ_et!0TL&=k7tG
zX&OQZqR}W)%BJ>AE3G=9WgFs-;OyjN*EMc6xO}bdf$gff8G&-S+<h0cGkULajcZ&6
ZzX2bO4Hs}{Nx}dC002ovPDHLkV1m4+UGo3{

diff --git a/Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png b/Resources/Textures/Structures/Machines/traitordm.rsi/redemption.png
deleted file mode 100644
index cc4c1cd92eaf64b2b581abc7e13a229910e22c6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmV<a0s;MrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<O~T98yDC>Sl<8u02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00L%7L_t(o!|j$oXcJK!$3IQw
zhFZwo(1XJZb_kUe0$t)FPNkQnptsn?se+3LrK3YTh>JszcIej0!FH)bL3+DZ2!%i(
zLAk+@K=2gq0?(z8oI{ec+WgPOF8#sryL<P0{J!t^{l4FOFah(UQGd|b$Rq&VU0C2s
z0Ssd|h6&a*&A&1Lnx^?{_4=jp$LHs~l_ZuOCm4G=1c0F_*x7C{SNP7(c7xJ|q^r>=
ztI;R`x~@+Sz{|BCe0cYX#zFyrhqJQ)9M@_b*J=P%DwWA-pyW909L&+UQy}tn5rFqX
z@XGUoDuk{9!!Ue+d_E7rgJ(YhwPS3%0?f<=^DN7n8X16L7`|zm2qDPl^L*AcWLYK_
ziv=++T7DNOm&<sqYOJiRFx#ZZ?*(FD3S?QP{;0^ebd~x^k#ZVhCtUJg8s?uQ!l7U>
zm*Yz=*Hn8V(KYG6o-nrIhN}9@j>EF!a9eG1K1lL%I%E-6_V&0X1nloKeVE|>X_No?
zQ#$(T!*X~4b`1lw^}fEoP9~EHMApkTH#ftpfFwz6HM6y~HPq@PNg5r%8^@VSxvqb9
zb~e^w<GSwX6%ayT+jiIg?dH_YlF1}Oi1E&Xcs!2ly4<v^ORJG(nMfqk@sVXY91YmE
zjiM<0G7Oaec_G<QRsW<_fowL5p3PE8rBIYVFg(x0G|i6lkB*N1YT08|;9jZ3#|z0_
z*F{kjbX~``?clrZ+x(AxA9!6X^4zijf&}q+93ezc-_}aM9ng0hqN+YXVQFb(j{7yP
wsebpsLDk#~K($&O{Wu<^^<LYxUE4VJ8?ed;dbcZ_H2?qr07*qoM6N<$f}2ccBLDyZ


From 0abe545050207fa903fc6cb6e45710de3cd6b2d0 Mon Sep 17 00:00:00 2001
From: Orvex07 <77834935+Orvex07@users.noreply.github.com>
Date: Sat, 3 Oct 2026 16:46:18 +0000
Subject: [PATCH 33/69] Predict holopad projector verb and minor cleanup
 (#46291)

* predict holoadp verb

* fix format

* default! -> null!

* tidy up hlsys layout
---
 Content.Server/Holopad/HolopadSystem.cs       | 298 ++++++++----------
 Content.Shared/Holopad/SharedHolopadSystem.cs |  52 ++-
 2 files changed, 171 insertions(+), 179 deletions(-)

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
index 651db65f5a..5be7bd438c 100644
--- a/Content.Server/Holopad/HolopadSystem.cs
+++ b/Content.Server/Holopad/HolopadSystem.cs
@@ -16,7 +16,6 @@ using Content.Shared.Speech;
 using Content.Shared.Speech.Components;
 using Content.Shared.Telephone;
 using Content.Shared.UserInterface;
-using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
 using Robust.Shared.Containers;
@@ -29,67 +28,30 @@ namespace Content.Server.Holopad;
 
 public sealed partial class HolopadSystem : SharedHolopadSystem
 {
-    [Dependency] private TelephoneSystem _telephoneSystem = default!;
-    [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!;
-    [Dependency] private TransformSystem _xformSystem = default!;
-    [Dependency] private AppearanceSystem _appearanceSystem = default!;
-    [Dependency] private SharedPointLightSystem _pointLightSystem = default!;
-    [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!;
-    [Dependency] private SharedStationAiSystem _stationAiSystem = default!;
-    [Dependency] private AccessReaderSystem _accessReaderSystem = default!;
-    [Dependency] private ChatSystem _chatSystem = default!;
-    [Dependency] private PopupSystem _popupSystem = default!;
+    [Dependency] private TelephoneSystem _telephone = default!;
+    [Dependency] private UserInterfaceSystem _ui = default!;
+    [Dependency] private TransformSystem _xform = default!;
+    [Dependency] private AppearanceSystem _appearance = default!;
+    [Dependency] private SharedPointLightSystem _pointLight = default!;
+    [Dependency] private SharedAmbientSoundSystem _ambientSound = default!;
+    [Dependency] private SharedStationAiSystem _stationAi = default!;
+    [Dependency] private AccessReaderSystem _accessReader = default!;
+    [Dependency] private ChatSystem _chat = default!;
+    [Dependency] private PopupSystem _popup = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private PvsOverrideSystem _pvs = default!;
     [Dependency] private SharedPowerStateSystem _powerState = default!;
     [Dependency] private MetaDataSystem _meta = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        // Holopad UI and bound user interface messages
-        SubscribeLocalEvent<HolopadComponent, BeforeActivatableUIOpenEvent>(OnUIOpen);
-        SubscribeLocalEvent<HolopadComponent, HolopadStartNewCallMessage>(OnHolopadStartNewCall);
-        SubscribeLocalEvent<HolopadComponent, HolopadAnswerCallMessage>(OnHolopadAnswerCall);
-        SubscribeLocalEvent<HolopadComponent, HolopadEndCallMessage>(OnHolopadEndCall);
-        SubscribeLocalEvent<HolopadComponent, HolopadActivateProjectorMessage>(OnHolopadActivateProjector);
-        SubscribeLocalEvent<HolopadComponent, HolopadStartBroadcastMessage>(OnHolopadStartBroadcast);
-        SubscribeLocalEvent<HolopadComponent, HolopadStationAiRequestMessage>(OnHolopadStationAiRequest);
-
-        // Holopad telephone events
-        SubscribeLocalEvent<HolopadComponent, TelephoneStateChangeEvent>(OnTelephoneStateChange);
-        SubscribeLocalEvent<HolopadComponent, TelephoneCallCommencedEvent>(OnHoloCallCommenced);
-        SubscribeLocalEvent<HolopadComponent, TelephoneCallEndedEvent>(OnHoloCallEnded);
-        SubscribeLocalEvent<HolopadComponent, TelephoneMessageSentEvent>(OnTelephoneMessageSent);
-
-        // Networked events
-        SubscribeNetworkEvent<HolopadUserTypingChangedEvent>(OnTypingChanged);
-
-        // Component start/shutdown events
-        SubscribeLocalEvent<HolopadComponent, ComponentInit>(OnHolopadInit);
-        SubscribeLocalEvent<HolopadComponent, ComponentShutdown>(OnHolopadShutdown);
-        SubscribeLocalEvent<HolopadUserComponent, ComponentInit>(OnHolopadUserInit);
-        SubscribeLocalEvent<HolopadUserComponent, ComponentShutdown>(OnHolopadUserShutdown);
-
-        // Misc events
-        SubscribeLocalEvent<HolopadUserComponent, EmoteEvent>(OnEmote);
-        SubscribeLocalEvent<HolopadUserComponent, JumpToCoreEvent>(OnJumpToCore);
-        SubscribeLocalEvent<HolopadComponent, GetVerbsEvent<AlternativeVerb>>(AddToggleProjectorVerb);
-        SubscribeLocalEvent<HolopadComponent, EntRemovedFromContainerMessage>(OnAiRemove);
-        SubscribeLocalEvent<HolopadComponent, MapUidChangedEvent>(OnMapUidChanged);
-        SubscribeLocalEvent<HolopadComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<HolopadComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<HolopadUserComponent, MobStateChangedEvent>(OnMobStateChanged);
-    }
-
     #region: Holopad UI bound user interface messages
 
+    [SubscribeLocalEvent]
     private void OnUIOpen(Entity<HolopadComponent> entity, ref BeforeActivatableUIOpenEvent args)
     {
         UpdateUIState(entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadStartNewCall(Entity<HolopadComponent> source, ref HolopadStartNewCallMessage args)
     {
         if (IsHolopadControlLocked(source, args.Actor))
@@ -104,9 +66,10 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             return;
 
         LinkHolopadToUser(source, args.Actor);
-        _telephoneSystem.CallTelephone((source, sourceTelephone), (receiver, receiverTelephone), args.Actor);
+        _telephone.CallTelephone((source, sourceTelephone), (receiver, receiverTelephone), args.Actor);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadAnswerCall(Entity<HolopadComponent> receiver, ref HolopadAnswerCallMessage args)
     {
         if (IsHolopadControlLocked(receiver, args.Actor))
@@ -115,35 +78,36 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         if (!TryComp<TelephoneComponent>(receiver, out var receiverTelephone))
             return;
 
-        if (TryComp<StationAiHeldComponent>(args.Actor, out var userAiHeld))
+        if (HasComp<StationAiHeldComponent>(args.Actor))
         {
             var source = GetLinkedHolopads(receiver).FirstOrNull();
 
-            if (source != null)
+            if (source is null)
+                return;
+
+            // Close any AI request windows
+            if (_stationAi.TryGetCore(args.Actor, out var stationAiCore))
+                _ui.CloseUi(receiver.Owner, HolopadUiKey.AiRequestWindow, args.Actor);
+
+            // Try to warn the AI if the source of the call is out of its range
+            if (TryComp<TelephoneComponent>(stationAiCore, out var stationAiTelephone) &&
+                TryComp<TelephoneComponent>(source, out var sourceTelephone) &&
+                !_telephone.IsSourceInRangeOfReceiver((stationAiCore.Owner, stationAiTelephone), (source.Value.Owner, sourceTelephone)))
             {
-                // Close any AI request windows
-                if (_stationAiSystem.TryGetCore(args.Actor, out var stationAiCore))
-                    _userInterfaceSystem.CloseUi(receiver.Owner, HolopadUiKey.AiRequestWindow, args.Actor);
-
-                // Try to warn the AI if the source of the call is out of its range
-                if (TryComp<TelephoneComponent>(stationAiCore, out var stationAiTelephone) &&
-                    TryComp<TelephoneComponent>(source, out var sourceTelephone) &&
-                    !_telephoneSystem.IsSourceInRangeOfReceiver((stationAiCore.Owner, stationAiTelephone), (source.Value.Owner, sourceTelephone)))
-                {
-                    _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-reach-holopad"), receiver, args.Actor);
-                    return;
-                }
-
-                ActivateProjector(source.Value, args.Actor);
+                _popup.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-reach-holopad"), receiver, args.Actor);
+                return;
             }
 
+            ActivateProjector(source.Value, args.Actor);
+
             return;
         }
 
         LinkHolopadToUser(receiver, args.Actor);
-        _telephoneSystem.AnswerTelephone((receiver, receiverTelephone), args.Actor);
+        _telephone.AnswerTelephone((receiver, receiverTelephone), args.Actor);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadEndCall(Entity<HolopadComponent> entity, ref HolopadEndCallMessage args)
     {
         if (!TryComp<TelephoneComponent>(entity, out var entityTelephone))
@@ -152,39 +116,41 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         if (IsHolopadControlLocked(entity, args.Actor))
             return;
 
-        _telephoneSystem.EndTelephoneCalls((entity, entityTelephone));
+        _telephone.EndTelephoneCalls((entity, entityTelephone));
 
         // If the user is an AI, end all calls originating from its
         // associated core to ensure that any broadcasts will end
-        if (!TryComp<StationAiHeldComponent>(args.Actor, out var stationAiHeld) ||
-            !_stationAiSystem.TryGetCore(args.Actor, out var stationAiCore))
+        if (!HasComp<StationAiHeldComponent>(args.Actor) ||
+            !_stationAi.TryGetCore(args.Actor, out var stationAiCore))
             return;
 
         if (TryComp<TelephoneComponent>(stationAiCore, out var telephone))
-            _telephoneSystem.EndTelephoneCalls((stationAiCore, telephone));
+            _telephone.EndTelephoneCalls((stationAiCore, telephone));
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadActivateProjector(Entity<HolopadComponent> entity, ref HolopadActivateProjectorMessage args)
     {
         ActivateProjector(entity, args.Actor);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadStartBroadcast(Entity<HolopadComponent> source, ref HolopadStartBroadcastMessage args)
     {
         if (IsHolopadControlLocked(source, args.Actor) || IsHolopadBroadcastOnCoolDown(source))
             return;
 
-        if (!_accessReaderSystem.IsAllowed(args.Actor, source))
+        if (!_accessReader.IsAllowed(args.Actor, source))
             return;
 
         // AI broadcasting
-        if (TryComp<StationAiHeldComponent>(args.Actor, out var stationAiHeld))
+        if (HasComp<StationAiHeldComponent>(args.Actor))
         {
             // Link the AI to the holopad they are broadcasting from
             LinkHolopadToUser(source, args.Actor);
 
-            if (!_stationAiSystem.TryGetCore(args.Actor, out var stationAiCore) ||
-                stationAiCore.Comp?.RemoteEntity == null ||
+            if (!_stationAi.TryGetCore(args.Actor, out var stationAiCore) ||
+                stationAiCore.Comp?.RemoteEntity is null ||
                 !TryComp<HolopadComponent>(stationAiCore, out var stationAiCoreHolopad))
                 return;
 
@@ -192,8 +158,8 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             ExecuteBroadcast((stationAiCore, stationAiCoreHolopad), args.Actor);
 
             // Switch the AI's perspective from free roaming to the target holopad
-            _xformSystem.SetCoordinates(stationAiCore.Comp.RemoteEntity.Value, Transform(source).Coordinates);
-            _stationAiSystem.SwitchRemoteEntityMode(stationAiCore, false);
+            _xform.SetCoordinates(stationAiCore.Comp.RemoteEntity.Value, Transform(source).Coordinates);
+            _stationAi.SwitchRemoteEntityMode(stationAiCore, false);
 
             return;
         }
@@ -202,6 +168,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         ExecuteBroadcast(source, args.Actor);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadStationAiRequest(Entity<HolopadComponent> entity, ref HolopadStationAiRequestMessage args)
     {
         if (IsHolopadControlLocked(entity, args.Actor))
@@ -219,30 +186,31 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             var receiver = new Entity<TelephoneComponent>(receiverUid, receiverTelephone);
 
             // Check if the core can reach the call source, rather than the other way around
-            if (!_telephoneSystem.IsSourceAbleToReachReceiver(receiver, source))
+            if (!_telephone.IsSourceAbleToReachReceiver(receiver, source))
                 continue;
 
-            if (_telephoneSystem.IsTelephoneEngaged(receiver))
+            if (_telephone.IsTelephoneEngaged(receiver))
                 continue;
 
             reachableAiCores.Add((receiverUid, receiverTelephone));
 
-            if (!_stationAiSystem.TryGetHeld((receiver, receiverStationAiCore), out var insertedAi))
+            if (!_stationAi.TryGetHeld((receiver, receiverStationAiCore), out var insertedAi))
                 continue;
 
-            if (_userInterfaceSystem.TryOpenUi(receiverUid, HolopadUiKey.AiRequestWindow, insertedAi.Value))
+            if (_ui.TryOpenUi(receiverUid, HolopadUiKey.AiRequestWindow, insertedAi.Value))
                 LinkHolopadToUser(entity, args.Actor);
         }
 
         // Ignore range so that holopads that ignore other devices on the same grid can request the AI
         var options = new TelephoneCallOptions { IgnoreRange = true };
-        _telephoneSystem.BroadcastCallToTelephones(source, reachableAiCores, args.Actor, options);
+        _telephone.BroadcastCallToTelephones(source, reachableAiCores, args.Actor, options);
     }
 
     #endregion
 
     #region: Holopad telephone events
 
+    [SubscribeLocalEvent]
     private void OnTelephoneStateChange(Entity<HolopadComponent> holopad, ref TelephoneStateChangeEvent args)
     {
         // Update holopad visual and ambient states
@@ -265,28 +233,31 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         UpdateUIState(holopad);
     }
 
+    [SubscribeLocalEvent]
     private void OnHoloCallCommenced(Entity<HolopadComponent> source, ref TelephoneCallCommencedEvent args)
     {
-        if (source.Comp.Hologram == null)
+        if (source.Comp.Hologram is null)
             GenerateHologram(source);
 
-        if (TryComp<HolopadComponent>(args.Receiver, out var receivingHolopad) && receivingHolopad.Hologram == null)
+        if (TryComp<HolopadComponent>(args.Receiver, out var receivingHolopad) && receivingHolopad.Hologram is null)
             GenerateHologram((args.Receiver, receivingHolopad));
 
         // Re-link the user to refresh the sprite data
         LinkHolopadToUser(source, source.Comp.User);
     }
 
+    [SubscribeLocalEvent]
     private void OnHoloCallEnded(Entity<HolopadComponent> entity, ref TelephoneCallEndedEvent args)
     {
         if (!TryComp<StationAiCoreComponent>(entity, out var stationAiCore))
             return;
 
         // Auto-close the AI request window
-        if (_stationAiSystem.TryGetHeld((entity, stationAiCore), out var insertedAi))
-            _userInterfaceSystem.CloseUi(entity.Owner, HolopadUiKey.AiRequestWindow, insertedAi);
+        if (_stationAi.TryGetHeld((entity, stationAiCore), out var insertedAi))
+            _ui.CloseUi(entity.Owner, HolopadUiKey.AiRequestWindow, insertedAi);
     }
 
+    [SubscribeLocalEvent]
     private void OnTelephoneMessageSent(Entity<HolopadComponent> holopad, ref TelephoneMessageSentEvent args)
     {
         LinkHolopadToUser(holopad, args.MessageSource);
@@ -296,6 +267,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
     #region: Networked events
 
+    [SubscribeNetworkEvent]
     private void OnTypingChanged(HolopadUserTypingChangedEvent ev, EntitySessionEventArgs args)
     {
         var uid = args.SenderSession.AttachedEntity;
@@ -312,10 +284,10 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
             foreach (var receiverHolopad in receiverHolopads)
             {
-                if (receiverHolopad.Comp.Hologram == null)
+                if (receiverHolopad.Comp.Hologram is null)
                     continue;
 
-                _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value, TypingIndicatorVisuals.State, ev.State);
+                _appearance.SetData(receiverHolopad.Comp.Hologram.Value, TypingIndicatorVisuals.State, ev.State);
             }
         }
     }
@@ -324,30 +296,34 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
     #region: Component start/shutdown events
 
+    [SubscribeLocalEvent]
     private void OnHolopadInit(Entity<HolopadComponent> entity, ref ComponentInit args)
     {
-        if (entity.Comp.User != null)
+        if (entity.Comp.User is not null)
             LinkHolopadToUser(entity, entity.Comp.User.Value);
 
         _meta.AddFlag(entity, MetaDataFlags.ExtraTransformEvents);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadUserInit(Entity<HolopadUserComponent> entity, ref ComponentInit args)
     {
         foreach (var linkedHolopad in entity.Comp.LinkedHolopads)
             LinkHolopadToUser(linkedHolopad, entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadShutdown(Entity<HolopadComponent> entity, ref ComponentShutdown args)
     {
-        if (TryComp<TelephoneComponent>(entity, out var telphone) && _telephoneSystem.IsTelephoneEngaged((entity.Owner, telphone)))
-            _telephoneSystem.EndTelephoneCalls((entity, telphone));
+        if (TryComp<TelephoneComponent>(entity, out var telphone) && _telephone.IsTelephoneEngaged((entity.Owner, telphone)))
+            _telephone.EndTelephoneCalls((entity, telphone));
 
         ShutDownHolopad(entity);
         SetHolopadAmbientState(entity, false);
         UpdateAllUIStates();
     }
 
+    [SubscribeLocalEvent]
     private void OnHolopadUserShutdown(Entity<HolopadUserComponent> entity, ref ComponentShutdown args)
     {
         foreach (var linkedHolopad in entity.Comp.LinkedHolopads)
@@ -358,6 +334,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
     #region: Misc events
 
+    [SubscribeLocalEvent]
     private void OnEmote(Entity<HolopadUserComponent> entity, ref EmoteEvent args)
     {
         foreach (var linkedHolopad in entity.Comp.LinkedHolopads)
@@ -375,7 +352,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
             foreach (var receiver in receivingHolopads)
             {
-                if (receiver.Comp.Hologram == null)
+                if (receiver.Comp.Hologram is null)
                     continue;
 
                 // Name is based on the physical identity of the user
@@ -383,59 +360,27 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
                 var name = Loc.GetString("holopad-hologram-name", ("name", ent));
 
                 // Force the emote, because if the user can do it, the hologram can too
-                _chatSystem.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, range, false, name, true, true);
+                _chat.TryEmoteWithChat(receiver.Comp.Hologram.Value, args.Emote, range, false, name, true, true);
             }
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnJumpToCore(Entity<HolopadUserComponent> entity, ref JumpToCoreEvent args)
     {
-        if (!TryComp<StationAiHeldComponent>(entity, out var entityStationAiHeld))
+        if (!HasComp<StationAiHeldComponent>(entity))
             return;
 
-        if (!_stationAiSystem.TryGetCore(entity, out var stationAiCore))
+        if (!_stationAi.TryGetCore(entity, out var stationAiCore))
             return;
 
         if (!TryComp<TelephoneComponent>(stationAiCore, out var stationAiCoreTelephone))
             return;
 
-        _telephoneSystem.EndTelephoneCalls((stationAiCore, stationAiCoreTelephone));
-    }
-
-    private void AddToggleProjectorVerb(Entity<HolopadComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanAccess || !args.CanInteract)
-            return;
-
-        if (!this.IsPowered(entity, EntityManager))
-            return;
-
-        if (HasComp<StationAiCoreComponent>(entity))
-            return;
-
-        if (!TryComp<TelephoneComponent>(entity, out var entityTelephone) ||
-            _telephoneSystem.IsTelephoneEngaged((entity, entityTelephone)))
-            return;
-
-        var user = args.User;
-
-        if (!TryComp<StationAiHeldComponent>(user, out var userAiHeld))
-            return;
-
-        if (!_stationAiSystem.TryGetCore(user, out var stationAiCore) ||
-            stationAiCore.Comp?.RemoteEntity == null)
-            return;
-
-        AlternativeVerb verb = new()
-        {
-            Act = () => ActivateProjector(entity, user),
-            Text = Loc.GetString("holopad-activate-projector-verb"),
-            Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
-        };
-
-        args.Verbs.Add(verb);
+        _telephone.EndTelephoneCalls((stationAiCore, stationAiCoreTelephone));
     }
 
+    [SubscribeLocalEvent]
     private void OnAiRemove(Entity<HolopadComponent> entity, ref EntRemovedFromContainerMessage args)
     {
         if (!HasComp<StationAiCoreComponent>(entity))
@@ -444,15 +389,17 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         if (!TryComp<TelephoneComponent>(entity, out var entityTelephone))
             return;
 
-        _telephoneSystem.EndTelephoneCalls((entity, entityTelephone));
+        _telephone.EndTelephoneCalls((entity, entityTelephone));
     }
 
+    [SubscribeLocalEvent]
     private void OnMapUidChanged(Entity<HolopadComponent> entity, ref MapUidChangedEvent args)
     {
         UpdateHolopadControlLockoutStartTime(entity);
         UpdateAllUIStates();
     }
 
+    [SubscribeLocalEvent]
     private void OnPowerChanged(Entity<HolopadComponent> entity, ref PowerChangedEvent args)
     {
         if (args.Powered)
@@ -463,11 +410,13 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         UpdateAllUIStates();
     }
 
+    [SubscribeLocalEvent]
     private void OnAnchorChanged(Entity<HolopadComponent> entity, ref AnchorStateChangedEvent args)
     {
         UpdateAllUIStates();
     }
 
+    [SubscribeLocalEvent]
     private void OnMobStateChanged(Entity<HolopadUserComponent> ent, ref MobStateChangedEvent args)
     {
         if (!HasComp<StationAiHeldComponent>(ent))
@@ -494,7 +443,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             foreach (var holopad in holopadUser.LinkedHolopads)
             {
                 if (TryComp<TelephoneComponent>(holopad, out var telephone) &&
-                    !_xformSystem.InRange((holopad.Owner, Transform(holopad)), (uid, xform), telephone.ListeningRange))
+                    !_xform.InRange((holopad.Owner, Transform(holopad)), (uid, xform), telephone.ListeningRange))
                 {
                     UnlinkHolopadFromUser(holopad, (uid, holopadUser));
                 }
@@ -509,7 +458,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         {
             var uiKey = HasComp<StationAiCoreComponent>(uid) ? HolopadUiKey.AiActionWindow : HolopadUiKey.InteractionWindow;
 
-            if (!_userInterfaceSystem.IsUiOpen((uid, ui), uiKey))
+            if (!_ui.IsUiOpen((uid, ui), uiKey))
                 continue;
 
             UpdateUIState((uid, holopad), telephone);
@@ -535,7 +484,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             if (source == receiver)
                 continue;
 
-            if (!_telephoneSystem.IsSourceInRangeOfReceiver(source, receiver))
+            if (!_telephone.IsSourceInRangeOfReceiver(source, receiver))
                 continue;
 
             var name = MetaData(receiverUid).EntityName;
@@ -547,13 +496,13 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         }
 
         var uiKey = HasComp<StationAiCoreComponent>(entity) ? HolopadUiKey.AiActionWindow : HolopadUiKey.InteractionWindow;
-        _userInterfaceSystem.SetUiState(entity.Owner, uiKey, new HolopadBoundInterfaceState(holopads));
+        _ui.SetUiState(entity.Owner, uiKey, new HolopadBoundInterfaceState(holopads));
     }
 
     private void GenerateHologram(Entity<HolopadComponent> entity)
     {
-        if (entity.Comp.Hologram != null ||
-            entity.Comp.HologramProtoId == null)
+        if (entity.Comp.Hologram is not null ||
+            entity.Comp.HologramProtoId is null)
             return;
 
         var hologramUid = Spawn(entity.Comp.HologramProtoId, Transform(entity).Coordinates);
@@ -571,7 +520,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         if (TryComp<SpeechComponent>(hologramUid, out var hologramSpeech) &&
             TryComp<TelephoneComponent>(entity, out var entityTelephone))
         {
-            _telephoneSystem.SetSpeakerForTelephone((entity, entityTelephone), (hologramUid, hologramSpeech));
+            _telephone.SetSpeakerForTelephone((entity, entityTelephone), (hologramUid, hologramSpeech));
         }
 
         _powerState.SetWorkingState(entity.Owner, true);
@@ -588,7 +537,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
     private void LinkHolopadToUser(Entity<HolopadComponent> entity, EntityUid? user)
     {
-        if (user == null)
+        if (user is null)
         {
             UnlinkHolopadFromUser(entity, null);
             return;
@@ -606,7 +555,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             }
 
             // Assigns the new user in their place
-            holopadUser?.LinkedHolopads.Add(entity);
+            holopadUser.LinkedHolopads.Add(entity);
             entity.Comp.User = user.Value;
         }
 
@@ -621,17 +570,17 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         entity.Comp.User = null;
         SyncHolopadHologramAppearanceWithTarget(entity, null);
 
-        if (user == null)
+        if (user is null)
             return;
 
         user.Value.Comp.LinkedHolopads.Remove(entity);
 
-        if (!user.Value.Comp.LinkedHolopads.Any() &&
-            user.Value.Comp.LifeStage < ComponentLifeStage.Stopping)
-        {
-            _pvs.RemoveGlobalOverride(user.Value);
-            RemComp<HolopadUserComponent>(user.Value);
-        }
+        if (user.Value.Comp.LinkedHolopads.Any() ||
+            user.Value.Comp.LifeStage >= ComponentLifeStage.Stopping)
+            return;
+
+        _pvs.RemoveGlobalOverride(user.Value);
+        RemComp<HolopadUserComponent>(user.Value);
     }
     private void SyncHolopadHologramAppearanceWithTarget(Entity<HolopadComponent> entity, Entity<HolopadUserComponent>? user)
     {
@@ -640,8 +589,8 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             if (!TryComp<HolopadHologramComponent>(linkedHolopad.Comp.Hologram, out var holopadHologram))
                 continue;
 
-            if (user == null)
-                _appearanceSystem.SetData(linkedHolopad.Comp.Hologram.Value, TypingIndicatorVisuals.State, false);
+            if (user is null)
+                _appearance.SetData(linkedHolopad.Comp.Hologram.Value, TypingIndicatorVisuals.State, false);
 
             holopadHologram.LinkedEntity = user;
             Dirty(linkedHolopad.Comp.Hologram.Value, holopadHologram);
@@ -657,16 +606,16 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
 
         // Check if the associated holopad user is an AI
         if (HasComp<StationAiHeldComponent>(entity.Comp.User) &&
-            _stationAiSystem.TryGetCore(entity.Comp.User.Value, out var stationAiCore))
+            _stationAi.TryGetCore(entity.Comp.User.Value, out var stationAiCore))
         {
             // Return the AI eye to free roaming
-            _stationAiSystem.SwitchRemoteEntityMode(stationAiCore, true);
+            _stationAi.SwitchRemoteEntityMode(stationAiCore, true);
 
             // If the AI core is still broadcasting, end its calls
             if (TryComp<TelephoneComponent>(stationAiCore, out var stationAiCoreTelephone) &&
-                _telephoneSystem.IsTelephoneEngaged((stationAiCore.Owner, stationAiCoreTelephone)))
+                _telephone.IsTelephoneEngaged((stationAiCore.Owner, stationAiCoreTelephone)))
             {
-                _telephoneSystem.EndTelephoneCalls((stationAiCore.Owner, stationAiCoreTelephone));
+                _telephone.EndTelephoneCalls((stationAiCore.Owner, stationAiCoreTelephone));
             }
         }
         else if (TryComp<HolopadUserComponent>(entity.Comp.User, out var holopadUser))
@@ -677,18 +626,18 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         Dirty(entity);
     }
 
-    private void ActivateProjector(Entity<HolopadComponent> entity, EntityUid user)
+    protected override void ActivateProjector(Entity<HolopadComponent> entity, EntityUid user)
     {
         if (!TryComp<TelephoneComponent>(entity, out var receiverTelephone))
             return;
 
         var receiver = new Entity<TelephoneComponent>(entity, receiverTelephone);
 
-        if (!TryComp<StationAiHeldComponent>(user, out var userAiHeld))
+        if (!HasComp<StationAiHeldComponent>(user))
             return;
 
-        if (!_stationAiSystem.TryGetCore(user, out var stationAiCore) ||
-            stationAiCore.Comp?.RemoteEntity == null)
+        if (!_stationAi.TryGetCore(user, out var stationAiCore) ||
+            stationAiCore.Comp?.RemoteEntity is null)
             return;
 
         if (!TryComp<TelephoneComponent>(stationAiCore, out var stationAiTelephone))
@@ -700,35 +649,35 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         var source = new Entity<TelephoneComponent>(stationAiCore, stationAiTelephone);
 
         // Check if the AI is unable to activate the projector (unlikely this will ever pass; its just a safeguard)
-        if (!_telephoneSystem.IsSourceInRangeOfReceiver(source, receiver))
+        if (!_telephone.IsSourceInRangeOfReceiver(source, receiver))
         {
-            _popupSystem.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-activate-projector"), receiver, user);
+            _popup.PopupEntity(Loc.GetString("holopad-ai-is-unable-to-activate-projector"), receiver, user);
             return;
         }
 
         // Terminate any calls that the core is hosting and immediately connect to the receiver
-        _telephoneSystem.TerminateTelephoneCalls(source);
+        _telephone.TerminateTelephoneCalls(source);
 
         var callOptions = new TelephoneCallOptions()
         {
             ForceConnect = true,
-            MuteReceiver = true
+            MuteReceiver = true,
         };
 
-        _telephoneSystem.CallTelephone(source, receiver, user, callOptions);
+        _telephone.CallTelephone(source, receiver, user, callOptions);
 
-        if (!_telephoneSystem.IsSourceConnectedToReceiver(source, receiver))
+        if (!_telephone.IsSourceConnectedToReceiver(source, receiver))
             return;
 
         LinkHolopadToUser((stationAiCore, stationAiHolopad), user);
 
         // Switch the AI's perspective from free roaming to the target holopad
-        _xformSystem.SetCoordinates(stationAiCore.Comp.RemoteEntity.Value, Transform(entity).Coordinates);
-        _stationAiSystem.SwitchRemoteEntityMode(stationAiCore, false);
+        _xform.SetCoordinates(stationAiCore.Comp.RemoteEntity.Value, Transform(entity).Coordinates);
+        _stationAi.SwitchRemoteEntityMode(stationAiCore, false);
 
         // Open the holopad UI if it hasn't been opened yet
         if (TryComp<UserInterfaceComponent>(entity, out var entityUserInterfaceComponent))
-            _userInterfaceSystem.OpenUi((entity, entityUserInterfaceComponent), HolopadUiKey.InteractionWindow, user);
+            _ui.OpenUi((entity, entityUserInterfaceComponent), HolopadUiKey.InteractionWindow, user);
     }
 
     private void ExecuteBroadcast(Entity<HolopadComponent> source, EntityUid user)
@@ -737,7 +686,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             return;
 
         var sourceTelephoneEntity = new Entity<TelephoneComponent>(source, sourceTelephone);
-        _telephoneSystem.TerminateTelephoneCalls(sourceTelephoneEntity);
+        _telephone.TerminateTelephoneCalls(sourceTelephoneEntity);
 
         // Find all holopads in range of the source
         var receivers = new HashSet<Entity<TelephoneComponent>>();
@@ -748,7 +697,7 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             var receiverTelephoneEntity = new Entity<TelephoneComponent>(receiver, receiverTelephone);
 
             if (sourceTelephoneEntity == receiverTelephoneEntity ||
-                !_telephoneSystem.IsSourceAbleToReachReceiver(sourceTelephoneEntity, receiverTelephoneEntity))
+                !_telephone.IsSourceAbleToReachReceiver(sourceTelephoneEntity, receiverTelephoneEntity))
                 continue;
 
             // If any holopads in range are on broadcast cooldown, exit
@@ -764,9 +713,9 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
             MuteReceiver = true,
         };
 
-        _telephoneSystem.BroadcastCallToTelephones(sourceTelephoneEntity, receivers, user, options);
+        _telephone.BroadcastCallToTelephones(sourceTelephoneEntity, receivers, user, options);
 
-        if (!_telephoneSystem.IsTelephoneEngaged(sourceTelephoneEntity))
+        if (!_telephone.IsTelephoneEngaged(sourceTelephoneEntity))
             return;
 
         // Link to the user after all the calls have been placed,
@@ -817,11 +766,12 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
         var isDirty = false;
 
         var query = AllEntityQuery<HolopadComponent, TelephoneComponent>();
+
         while (query.MoveNext(out var receiver, out var receiverHolopad, out var receiverTelephone))
         {
             var receiverTelephoneEntity = new Entity<TelephoneComponent>(receiver, receiverTelephone);
 
-            if (!_telephoneSystem.IsSourceInRangeOfReceiver(sourceTelephoneEntity, receiverTelephoneEntity))
+            if (!_telephone.IsSourceInRangeOfReceiver(sourceTelephoneEntity, receiverTelephoneEntity))
                 continue;
 
             if (receiverHolopad.ControlLockoutEndTime > source.Comp.ControlLockoutEndTime ||
@@ -843,9 +793,9 @@ public sealed partial class HolopadSystem : SharedHolopadSystem
     private void SetHolopadAmbientState(Entity<HolopadComponent> entity, bool isEnabled)
     {
         if (TryComp<PointLightComponent>(entity, out var pointLight))
-            _pointLightSystem.SetEnabled(entity, isEnabled, pointLight);
+            _pointLight.SetEnabled(entity, isEnabled, pointLight);
 
         if (TryComp<AmbientSoundComponent>(entity, out var ambientSound))
-            _ambientSoundSystem.SetAmbience(entity, isEnabled, ambientSound);
+            _ambientSound.SetAmbience(entity, isEnabled, ambientSound);
     }
 }
diff --git a/Content.Shared/Holopad/SharedHolopadSystem.cs b/Content.Shared/Holopad/SharedHolopadSystem.cs
index 8029e3f201..568343e540 100644
--- a/Content.Shared/Holopad/SharedHolopadSystem.cs
+++ b/Content.Shared/Holopad/SharedHolopadSystem.cs
@@ -1,17 +1,60 @@
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.Silicons.StationAi;
+using Content.Shared.Telephone;
+using Content.Shared.Verbs;
 using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Shared.Holopad;
 
 public abstract partial class SharedHolopadSystem : EntitySystem
 {
     [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!;
+    [Dependency] private SharedStationAiSystem _stationAi = default!;
+
+    [SubscribeLocalEvent]
+    private void AddToggleProjectorVerb(Entity<HolopadComponent> entity, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanAccess || !args.CanInteract)
+            return;
+
+        if (!_powerReceiver.IsPowered(entity.Owner))
+            return;
+
+        if (HasComp<StationAiCoreComponent>(entity))
+            return;
+
+        // LinkedTelephones is not networked; EndingCall has already cleared its links.
+        if (!TryComp<TelephoneComponent>(entity, out var entityTelephone) ||
+            entityTelephone.CurrentState is TelephoneState.Calling or TelephoneState.Ringing or TelephoneState.InCall)
+            return;
+
+        var user = args.User;
+
+        if (!HasComp<StationAiHeldComponent>(user))
+            return;
+
+        if (!_stationAi.TryGetCore(user, out var stationAiCore) ||
+            stationAiCore.Comp is not { Remote: true, RemoteEntity: not null })
+            return;
+
+        var verb = new AlternativeVerb
+        {
+            Act = () => ActivateProjector(entity, user),
+            Text = Loc.GetString("holopad-activate-projector-verb"),
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/vv.svg.192dpi.png")),
+        };
+
+        args.Verbs.Add(verb);
+    }
 
     public bool IsHolopadControlLocked(Entity<HolopadComponent> entity, EntityUid? user = null)
     {
         if (_timing.CurTime > entity.Comp.ControlLockoutEndTime)
             return false;
 
-        if (entity.Comp.ControlLockoutOwner == null || entity.Comp.ControlLockoutOwner == user)
+        if (entity.Comp.ControlLockoutOwner is null || entity.Comp.ControlLockoutOwner == user)
             return false;
 
         return true;
@@ -24,14 +67,13 @@ public abstract partial class SharedHolopadSystem : EntitySystem
 
     public bool IsHolopadBroadcastOnCoolDown(Entity<HolopadComponent> entity)
     {
-        if (_timing.CurTime > entity.Comp.ControlLockoutCoolDownEndTime)
-            return false;
-
-        return true;
+        return !(_timing.CurTime > entity.Comp.ControlLockoutCoolDownEndTime);
     }
 
     public TimeSpan GetHolopadBroadcastCoolDown(Entity<HolopadComponent> entity)
     {
         return entity.Comp.ControlLockoutCoolDownEndTime - _timing.CurTime;
     }
+
+    protected virtual void ActivateProjector(Entity<HolopadComponent> entity, EntityUid user) { }
 }

From 29668eb5a326f8fca70a1a8066b54ab8b1da7916 Mon Sep 17 00:00:00 2001
From: Orvex07 <77834935+Orvex07@users.noreply.github.com>
Date: Sat, 3 Oct 2026 16:46:33 +0000
Subject: [PATCH 34/69] Predict swappable instrument verbs and small-minor
 clean up (#46292)

* ref: swappable instrument + loc

* null! -> default!
---
 .../SwappableInstrumentComponent.cs           | 14 ------
 .../Instruments/SwappableInstrumentSystem.cs  | 48 -------------------
 .../SwappableInstrumentComponent.cs           | 16 +++++++
 .../Instruments/SwappableInstrumentSystem.cs  | 43 +++++++++++++++++
 .../instruments/instruments-component.ftl     | 30 ++++++++++++
 .../Fun/Instruments/instrument_keyed.yml      | 10 ++--
 .../Fun/Instruments/instruments_brass.yml     |  4 +-
 .../Instruments/instruments_percussion.yml    | 10 ++--
 .../Fun/Instruments/instruments_string.yml    | 34 ++++++-------
 .../Fun/Instruments/instruments_wind.yml      |  8 ++--
 10 files changed, 122 insertions(+), 95 deletions(-)
 delete mode 100644 Content.Server/Instruments/SwappableInstrumentComponent.cs
 delete mode 100644 Content.Server/Instruments/SwappableInstrumentSystem.cs
 create mode 100644 Content.Shared/Instruments/SwappableInstrumentComponent.cs
 create mode 100644 Content.Shared/Instruments/SwappableInstrumentSystem.cs

diff --git a/Content.Server/Instruments/SwappableInstrumentComponent.cs b/Content.Server/Instruments/SwappableInstrumentComponent.cs
deleted file mode 100644
index f8b2b97a10..0000000000
--- a/Content.Server/Instruments/SwappableInstrumentComponent.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace Content.Server.Instruments;
-
-[RegisterComponent]
-public sealed partial class SwappableInstrumentComponent : Component
-{
-    /// <summary>
-    /// Used to store the different instruments that can be swapped between.
-    /// string = display name of the instrument
-    /// byte 1 = instrument midi program
-    /// byte 2 = instrument midi bank
-    /// </summary>
-    [DataField("instrumentList", required: true)]
-    public Dictionary<string, (byte, byte)> InstrumentList = new();
-}
diff --git a/Content.Server/Instruments/SwappableInstrumentSystem.cs b/Content.Server/Instruments/SwappableInstrumentSystem.cs
deleted file mode 100644
index a86d20c243..0000000000
--- a/Content.Server/Instruments/SwappableInstrumentSystem.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Content.Shared.Instruments;
-using Content.Shared.Popups;
-using Content.Shared.Verbs;
-using Robust.Shared.Player;
-
-namespace Content.Server.Instruments;
-
-public sealed partial class SwappableInstrumentSystem : EntitySystem
-{
-    [Dependency] private SharedInstrumentSystem _sharedInstrument = default!;
-    [Dependency] private SharedPopupSystem _popup = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SwappableInstrumentComponent, GetVerbsEvent<AlternativeVerb>>(AddStyleVerb);
-    }
-
-    private void AddStyleVerb(EntityUid uid, SwappableInstrumentComponent component, GetVerbsEvent<AlternativeVerb> args)
-    {
-        if (!args.CanInteract || !args.CanAccess || component.InstrumentList.Count <= 1)
-            return;
-
-        if (!TryComp<InstrumentComponent>(uid, out var instrument))
-            return;
-
-        var priority = 0;
-        foreach (var entry in component.InstrumentList)
-        {
-            AlternativeVerb selection = new()
-            {
-                Text = entry.Key,
-                Category = VerbCategory.InstrumentStyle,
-                Priority = priority,
-                Act = () =>
-                {
-                    _sharedInstrument.SetInstrumentProgram(uid, instrument, entry.Value.Item1, entry.Value.Item2);
-                    _popup.PopupEntity(Loc.GetString("swappable-instrument-component-style-set", ("style", entry.Key)),
-                        args.User, args.User);
-                }
-            };
-
-            priority--;
-            args.Verbs.Add(selection);
-        }
-    }
-}
diff --git a/Content.Shared/Instruments/SwappableInstrumentComponent.cs b/Content.Shared/Instruments/SwappableInstrumentComponent.cs
new file mode 100644
index 0000000000..6bdaccdd66
--- /dev/null
+++ b/Content.Shared/Instruments/SwappableInstrumentComponent.cs
@@ -0,0 +1,16 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Instruments;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class SwappableInstrumentComponent : Component
+{
+    /// <summary>
+    /// Used to store the different instruments that can be swapped between.
+    /// LocId = localization key for the display name of the instrument
+    /// byte 1 = instrument midi program
+    /// byte 2 = instrument midi bank
+    /// </summary>
+    [DataField(required: true)]
+    public Dictionary<LocId, (byte, byte)> InstrumentList = [];
+}
diff --git a/Content.Shared/Instruments/SwappableInstrumentSystem.cs b/Content.Shared/Instruments/SwappableInstrumentSystem.cs
new file mode 100644
index 0000000000..bfcd32c381
--- /dev/null
+++ b/Content.Shared/Instruments/SwappableInstrumentSystem.cs
@@ -0,0 +1,43 @@
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+
+namespace Content.Shared.Instruments;
+
+public sealed partial class SwappableInstrumentSystem : EntitySystem
+{
+    [Dependency] private SharedInstrumentSystem _sharedInstrument = default!;
+    [Dependency] private SharedPopupSystem _popup = default!;
+
+    [SubscribeLocalEvent]
+    private void AddStyleVerb(Entity<SwappableInstrumentComponent> ent, ref GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess || ent.Comp.InstrumentList.Count <= 1)
+            return;
+
+        SharedInstrumentComponent? instrument = null;
+        if (!_sharedInstrument.ResolveInstrument(ent, ref instrument) || instrument is null)
+            return;
+
+        var user = args.User;
+        var priority = 0;
+        foreach (var entry in ent.Comp.InstrumentList)
+        {
+            var style = Loc.GetString(entry.Key);
+            var selection = new AlternativeVerb
+            {
+                Text = style,
+                Category = VerbCategory.InstrumentStyle,
+                Priority = priority,
+                Act = () =>
+                {
+                    _sharedInstrument.SetInstrumentProgram(ent, instrument, entry.Value.Item1, entry.Value.Item2);
+                    _popup.PopupEntity(Loc.GetString("swappable-instrument-component-style-set", ("style", style)),
+                        user, user);
+                }
+            };
+
+            priority--;
+            args.Verbs.Add(selection);
+        }
+    }
+}
diff --git a/Resources/Locale/en-US/instruments/instruments-component.ftl b/Resources/Locale/en-US/instruments/instruments-component.ftl
index a5ab0bc47a..ed6aea2450 100644
--- a/Resources/Locale/en-US/instruments/instruments-component.ftl
+++ b/Resources/Locale/en-US/instruments/instruments-component.ftl
@@ -52,6 +52,36 @@ instruments-component-menu-midi-min-volume-slider-label = MIDI Input Min Volume
 # SwappableInstrumentComponent
 swappable-instrument-component-style-set = Style set to "{$style}"
 
+swappable-instrument-style-electro = Electro
+swappable-instrument-style-bubbles = Bubbles
+swappable-instrument-style-square = Square
+swappable-instrument-style-standard = Standard
+swappable-instrument-style-tango = Tango
+swappable-instrument-style-soprano = Soprano
+swappable-instrument-style-alto = Alto
+swappable-instrument-style-tenor = Tenor
+swappable-instrument-style-baritone = Baritone
+swappable-instrument-style-clean = Clean
+swappable-instrument-style-jazz = Jazz
+swappable-instrument-style-muted = Muted
+swappable-instrument-style-fingered = Fingered
+swappable-instrument-style-pick = Pick
+swappable-instrument-style-slap = Slap
+swappable-instrument-style-slap-extra-funky = Slap (XTra Funky)
+swappable-instrument-style-fretless = Fretless
+swappable-instrument-style-overdrive = Overdrive
+swappable-instrument-style-distortion = Distortion
+swappable-instrument-style-harmonics = Harmonics
+swappable-instrument-style-nylon = Nylon
+swappable-instrument-style-steel = Steel
+swappable-instrument-style-classical = Classical
+swappable-instrument-style-bluegrass = Bluegrass
+swappable-instrument-style-aah = Aah
+swappable-instrument-style-ooh = Ooh
+swappable-instrument-style-kweh = Kweh
+swappable-instrument-style-waa = Waa
+swappable-instrument-style-wah = Wah
+
 instruments-component-menu-midi-channel-acoustic-grand-piano = Acoustic Grand Piano
 instruments-component-menu-midi-channel-bright-acoustic-piano = Bright Acoustic Piano
 instruments-component-menu-midi-channel-electric-grand-piano = Electric Grand Piano
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
index 47cca63b66..81a0dd0a1f 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instrument_keyed.yml
@@ -16,9 +16,9 @@
     program: 62
   - type: SwappableInstrument
     instrumentList:
-      "Electro": {62: 0} #i needed generic sounding synth presets, sue me
-      "Bubbles": {63: 0}
-      "Square": {80: 0}
+      swappable-instrument-style-electro: {62: 0} #i needed generic sounding synth presets, sue me
+      swappable-instrument-style-bubbles: {63: 0}
+      swappable-instrument-style-square: {80: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/h_synthesizer.rsi
   - type: StaticPrice
@@ -57,8 +57,8 @@
     program: 21
   - type: SwappableInstrument
     instrumentList:
-      "Standard": {21: 0}
-      "Tango": {23: 0}
+      swappable-instrument-style-standard: {21: 0}
+      swappable-instrument-style-tango: {23: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/accordion.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
index 0de77de232..07eb0b3f12 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_brass.yml
@@ -17,8 +17,8 @@
     program: 56
   - type: SwappableInstrument
     instrumentList:
-      "Standard": {56: 0}
-      "Muted": {59: 0}
+      swappable-instrument-style-standard: {56: 0}
+      swappable-instrument-style-muted: {59: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/trumpet.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
index f3a400eb3a..cce174183d 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
@@ -52,11 +52,11 @@
     program: 52
   - type: SwappableInstrument
     instrumentList:
-      "Aah": {52: 0}
-      "Ooh": {53: 0}
-      "Kweh": {4: 100} # Defined in space-station-14.sf2
-      "Waa": {5: 100} # Defined in space-station-14.sf2
-      "Wah": {6: 100} # Defined in space-station-14.sf2
+      swappable-instrument-style-aah: {52: 0}
+      swappable-instrument-style-ooh: {53: 0}
+      swappable-instrument-style-kweh: {4: 100} # Defined in space-station-14.sf2
+      swappable-instrument-style-waa: {5: 100} # Defined in space-station-14.sf2
+      swappable-instrument-style-wah: {6: 100} # Defined in space-station-14.sf2
   - type: Sprite
     sprite: Objects/Fun/Instruments/microphone.rsi
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
index 90867fa0b8..3d60fe9d7a 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
@@ -28,9 +28,9 @@
     program: 27
   - type: SwappableInstrument
     instrumentList:
-      "Clean": {27: 0}
-      "Jazz": {26: 0}
-      "Muted": {28: 0}
+      swappable-instrument-style-clean: {27: 0}
+      swappable-instrument-style-jazz: {26: 0}
+      swappable-instrument-style-muted: {28: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/eguitar.rsi
 
@@ -44,10 +44,10 @@
     program: 33
   - type: SwappableInstrument
     instrumentList:
-      "Fingered": {33: 0}
-      "Pick": {34: 0}
-      "Slap": {36: 0}
-      "Slap (XTra Funky)": {37: 0}
+      swappable-instrument-style-fingered: {33: 0}
+      swappable-instrument-style-pick: {34: 0}
+      swappable-instrument-style-slap: {36: 0}
+      swappable-instrument-style-slap-extra-funky: {37: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/bassguitar.rsi
 
@@ -61,9 +61,9 @@
     program: 35
   - type: SwappableInstrument
     instrumentList:
-      "Fretless": {35: 0}
-      "Slap": {36: 0}
-      "Slap (XTra Funky)": {37: 0}
+      swappable-instrument-style-fretless: {35: 0}
+      swappable-instrument-style-slap: {36: 0}
+      swappable-instrument-style-slap-extra-funky: {37: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/bassguitarfretless.rsi
     state: icon
@@ -90,9 +90,9 @@
     program: 29
   - type: SwappableInstrument
     instrumentList:
-      "Overdrive": {29: 0}
-      "Distortion": {30: 0}
-      "Harmonics": {31: 0}
+      swappable-instrument-style-overdrive: {29: 0}
+      swappable-instrument-style-distortion: {30: 0}
+      swappable-instrument-style-harmonics: {31: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/rockguitar.rsi
   - type: MeleeWeapon
@@ -118,8 +118,8 @@
     program: 24
   - type: SwappableInstrument
     instrumentList:
-      "Nylon": {24: 0}
-      "Steel": {25: 0}
+      swappable-instrument-style-nylon: {24: 0}
+      swappable-instrument-style-steel: {25: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/guitar.rsi
   - type: Wieldable
@@ -188,8 +188,8 @@
     program: 40
   - type: SwappableInstrument
     instrumentList:
-      "Classical": {40: 0}
-      "Bluegrass": {110: 0}
+      swappable-instrument-style-classical: {40: 0}
+      swappable-instrument-style-bluegrass: {110: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/violin.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
index f95ab343ea..ed2058dce4 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml
@@ -17,10 +17,10 @@
     program: 66
   - type: SwappableInstrument
     instrumentList:
-      "Soprano": {64: 0}
-      "Alto": {65: 0}
-      "Tenor": {66: 0}
-      "Baritone": {67: 0}
+      swappable-instrument-style-soprano: {64: 0}
+      swappable-instrument-style-alto: {65: 0}
+      swappable-instrument-style-tenor: {66: 0}
+      swappable-instrument-style-baritone: {67: 0}
   - type: Sprite
     sprite: Objects/Fun/Instruments/saxophone.rsi
   - type: Extractable

From e39cd127d932898917f3a8a113531cfa4aab5296 Mon Sep 17 00:00:00 2001
From: qwerltaz <69696513+qwerltaz@users.noreply.github.com>
Date: Sat, 3 Oct 2026 19:17:59 +0000
Subject: [PATCH 35/69] fix some station events targeting off-station grids
 (#45813)

* fix vent critters spawning off station

* I polish the code

* add utility to get entities ONLY on the station. use in vent critters rule.

* fix station events affecting outside grids

* better argument names for GetEntitiesWithComponentOnStation

* BreakerFlipRule

* \n

* fix doc in GetEntitiesWithComponentOnStation

* keep the comments

* remove BreakerFlipRuleComponent Blacklist

* minor cleanup

* review

* format

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Station/Systems/ServerStationSystem.cs    | 188 +++++-------
 .../Components/BreakerFlipRuleComponent.cs    |   9 +-
 .../Components/GasLeakRuleComponent.cs        |  12 -
 .../Components/SolarFlareRuleComponent.cs     |  14 +
 .../StationEvents/Events/BreakerFlipRule.cs   |  22 +-
 .../StationEvents/Events/GasLeakRule.cs       |  61 ++--
 .../Events/PowerGridCheckRule.cs              | 278 +++++++++---------
 .../Events/RandomEntityStorageSpawnRule.cs    |  22 +-
 .../StationEvents/Events/SolarFlareRule.cs    |  37 ++-
 .../StationEvents/Events/VentClogRule.cs      |  16 +-
 .../StationEvents/Events/VentCrittersRule.cs  |  50 ++--
 .../StationEvents/Events/VentHordeRule.cs     |  31 +-
 Resources/Prototypes/GameRules/events.yml     |   3 -
 13 files changed, 319 insertions(+), 424 deletions(-)

diff --git a/Content.Server/Station/Systems/ServerStationSystem.cs b/Content.Server/Station/Systems/ServerStationSystem.cs
index bdd2768ddb..f1d20624d3 100644
--- a/Content.Server/Station/Systems/ServerStationSystem.cs
+++ b/Content.Server/Station/Systems/ServerStationSystem.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Atmos.EntitySystems;
@@ -311,6 +310,53 @@ public sealed partial class ServerStationSystem : Shared.Station.Systems.Station
         QueueDel(station);
     }
 
+    /// <summary>
+    /// Get entities with <see cref="TComponent"/> on a random event-eligible station's largest grid.
+    /// </summary>
+    /// <param name="onlyAnchored">Whether to only get anchored entities.
+    /// Good check for air vents, bad for containers like crates.</param>
+    /// <returns>All matching entities.</returns>
+    public HashSet<Entity<TComponent>> GetEntitiesWithComponentOnStation<TComponent>(bool onlyAnchored)
+        where TComponent : IComponent
+    {
+        return GetEntitiesWithComponentOnStation<TComponent>(onlyAnchored, out _);
+    }
+
+    /// <param name="station">The station picked to search for the entities.</param>
+    /// <inheritdoc cref="GetEntitiesWithComponentOnStation{TComponent}(bool)" />
+    public HashSet<Entity<TComponent>> GetEntitiesWithComponentOnStation<TComponent>(bool onlyAnchored,
+        out Entity<StationDataComponent>? station)
+        where TComponent : IComponent
+    {
+        HashSet<Entity<TComponent>> entities = [];
+
+        if (!TryGetRandomStation<StationEventEligibleComponent>(out var eligibleStation))
+        {
+            station = null;
+            return entities;
+        }
+
+        station = (eligibleStation.Value.Owner, eligibleStation.Value.Comp1);
+
+        var grid = GetLargestGrid(station.Value.Owner);
+        if (grid is null)
+            return entities;
+
+        var locations = EntityQueryEnumerator<TComponent, TransformComponent>();
+        while (locations.MoveNext(out var uid, out var component, out var transform))
+        {
+            if (onlyAnchored && !transform.Anchored)
+                continue;
+
+            if (transform.GridUid != grid)
+                continue;
+
+            entities.Add((uid, component));
+        }
+
+        return entities;
+    }
+
     /// <inheritdoc/>
     public override bool TryFindRandomTileOnStation(Entity<StationDataComponent> station,
         out Vector2i tile,
@@ -319,89 +365,40 @@ public sealed partial class ServerStationSystem : Shared.Station.Systems.Station
         int numAttempts = 10)
     {
         tile = default;
-        targetCoords = EntityCoordinates.Invalid;
         targetGrid = null;
+        targetCoords = EntityCoordinates.Invalid;
 
-        // Weight grid choice by tilecount
-        var totalTiles = 0;
-        var grids = new List<(Entity<MapGridComponent> Entity, int Count, List<TileRef> Tiles)>();
-        foreach (var possibleTarget in station.Comp.Grids)
-        {
-            if (!GridQuery.TryComp(possibleTarget, out var comp))
-                continue;
-
-            // Get the tile count for the given grid.
-            var tileCount = Map.GetFilledTileCount((possibleTarget, comp));
-
-            // Just to be sure, no empty elements.
-            if (tileCount > 0)
-            {
-                grids.Add(((possibleTarget, comp), tileCount, new()));
-                totalTiles += tileCount;
-            }
-        }
-
-        if (grids.Count == 0)
+        var targetGridMaybe = GetLargestGrid(station.Owner);
+        if (targetGridMaybe is null)
             return false;
 
-        for (var i = 0; i < numAttempts; i++)
+        if (!TryComp<MapGridComponent>(targetGridMaybe.Value, out var comp))
+            return false;
+
+        targetGrid = (targetGridMaybe.Value, comp);
+        var grid = targetGrid.Value;
+
+        var gridTiles = Map.GetAllTiles(grid, grid.Comp).ToList();
+        var totalTiles = gridTiles.Count;
+        if (totalTiles == 0)
+            return false;
+
+        for (var i = 0; i < numAttempts && totalTiles > 0; i++)
         {
             // Find random tile within list.
             var nextTileIndex = Random.Next(totalTiles);
-            TileRef? randomTileRef = null;
-            var startIndex = 0;
-            for (int j = 0; j < grids.Count; j++)
-            {
-                var grid = grids[j];
-                // If the index is in this particular grid, find it and remove the tile to prevent selecting it twice.
-                if (nextTileIndex >= startIndex + grid.Count)
-                {
-                    startIndex += grid.Count;
-                    continue;
-                }
-
-                targetGrid = grid.Entity;
-
-                // Empty list: hasn't been queried yet - get our tiles.
-                if (grid.Tiles.Count <= 0)
-                {
-                    grid.Tiles = Map.GetAllTiles(targetGrid.Value, targetGrid.Value.Comp).ToList();
-
-                    // Actual list count doesn't match expected count (a bug - return failure).
-                    Debug.Assert(grid.Tiles.Count == grid.Count);
-                    if (grid.Tiles.Count != grid.Count)
-                        return false;
-                }
-
-                var ourTileIndex = nextTileIndex - startIndex;
-                randomTileRef = grid.Tiles[ourTileIndex];
-                grid.Tiles.RemoveSwap(ourTileIndex);
-                grid.Count--;
-                totalTiles--;
-
-                // Empty list, remove element
-                if (grid.Tiles.Count <= 0)
-                    grids.RemoveSwap(j);
-
-                break;
-            }
-
-            // Out of valid tiles, return early.
-            if (randomTileRef is not { } tileRef)
-                return false;
-
-            // Could not find a grid...
-            if (targetGrid == null)
-                continue;
+            var tileRef = gridTiles[nextTileIndex];
+            gridTiles.RemoveSwap(nextTileIndex);
+            totalTiles--;
 
             // Invalid tile, try again.
-            if (_atmos.IsTileSpace(targetGrid.Value.Owner, Transform(targetGrid.Value).MapUid, tileRef.GridIndices)
-                || _atmos.IsTileAirBlockedCached(targetGrid.Value.Owner, tileRef.GridIndices))
+            if (_atmos.IsTileSpace(grid.Owner, Transform(grid).MapUid, tileRef.GridIndices)
+                || _atmos.IsTileAirBlockedCached(grid.Owner, tileRef.GridIndices))
             {
                 continue;
             }
 
-            targetCoords = Map.GridTileToLocal(targetGrid.Value, targetGrid.Value, tileRef.GridIndices);
+            targetCoords = Map.GridTileToLocal(grid, grid.Comp, tileRef.GridIndices);
             tile = tileRef.GridIndices;
             return true;
         }
@@ -415,92 +412,67 @@ public sealed partial class ServerStationSystem : Shared.Station.Systems.Station
 /// This is the ideal point to add components to it.
 /// </summary>
 [PublicAPI]
-public sealed class StationInitializedEvent : EntityEventArgs
+public sealed class StationInitializedEvent(EntityUid station) : EntityEventArgs
 {
     /// <summary>
     /// Station this event is for.
     /// </summary>
-    public EntityUid Station;
-
-    public StationInitializedEvent(EntityUid station)
-    {
-        Station = station;
-    }
+    public EntityUid Station = station;
 }
 
 /// <summary>
 /// Directed event fired on a station when a grid becomes a member of the station.
 /// </summary>
 [PublicAPI]
-public sealed class StationGridAddedEvent : EntityEventArgs
+public sealed class StationGridAddedEvent(EntityUid gridId, EntityUid station, bool isSetup) : EntityEventArgs
 {
     /// <summary>
     /// ID of the grid added to the station.
     /// </summary>
-    public EntityUid GridId;
+    public EntityUid GridId = gridId;
 
     /// <summary>
     /// EntityUid of the station this grid was added to.
     /// </summary>
-    public EntityUid Station;
+    public EntityUid Station = station;
 
     /// <summary>
     /// Indicates that the event was fired during station setup,
     /// so that it can be ignored if StationInitializedEvent was already handled.
     /// </summary>
-    public bool IsSetup;
-
-    public StationGridAddedEvent(EntityUid gridId, EntityUid station, bool isSetup)
-    {
-        GridId = gridId;
-        Station = station;
-        IsSetup = isSetup;
-    }
+    public bool IsSetup = isSetup;
 }
 
 /// <summary>
 /// Directed event fired on a station when a grid is no longer a member of the station.
 /// </summary>
 [PublicAPI]
-public sealed class StationGridRemovedEvent : EntityEventArgs
+public sealed class StationGridRemovedEvent(EntityUid gridId, EntityUid station) : EntityEventArgs
 {
     /// <summary>
     /// ID of the grid removed from the station.
     /// </summary>
-    public EntityUid GridId;
+    public EntityUid GridId = gridId;
 
     /// <summary>
     /// EntityUid of the station this grid was added to.
     /// </summary>
-    public EntityUid Station;
-
-    public StationGridRemovedEvent(EntityUid gridId, EntityUid station)
-    {
-        GridId = gridId;
-        Station = station;
-    }
+    public EntityUid Station = station;
 }
 
 /// <summary>
 /// Directed event fired on a station when it is renamed.
 /// </summary>
 [PublicAPI]
-public sealed class StationRenamedEvent : EntityEventArgs
+public sealed class StationRenamedEvent(string oldName, string newName) : EntityEventArgs
 {
     /// <summary>
     /// Prior name of the station.
     /// </summary>
-    public string OldName;
+    public string OldName = oldName;
 
     /// <summary>
     /// New name of the station.
     /// </summary>
-    public string NewName;
-
-    public StationRenamedEvent(string oldName, string newName)
-    {
-        OldName = oldName;
-        NewName = newName;
-    }
+    public string NewName = newName;
 }
-
diff --git a/Content.Server/StationEvents/Components/BreakerFlipRuleComponent.cs b/Content.Server/StationEvents/Components/BreakerFlipRuleComponent.cs
index b0dac4984e..d0105deead 100644
--- a/Content.Server/StationEvents/Components/BreakerFlipRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/BreakerFlipRuleComponent.cs
@@ -4,11 +4,4 @@ using Content.Shared.Whitelist;
 namespace Content.Server.StationEvents.Components;
 
 [RegisterComponent, Access(typeof(BreakerFlipRule))]
-public sealed partial class BreakerFlipRuleComponent : Component
-{
-    /// <summary>
-    /// Blacklist of structures not eligible to trigger this game rule.
-    /// </summary>
-    [DataField]
-    public EntityWhitelist? Blacklist;
-}
+public sealed partial class BreakerFlipRuleComponent : Component;
diff --git a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
index 61ced84812..9dc083fed2 100644
--- a/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/GasLeakRuleComponent.cs
@@ -32,24 +32,12 @@ public sealed partial class GasLeakRuleComponent : Component
     [DataField]
     public float LeakCooldown = 1.0f;
 
-    /// <summary>
-    /// The station where the leak is located.
-    /// </summary>
-    [DataField]
-    public EntityUid TargetStation;
-
     /// <summary>
     /// The specific grid where the leak is located.
     /// </summary>
     [DataField]
     public EntityUid TargetGrid;
 
-    /// <summary>
-    /// The tile coordinates where the leak is located.
-    /// </summary>
-    [DataField]
-    public Vector2i TargetTile;
-
     /// <summary>
     /// The world coordinates of the leak location.
     /// </summary>
diff --git a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
index c8f65aa5e2..fb2785277d 100644
--- a/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
+++ b/Content.Server/StationEvents/Components/SolarFlareRuleComponent.cs
@@ -1,4 +1,6 @@
 using Content.Server.StationEvents.Events;
+using Content.Shared.Doors.Components;
+using Content.Shared.Light.Components;
 using Content.Shared.Radio;
 using Robust.Shared.Prototypes;
 
@@ -40,6 +42,18 @@ public sealed partial class SolarFlareRuleComponent : Component
     [DataField("extraCount")]
     public uint ExtraCount;
 
+    /// <summary>
+    ///    The collection of lights that will be affected by the solar flare event.
+    /// </summary>
+    [DataField]
+    public HashSet<(EntityUid, PoweredLightComponent)> AffectedLights = [];
+
+    /// <summary>
+    ///     The collection of airlocks that will be affected by the solar flare event.
+    /// </summary>
+    [DataField]
+    public HashSet<(EntityUid, AirlockComponent)> AffectedAirlocks = [];
+
     /// <summary>
     ///     Chance light bulb breaks per second during event
     /// </summary>
diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
index bde62c5971..6a51ee7ac7 100644
--- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs
+++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs
@@ -1,10 +1,9 @@
+using System.Linq;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Database;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
-using Content.Shared.Whitelist;
 using JetBrains.Annotations;
 
 namespace Content.Server.StationEvents.Events;
@@ -17,7 +16,6 @@ namespace Content.Server.StationEvents.Events;
 public sealed partial class BreakerFlipRule : StationEventSystem<BreakerFlipRuleComponent>
 {
     [Dependency] private ApcSystem _apcSystem = default!;
-    [Dependency] private EntityWhitelistSystem _whitelist = default!;
 
     protected override void Added(Entity<BreakerFlipRuleComponent, GameRuleComponent> ent, ref GameRuleAddedEvent args)
     {
@@ -34,20 +32,7 @@ public sealed partial class BreakerFlipRule : StationEventSystem<BreakerFlipRule
     {
         base.Started(ent, ref args);
 
-        if (!Station.TryGetRandomStation<StationEventEligibleComponent>(
-            out var chosenStation,
-            uid => _whitelist.IsWhitelistFailOrNull(ent.Comp1.Blacklist, uid)))
-            return;
-
-        var stationApcs = new List<Entity<ApcComponent>>();
-        var query = EntityQueryEnumerator<ApcComponent, TransformComponent>();
-        while (query.MoveNext(out var apcUid, out var apc, out var xform))
-        {
-            if (apc.MainBreakerEnabled && CompOrNull<StationMemberComponent>(xform.GridUid)?.Station == chosenStation.Value.Owner)
-            {
-                stationApcs.Add((apcUid, apc));
-            }
-        }
+        var stationApcs = Station.GetEntitiesWithComponentOnStation<ApcComponent>(true).ToList();
 
         var toDisable = Math.Min(RobustRandom.Next(3, 7), stationApcs.Count);
         if (toDisable == 0)
@@ -61,7 +46,8 @@ public sealed partial class BreakerFlipRule : StationEventSystem<BreakerFlipRule
             _apcSystem.ApcToggleBreaker(apc, apc);
 
             var stateString = apc.Comp.MainBreakerEnabled ? "Enabled" : "Disabled";
-            AdminLogManager.Add(LogType.ItemConfigure, LogImpact.Medium,
+            AdminLogManager.Add(LogType.ItemConfigure,
+                LogImpact.Medium,
                 $"Station event {ToPrettyString(ent):user} set the main breaker state of {ToPrettyString(apc):entity} to {stateString:state}");
         }
     }
diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs
index 82a75501ba..45b7b62154 100644
--- a/Content.Server/StationEvents/Events/GasLeakRule.cs
+++ b/Content.Server/StationEvents/Events/GasLeakRule.cs
@@ -1,4 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Atmos.Piping.Unary.Components;
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
 using Robust.Shared.Audio;
@@ -26,20 +27,30 @@ public sealed partial class GasLeakRule : StationEventSystem<GasLeakRuleComponen
         if (!TryComp<StationEventComponent>(ent, out var stationEvent))
             return;
 
-        // Essentially we'll pick out a target amount of gas to leak, then a rate to leak it at, then work out the duration from there.
-        if (Station.TryFindRandomTile(out gasLeak.TargetTile, out var target, out var grid, out gasLeak.TargetCoords))
+        var stationVents = Station.GetEntitiesWithComponentOnStation<GasVentScrubberComponent>(true);
+        if (stationVents.Count == 0)
         {
-            gasLeak.TargetGrid = grid.Value;
-            gasLeak.TargetStation = target.Value;
-            gasLeak.FoundTile = true;
+            ForceEndSelf((ent, gameRule));
+            return;
+        }
 
-            gasLeak.LeakGas = RobustRandom.Pick(gasLeak.LeakableGases);
-            // Was 50-50 on using normal distribution.
-            var totalGas = RobustRandom.Next(gasLeak.MinimumGas, gasLeak.MaximumGas);
-            gasLeak.MolesPerSecond = RobustRandom.Next(gasLeak.MinimumMolesPerSecond, gasLeak.MaximumMolesPerSecond);
+        var targetVent = RobustRandom.Pick(stationVents);
 
-            if (gameRule.Delay is {} startAfter)
-                stationEvent.EndTime = _timing.CurTime + TimeSpan.FromSeconds(totalGas / gasLeak.MolesPerSecond + startAfter.Next(RobustRandom));
+        gasLeak.FoundTile = true;
+        gasLeak.TargetCoords = Transform(targetVent).Coordinates;
+        gasLeak.TargetGrid = Transform(targetVent).GridUid!.Value;
+
+        // Essentially we'll pick out a target amount of gas to leak, then a rate to leak it at, then work out the duration from there.
+        gasLeak.LeakGas = RobustRandom.Pick(gasLeak.LeakableGases);
+        // Was 50-50 on using normal distribution.
+        var totalGas = RobustRandom.Next(gasLeak.MinimumGas, gasLeak.MaximumGas);
+        gasLeak.MolesPerSecond = RobustRandom.Next(gasLeak.MinimumMolesPerSecond, gasLeak.MaximumMolesPerSecond);
+
+        if (gameRule.Delay is { } startAfter)
+        {
+            stationEvent.EndTime = _timing.CurTime +
+                                   TimeSpan.FromSeconds(totalGas / gasLeak.MolesPerSecond +
+                                                        startAfter.Next(RobustRandom));
         }
 
         // Look technically if you wanted to guarantee a leak you'd do this in announcement but having the announcement
@@ -64,7 +75,7 @@ public sealed partial class GasLeakRule : StationEventSystem<GasLeakRuleComponen
             return;
         }
 
-        var environment = _atmosphere.GetTileMixture(component.TargetGrid, null, component.TargetTile, true);
+        var environment = _atmosphere.GetTileMixture(component.TargetGrid, null, (Vector2i)component.TargetCoords.Position, true);
 
         environment?.AdjustMoles(component.LeakGas, component.LeakCooldown * component.MolesPerSecond);
     }
@@ -77,20 +88,20 @@ public sealed partial class GasLeakRule : StationEventSystem<GasLeakRuleComponen
 
     private void Spark(Entity<GasLeakRuleComponent> rule)
     {
-        if (RobustRandom.NextFloat() <= rule.Comp.SparkChance)
-        {
-            if (!rule.Comp.FoundTile ||
-                rule.Comp.TargetGrid == default ||
-                (!Exists(rule.Comp.TargetGrid) ? EntityLifeStage.Deleted : MetaData(rule.Comp.TargetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
-                !_atmosphere.IsSimulatedGrid(rule.Comp.TargetGrid))
-            {
-                return;
-            }
+        if (!(RobustRandom.NextFloat() <= rule.Comp.SparkChance))
+            return;
 
-            // Don't want it to be so obnoxious as to instantly murder anyone in the area but enough that
-            // it COULD start potentially start a bigger fire.
-            _atmosphere.HotspotExpose(rule.Comp.TargetGrid, rule.Comp.TargetTile, 700f, 50f, null, true);
-            Audio.PlayPvs(new SoundPathSpecifier("/Audio/Effects/sparks4.ogg"), rule.Comp.TargetCoords);
+        if (!rule.Comp.FoundTile ||
+            rule.Comp.TargetGrid == default ||
+            (!Exists(rule.Comp.TargetGrid) ? EntityLifeStage.Deleted : MetaData(rule.Comp.TargetGrid).EntityLifeStage) >= EntityLifeStage.Deleted ||
+            !_atmosphere.IsSimulatedGrid(rule.Comp.TargetGrid))
+        {
+            return;
         }
+
+        // Don't want it to be so obnoxious as to instantly murder anyone in the area but enough that
+        // it COULD start potentially start a bigger fire.
+        _atmosphere.HotspotExpose(rule.Comp.TargetGrid, (Vector2i)rule.Comp.TargetCoords.Position, 700f, 50f, null, true);
+        Audio.PlayPvs(new SoundPathSpecifier("/Audio/Effects/sparks4.ogg"), rule.Comp.TargetCoords);
     }
 }
diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
index 32120202c4..2178b18d36 100644
--- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs
@@ -9,174 +9,160 @@ using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.StationEvents.Events
-{
-    /// <summary>
-    /// Handler for events that force a number of APCs off on a station for a period of time.
-    /// </summary>
-    /// <seealso cref="PowerGridCheckRuleComponent"/>
-    [UsedImplicitly]
-    public sealed partial class PowerGridCheckRule : StationEventSystem<PowerGridCheckRuleComponent>
-    {
-        [Dependency] private ApcSystem _apcSystem = default!;
+namespace Content.Server.StationEvents.Events;
 
-        public override void Initialize()
+/// <summary>
+/// Handler for events that force a number of APCs off on a station for a period of time.
+/// </summary>
+/// <seealso cref="PowerGridCheckRuleComponent"/>
+[UsedImplicitly]
+public sealed partial class PowerGridCheckRule : StationEventSystem<PowerGridCheckRuleComponent>
+{
+    [Dependency] private ApcSystem _apc = default!;
+
+    protected override void Started(Entity<PowerGridCheckRuleComponent, GameRuleComponent> ent, ref GameRuleStartedEvent args)
+    {
+        base.Started(ent, ref args);
+
+        var apcs = Station.GetEntitiesWithComponentOnStation<ApcComponent>(true, out var chosenStation);
+        if (chosenStation is null)
+            return;
+
+        var powerGridCheck = ent.Comp1;
+
+        powerGridCheck.AffectedStation = chosenStation.Value;
+        var largestGrid = Station.GetLargestGrid(chosenStation.Value.AsNullable());
+        if (largestGrid is null)
+            return;
+
+        foreach (var apcUid in apcs)
         {
-            base.Initialize();
-            SubscribeLocalEvent<PowerGridCheckNotifyComponent, ComponentStartup>(OnApcStartup);
-            SubscribeLocalEvent<PowerGridCheckNotifyComponent, ApcToggleMainBreakerAttemptEvent>(OnApcToggleMainBreaker);
+            if (!apcUid.Comp.MainBreakerEnabled)
+                continue;
+
+            var apcTransform = Transform(apcUid);
+            if (apcTransform.GridUid != largestGrid)
+                continue;
+
+            powerGridCheck.Powered.Add(apcUid);
         }
 
-        protected override void Started(Entity<PowerGridCheckRuleComponent, GameRuleComponent> ent, ref GameRuleStartedEvent args)
+        RobustRandom.Shuffle(powerGridCheck.Powered);
+
+        powerGridCheck.NumberPerSecond = Math.Max(1, (int)(powerGridCheck.Powered.Count / powerGridCheck.SecondsUntilOff)); // Number of APCs to turn off every second. At least one.
+    }
+
+    /// <summary>
+    /// Check if the entity should be affected by an existing
+    /// PowerGridCheckRuleComponent and if so, turns off the APC.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnApcStartup(EntityUid apcUid, PowerGridCheckNotifyComponent comp, ComponentStartup args)
+    {
+        if (!TryComp<ApcComponent>(apcUid, out var apcComp))
+            return;
+
+        var rule = GetRuleAffectingEntity(apcUid);
+        if (rule == null || !apcComp.MainBreakerEnabled)
+            return;
+
+        _apc.ApcToggleBreaker(apcUid, apcComp);
+        rule.Unpowered.Add(apcUid);
+    }
+
+    [SubscribeLocalEvent]
+    private void OnApcToggleMainBreaker(EntityUid uid, PowerGridCheckNotifyComponent component, ref ApcToggleMainBreakerAttemptEvent args)
+    {
+        args.Cancelled |= GetRuleAffectingEntity(uid) != null;
+    }
+
+    /// <summary>
+    /// Returns the PowerGridCheckRuleComponent affecting the uid, or null if none
+    /// </summary>
+    private PowerGridCheckRuleComponent? GetRuleAffectingEntity(EntityUid uid)
+    {
+        if (!TryComp(uid, out TransformComponent? xform))
+            return null;
+
+        if (!TryComp<StationMemberComponent>(xform.GridUid, out var stationMemberComp))
+            return null;
+
+        var activeRules = AllEntityQuery<PowerGridCheckRuleComponent, ActiveGameRuleComponent>();
+        while (activeRules.MoveNext(out _, out var powerGridRule, out _))
         {
-            base.Started(ent, ref args);
+            if (stationMemberComp.Station != powerGridRule.AffectedStation)
+                continue;
 
-            if (!Station.TryGetRandomStation<StationEventEligibleComponent>(out var chosenStation))
-                return;
-
-            var powerGridCheck = ent.Comp1;
-
-            powerGridCheck.AffectedStation = chosenStation.Value;
-
-            var largestGrid = Station.GetLargestGrid(chosenStation.Value.AsNullable());
+            var largestGrid = Station.GetLargestGrid(powerGridRule.AffectedStation);
 
             if (largestGrid == null)
-                return;
+                continue;
 
-            var query = AllEntityQuery<ApcComponent, TransformComponent>();
-            while (query.MoveNext(out var apcUid, out var apc, out var transform))
-            {
-                if (!apc.MainBreakerEnabled)
-                    continue;
+            if (xform.GridUid != largestGrid.Value)
+                continue;
 
-                if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation.Value.Owner)
-                    continue;
-
-                if (transform.GridUid != largestGrid.Value)
-                    continue;
-
-                powerGridCheck.Powered.Add(apcUid);
-            }
-
-            RobustRandom.Shuffle(powerGridCheck.Powered);
-
-            powerGridCheck.NumberPerSecond = Math.Max(1, (int)(powerGridCheck.Powered.Count / powerGridCheck.SecondsUntilOff)); // Number of APCs to turn off every second. At least one.
+            return powerGridRule;
         }
 
-        /// <summary>
-        /// Check if the entity should be affected by an existing
-        /// PowerGridCheckRuleComponent and if so, turns off the APC.
-        /// </summary>
-        private void OnApcStartup(EntityUid apcUid, PowerGridCheckNotifyComponent comp, ComponentStartup args)
-        {
-            if (!TryComp<ApcComponent>(apcUid, out var apcComp))
-            {
-                return;
-            }
+        return null;
+    }
 
-            PowerGridCheckRuleComponent? rule = GetRuleAffectingEntity(apcUid);
-            if (rule != null && apcComp.MainBreakerEnabled)
-            {
-                _apcSystem.ApcToggleBreaker(apcUid, apcComp);
-                rule.Unpowered.Add(apcUid);
-            }
+    protected override void Ended(Entity<PowerGridCheckRuleComponent> rule, ref GameRuleEndedEvent args)
+    {
+        base.Ended(rule, ref args);
+
+        foreach (var entity in rule.Comp.Unpowered)
+        {
+            if (Deleted(entity))
+                continue;
+
+            if (!TryComp<ApcComponent>(entity, out var apcComponent))
+                continue;
+
+            if (!apcComponent.MainBreakerEnabled)
+                _apc.ApcToggleBreaker(entity, apcComponent);
         }
 
-        private void OnApcToggleMainBreaker(EntityUid uid, PowerGridCheckNotifyComponent component, ref ApcToggleMainBreakerAttemptEvent args)
+        // Can't use the default EndAudio
+        rule.Comp.AnnounceCancelToken?.Cancel();
+        rule.Comp.AnnounceCancelToken = new CancellationTokenSource();
+        Timer.Spawn(3000,
+            () =>
         {
-            args.Cancelled |= GetRuleAffectingEntity(uid) != null;
+            Audio.PlayGlobal(rule.Comp.PowerOnSound, Filter.Broadcast(), true);
+        },
+            rule.Comp.AnnounceCancelToken.Token);
+        rule.Comp.Unpowered.Clear();
+    }
+
+    protected override void ActiveTick(EntityUid uid, PowerGridCheckRuleComponent component, GameRuleComponent gameRule, float frameTime)
+    {
+        base.ActiveTick(uid, component, gameRule, frameTime);
+
+        var updates = 0;
+        component.FrameTimeAccumulator += frameTime;
+        if (component.FrameTimeAccumulator > component.UpdateRate)
+        {
+            updates = (int)(component.FrameTimeAccumulator / component.UpdateRate);
+            component.FrameTimeAccumulator -= component.UpdateRate * updates;
         }
 
-        /// <summary>
-        /// Returns the PowerGridCheckRuleComponent affecting the uid, or null if none
-        /// </summary>
-        private PowerGridCheckRuleComponent? GetRuleAffectingEntity(EntityUid uid)
+        for (var i = 0; i < updates; i++)
         {
-            if (!TryComp(uid, out TransformComponent? xform))
+            if (component.Powered.Count == 0)
+                break;
+
+            var selected = component.Powered.Pop();
+            if (Deleted(selected))
+                continue;
+
+            if (TryComp<ApcComponent>(selected, out var apcComponent))
             {
-                return null;
+                if (apcComponent.MainBreakerEnabled)
+                    _apc.ApcToggleBreaker(selected, apcComponent);
             }
 
-            if (!TryComp<StationMemberComponent>(xform.GridUid, out var stationMemberComp))
-            {
-                return null;
-            }
-
-            var activeRules = AllEntityQuery<PowerGridCheckRuleComponent, ActiveGameRuleComponent>();
-            while (activeRules.MoveNext(out _, out var powerGridRule, out _))
-            {
-                if (stationMemberComp.Station != powerGridRule.AffectedStation)
-                    continue;
-
-                var largestGrid = Station.GetLargestGrid(powerGridRule.AffectedStation);
-
-                if (largestGrid == null)
-                    continue;
-
-                if (xform.GridUid != largestGrid.Value)
-                    continue;
-
-                return powerGridRule;
-            }
-
-            return null;
-        }
-
-        protected override void Ended(Entity<PowerGridCheckRuleComponent> rule, ref GameRuleEndedEvent args)
-        {
-            base.Ended(rule, ref args);
-
-            foreach (var entity in rule.Comp.Unpowered)
-            {
-                if (Deleted(entity))
-                    continue;
-
-                if (TryComp(entity, out ApcComponent? apcComponent))
-                {
-                    if (!apcComponent.MainBreakerEnabled)
-                        _apcSystem.ApcToggleBreaker(entity, apcComponent);
-                }
-            }
-
-            // Can't use the default EndAudio
-            rule.Comp.AnnounceCancelToken?.Cancel();
-            rule.Comp.AnnounceCancelToken = new CancellationTokenSource();
-            Timer.Spawn(3000,
-                () =>
-            {
-                Audio.PlayGlobal(rule.Comp.PowerOnSound, Filter.Broadcast(), true);
-            },
-                rule.Comp.AnnounceCancelToken.Token);
-            rule.Comp.Unpowered.Clear();
-        }
-
-        protected override void ActiveTick(EntityUid uid, PowerGridCheckRuleComponent component, GameRuleComponent gameRule, float frameTime)
-        {
-            base.ActiveTick(uid, component, gameRule, frameTime);
-
-            var updates = 0;
-            component.FrameTimeAccumulator += frameTime;
-            if (component.FrameTimeAccumulator > component.UpdateRate)
-            {
-                updates = (int)(component.FrameTimeAccumulator / component.UpdateRate);
-                component.FrameTimeAccumulator -= component.UpdateRate * updates;
-            }
-
-            for (var i = 0; i < updates; i++)
-            {
-                if (component.Powered.Count == 0)
-                    break;
-
-                var selected = component.Powered.Pop();
-                if (Deleted(selected))
-                    continue;
-                if (TryComp<ApcComponent>(selected, out var apcComponent))
-                {
-                    if (apcComponent.MainBreakerEnabled)
-                        _apcSystem.ApcToggleBreaker(selected, apcComponent);
-                }
-                component.Unpowered.Add(selected);
-            }
+            component.Unpowered.Add(selected);
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
index 16eb40fda4..c2d92e1e6a 100644
--- a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs
@@ -1,7 +1,6 @@
 using Content.Server.StationEvents.Components;
 using Content.Server.Storage.EntitySystems;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
 using Content.Shared.Storage.Components;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
@@ -20,24 +19,17 @@ public sealed partial class RandomEntityStorageSpawnRule : StationEventSystem<Ra
     {
         base.Started(ent, ref args);
 
-        if (!Station.TryGetRandomStation<StationEventEligibleComponent>(out var station))
-            return;
-
         var spawnRule = ent.Comp1;
 
-        var validLockers = new List<(EntityUid, EntityStorageComponent)>();
+        var validLockers = new List<Entity<EntityStorageComponent>>();
         var spawn = Spawn(spawnRule.Prototype, MapCoordinates.Nullspace);
 
-        var query = EntityQueryEnumerator<EntityStorageComponent, TransformComponent>();
-        while (query.MoveNext(out var storageUid, out var storage, out var xform))
+        foreach (var storageEnt in Station.GetEntitiesWithComponentOnStation<EntityStorageComponent>(false))
         {
-            if (Station.GetOwningStation(storageUid, xform) != station.Value.Owner)
+            if (!_entityStorage.CanInsert(spawn, storageEnt, storageEnt.Comp))
                 continue;
 
-            if (!_entityStorage.CanInsert(spawn, storageUid, storage))
-                continue;
-
-            validLockers.Add((storageUid, storage));
+            validLockers.Add(storageEnt);
         }
 
         if (validLockers.Count == 0)
@@ -46,10 +38,8 @@ public sealed partial class RandomEntityStorageSpawnRule : StationEventSystem<Ra
             return;
         }
 
-        var (locker, storageComp) = RobustRandom.Pick(validLockers);
-        if (!_entityStorage.Insert(spawn, locker, storageComp))
-        {
+        var locker = RobustRandom.Pick(validLockers);
+        if (!_entityStorage.Insert(spawn, locker, locker.Comp))
             Del(spawn);
-        }
     }
 }
diff --git a/Content.Server/StationEvents/Events/SolarFlareRule.cs b/Content.Server/StationEvents/Events/SolarFlareRule.cs
index 333483820b..5a5d405d66 100644
--- a/Content.Server/StationEvents/Events/SolarFlareRule.cs
+++ b/Content.Server/StationEvents/Events/SolarFlareRule.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Server.Light.EntitySystems;
 using Content.Server.StationEvents.Components;
 using Content.Shared.Doors.Components;
@@ -25,7 +26,7 @@ public sealed partial class SolarFlareRule : StationEventSystem<SolarFlareRuleCo
 
     [Dependency] private EntityQuery<HeadsetComponent> _headsetQuery;
 
-    private float _effectTimer = 0;
+    private float _effectTimer;
 
     protected override void Started(Entity<SolarFlareRuleComponent, GameRuleComponent> ent, ref GameRuleStartedEvent args)
     {
@@ -36,6 +37,13 @@ public sealed partial class SolarFlareRule : StationEventSystem<SolarFlareRuleCo
             var channel = RobustRandom.Pick(ent.Comp1.ExtraChannels);
             ent.Comp1.AffectedChannels.Add(channel);
         }
+
+        ent.Comp1.AffectedLights = Station.GetEntitiesWithComponentOnStation<PoweredLightComponent>(true)
+            .Select(e => (e.Owner, e.Comp))
+            .ToHashSet();
+        ent.Comp1.AffectedAirlocks = Station.GetEntitiesWithComponentOnStation<AirlockComponent>(true)
+            .Select(e => (e.Owner, e.Comp))
+            .ToHashSet();
     }
 
     protected override void ActiveTick(EntityUid uid, SolarFlareRuleComponent component, GameRuleComponent gameRule, float frameTime)
@@ -43,21 +51,20 @@ public sealed partial class SolarFlareRule : StationEventSystem<SolarFlareRuleCo
         base.ActiveTick(uid, component, gameRule, frameTime);
 
         _effectTimer -= frameTime;
-        if (_effectTimer < 0)
+        if (!(_effectTimer < 0))
+            return;
+
+        _effectTimer += 1;
+        foreach (var light in component.AffectedLights)
         {
-            _effectTimer += 1;
-            var lightQuery = EntityQueryEnumerator<PoweredLightComponent>();
-            while (lightQuery.MoveNext(out var lightEnt, out var light))
-            {
-                if (RobustRandom.Prob(component.LightBreakChancePerSecond))
-                    _poweredLight.TryDestroyBulb(lightEnt, light);
-            }
-            var airlockQuery = EntityQueryEnumerator<AirlockComponent, DoorComponent>();
-            while (airlockQuery.MoveNext(out var airlockEnt, out var airlock, out var door))
-            {
-                if (airlock.AutoClose && RobustRandom.Prob(component.DoorToggleChancePerSecond))
-                    _door.TryToggleDoor(airlockEnt, door);
-            }
+            if (RobustRandom.Prob(component.LightBreakChancePerSecond))
+                _poweredLight.TryDestroyBulb(light.Item1, light.Item2);
+        }
+
+        foreach (var airlockEnt in component.AffectedAirlocks)
+        {
+            if (airlockEnt.Item2.AutoClose && RobustRandom.Prob(component.DoorToggleChancePerSecond))
+                _door.TryToggleDoor(airlockEnt.Item1);
         }
     }
 
diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs
index 7c469fcdae..cec30901de 100644
--- a/Content.Server/StationEvents/Events/VentClogRule.cs
+++ b/Content.Server/StationEvents/Events/VentClogRule.cs
@@ -6,7 +6,6 @@ using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
@@ -25,9 +24,6 @@ public sealed partial class VentClogRule : StationEventSystem<VentClogRuleCompon
     {
         base.Started(ent, ref args);
 
-        if (!Station.TryGetRandomStation<StationEventEligibleComponent>(out var chosenStation))
-            return;
-
         var ventClog = ent.Comp1;
 
         // TODO: "safe random" for chems. Right now this includes admin chemicals.
@@ -35,13 +31,9 @@ public sealed partial class VentClogRule : StationEventSystem<VentClogRuleCompon
             .Where(x => !x.Abstract)
             .Select(x => new ProtoId<ReagentPrototype>(x.ID)).ToList();
 
-        foreach (var (_, transform) in EntityQuery<GasVentPumpComponent, TransformComponent>())
+        foreach (var ventPump in Station.GetEntitiesWithComponentOnStation<GasVentPumpComponent>(true))
         {
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station != chosenStation.Value.Owner)
-            {
-                continue;
-            }
-
+            var targetCoords = Transform(ventPump).Coordinates;
             var solution = new Solution();
 
             if (!RobustRandom.Prob(0.33f))
@@ -54,10 +46,10 @@ public sealed partial class VentClogRule : StationEventSystem<VentClogRuleCompon
             var quantity = weak ? ventClog.WeakReagentQuantity : ventClog.ReagentQuantity;
             solution.AddReagent(reagent, quantity);
 
-            var foamEnt = Spawn(ChemicalReactionSystem.FoamReaction, transform.Coordinates);
+            var foamEnt = Spawn(ChemicalReactionSystem.FoamReaction, targetCoords);
             var spreadAmount = weak ? ventClog.WeakSpread : ventClog.Spread;
             _smoke.StartSmoke(foamEnt, solution, ventClog.Time, spreadAmount);
-            Audio.PlayPvs(ventClog.Sound, transform.Coordinates);
+            Audio.PlayPvs(ventClog.Sound, targetCoords);
         }
     }
 }
diff --git a/Content.Server/StationEvents/Events/VentCrittersRule.cs b/Content.Server/StationEvents/Events/VentCrittersRule.cs
index da52ad590e..6f8c9ee0e4 100644
--- a/Content.Server/StationEvents/Events/VentCrittersRule.cs
+++ b/Content.Server/StationEvents/Events/VentCrittersRule.cs
@@ -1,8 +1,6 @@
 using Content.Server.StationEvents.Components;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
 using Content.Shared.Storage;
-using Robust.Shared.Map;
 using Robust.Shared.Random;
 
 namespace Content.Server.StationEvents.Events;
@@ -19,45 +17,31 @@ public sealed partial class VentCrittersRule : StationEventSystem<VentCrittersRu
     {
         base.Started(ent, ref args);
 
-        if (!Station.TryGetRandomStation<StationEventEligibleComponent>(out var station))
-        {
-            return;
-        }
-
         var critterRule = ent.Comp1;
-
-        var locations = EntityQueryEnumerator<VentCritterSpawnLocationComponent, TransformComponent>();
-        var validLocations = new List<EntityCoordinates>();
-        while (locations.MoveNext(out _, out _, out var transform))
-        {
-            if (!transform.Anchored)
-                continue;
-
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station.Value.Owner)
-            {
-                validLocations.Add(transform.Coordinates);
-                foreach (var spawn in EntitySpawnCollection.GetSpawns(critterRule.Entries, RobustRandom))
-                {
-                    Spawn(spawn, transform.Coordinates);
-                }
-            }
-        }
-
-        if (critterRule.SpecialEntries.Count == 0 || validLocations.Count == 0)
-        {
+        var validLocations = Station.GetEntitiesWithComponentOnStation<VentCritterSpawnLocationComponent>(true);
+        if (validLocations.Count == 0)
             return;
-        }
 
         // guaranteed spawn
-        var specialEntry = RobustRandom.Pick(critterRule.SpecialEntries);
-        var specialSpawn = RobustRandom.Pick(validLocations);
-        Spawn(specialEntry.PrototypeId, specialSpawn);
+        if (critterRule.SpecialEntries.Count > 0)
+        {
+            var specialEntry = RobustRandom.Pick(critterRule.SpecialEntries);
+            var specialSpawn = Transform(RobustRandom.Pick(validLocations)).Coordinates;
+            Spawn(specialEntry.PrototypeId, specialSpawn);
+        }
 
         foreach (var location in validLocations)
         {
-            foreach (var spawn in EntitySpawnCollection.GetSpawns(critterRule.SpecialEntries, RobustRandom))
+            var spawns = EntitySpawnCollection.GetSpawns(critterRule.Entries, RobustRandom);
+            foreach (var spawn in spawns)
             {
-                Spawn(spawn, location);
+                Spawn(spawn, Transform(location).Coordinates);
+            }
+
+            var specialSpawns = EntitySpawnCollection.GetSpawns(critterRule.SpecialEntries, RobustRandom);
+            foreach (var spawn in specialSpawns)
+            {
+                Spawn(spawn, Transform(location).Coordinates);
             }
         }
     }
diff --git a/Content.Server/StationEvents/Events/VentHordeRule.cs b/Content.Server/StationEvents/Events/VentHordeRule.cs
index 9048b19cfd..a2fdcf2187 100644
--- a/Content.Server/StationEvents/Events/VentHordeRule.cs
+++ b/Content.Server/StationEvents/Events/VentHordeRule.cs
@@ -5,7 +5,6 @@ using Content.Server.VentHorde.Components;
 using Content.Server.VentHorde.Systems;
 using Content.Shared.EntityTable;
 using Content.Shared.GameTicking.Components;
-using Content.Shared.Station.Components;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
@@ -26,8 +25,6 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
     [Dependency] private VentHordeSystem _horde = default!;
     [Dependency] private IGameTiming _timing = default!;
 
-    [Dependency] private EntityQuery<VentHordeSpawnerComponent> _hordeSpawnerQuery;
-
     protected override void Added(Entity<VentHordeRuleComponent, GameRuleComponent> ent, ref GameRuleAddedEvent args)
     {
         var ventHorde = ent.Comp1;
@@ -76,7 +73,7 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
         var ventHorde = ent.Comp1;
 
         // We grab when the gamerule is expected to end and subtract the current time from it to get the duration.
-        var duration = (stationEventComp.EndTime - _timing.CurTime) ?? TimeSpan.Zero;
+        var duration = stationEventComp.EndTime - _timing.CurTime ?? TimeSpan.Zero;
 
         var spawns = _table.GetSpawns(ventHorde.Table);
 
@@ -91,30 +88,8 @@ public sealed partial class VentHordeRule : StationEventSystem<VentHordeRuleComp
 
     private EntityUid? ChooseVent()
     {
-        // Get a station
-        if (!Station.TryGetRandomStation<StationEventEligibleComponent>(out var station))
-        {
-            return null;
-        }
-
-        // Query the possible locations
-        var locations = EntityQueryEnumerator<VentCritterSpawnLocationComponent, TransformComponent>();
-        var validLocations = new List<EntityUid>();
-
-        // Filter to things on the same station
-        while (locations.MoveNext(out var uid, out _, out var transform))
-        {
-            if (!transform.Anchored)
-                continue;
-
-            if (_hordeSpawnerQuery.HasComp(uid))
-                continue;
-
-            if (CompOrNull<StationMemberComponent>(transform.GridUid)?.Station == station.Value.Owner)
-            {
-                validLocations.Add(uid);
-            }
-        }
+        var validLocations = Station.GetEntitiesWithComponentOnStation<VentCritterSpawnLocationComponent>(true);
+        validLocations.RemoveWhere(uid => HasComp<VentHordeSpawnerComponent>(uid));
 
         // Pick one at random
         if (validLocations.Count != 0)
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 65799a5b3d..e00de31ae9 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -158,9 +158,6 @@
     duration: 1
     minimumPlayers: 15
   - type: BreakerFlipRule
-    blacklist:
-      components:
-        - ProtectedGrid
   - type: DynamicRuleCost
     cost: 10
 

From 052523fed8405cfdd252cfbdddccd959d3e87d20 Mon Sep 17 00:00:00 2001
From: takoch12 <56177309+takoch12@users.noreply.github.com>
Date: Sat, 3 Oct 2026 20:27:33 +0000
Subject: [PATCH 36/69] Fix holopad maintenance panel sprite inverting on
 reconnect (#43762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fixed holopad yaml

* removed –d MaintenancePanel lr from GenericVisualizer

* kill WiresVisualLayers

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Prototypes/Entities/Structures/Machines/bombs.yml     | 8 --------
 .../Structures/Wallmounts/WallmountMachines/intercom.yml  | 4 ----
 .../Entities/Structures/Wallmounts/turret_controls.yml    | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
index 3790aba581..a52410e194 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml
@@ -76,10 +76,6 @@
           primed:
             True: { visible: true }
             False: { visible: false }
-        enum.WiresVisualLayers.MaintenancePanel:
-          enum.WiresVisualLayers.MaintenancePanel:
-            True: { visible: true }
-            False: { visible: false }
     - type: PointLight
       color: "#0063C7"
       radius: 1.1
@@ -115,10 +111,6 @@
           primed:
             True: { visible: true }
             False: { visible: false }
-        enum.WiresVisualLayers.MaintenancePanel:
-          enum.WiresVisualLayers.MaintenancePanel:
-            True: { visible: true }
-            False: { visible: false }
     - type: PointLight
       color: "#C7001B"
       radius: 1.1
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
index 86b576496e..4154307080 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/intercom.yml
@@ -93,10 +93,6 @@
         - key_slots
   - type: GenericVisualizer
     visuals:
-      enum.WiresVisualLayers.MaintenancePanel:
-        enum.WiresVisualLayers.MaintenancePanel:
-          True: { visible: true }
-          False: { visible: false }
       enum.PowerDeviceVisuals.Powered:
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: true }
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/turret_controls.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/turret_controls.yml
index eb42900215..139c8bf2ce 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/turret_controls.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/turret_controls.yml
@@ -64,10 +64,6 @@
       visible: false
   - type: GenericVisualizer
     visuals:
-      enum.WiresVisualLayers.MaintenancePanel:
-        enum.WiresVisualLayers.MaintenancePanel:
-          True: { visible: true }
-          False: { visible: false }
       enum.PowerDeviceVisuals.Powered:
         enum.PowerDeviceVisualLayers.Powered:
           True: { visible: true }

From e75037e61c00876a2557647c87032c52a6583207 Mon Sep 17 00:00:00 2001
From: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com>
Date: Sat, 3 Oct 2026 22:18:45 +0000
Subject: [PATCH 37/69] Big sprites cleanup (Part 2) (#46282)

* delete 1

* delete 2

* delete 3

* delete 4

* delete 5

* done!
---
 .../Effects/creampie.rsi/creampie_drone.png   | Bin 558 -> 0 bytes
 .../Effects/creampie.rsi/creampie_engborg.png | Bin 429 -> 0 bytes
 .../creampie.rsi/creampie_hardsuit.png        | Bin 452 -> 0 bytes
 .../Effects/creampie.rsi/creampie_helmet.png  | Bin 386 -> 0 bytes
 .../Effects/creampie.rsi/creampie_janborg.png | Bin 575 -> 0 bytes
 .../Effects/creampie.rsi/creampie_medborg.png | Bin 361 -> 0 bytes
 .../Effects/creampie.rsi/creampie_secborg.png | Bin 372 -> 0 bytes
 .../creampie.rsi/creampie_standborg.png       | Bin 445 -> 0 bytes
 .../creampie.rsi/creampie_xeno_crit.png       | Bin 225 -> 0 bytes
 .../creampie.rsi/creampie_xeno_dead.png       | Bin 225 -> 0 bytes
 .../creampie.rsi/creampie_xeno_sleep.png      | Bin 292 -> 0 bytes
 .../creampie.rsi/creampie_xenomorph.png       | Bin 374 -> 0 bytes
 .../Textures/Effects/creampie.rsi/meta.json   | 132 ++--
 .../Asteroid/goliath.rsi/goliath_alert.png    | Bin 4327 -> 0 bytes
 .../goliath.rsi/goliath_preattack.png         | Bin 4249 -> 0 bytes
 .../Aliens/Asteroid/goliath.rsi/meta.json     | 156 ++---
 .../Asteroid/hivelord.rsi/hivelord_alert.png  | Bin 713 -> 0 bytes
 .../hivelord.rsi/hivelord_alert_nocore.png    | Bin 675 -> 0 bytes
 .../hivelord.rsi/hivelord_dead_nocore.png     | Bin 274 -> 0 bytes
 .../Asteroid/hivelord.rsi/hivelord_nocore.png | Bin 882 -> 0 bytes
 .../Aliens/Asteroid/hivelord.rsi/meta.json    | 106 +--
 .../Textures/Mobs/Animals/goose.rsi/meta.json | 143 +---
 .../Textures/Mobs/Animals/goose.rsi/vomit.png | Bin 2872 -> 0 bytes
 .../Mobs/Animals/goose.rsi/vomit_end.png      | Bin 3587 -> 0 bytes
 .../Mobs/Animals/goose.rsi/vomit_start.png    | Bin 7376 -> 0 bytes
 .../Animals/mothroach/mothroach.rsi/meta.json | 122 ++--
 .../mothroach.rsi/mothroach_lazy.png          | Bin 1293 -> 0 bytes
 .../mothroach.rsi/mothroach_sleep.png         | Bin 1288 -> 0 bytes
 .../Drinks/alco-bottle.rsi/icon_green.png     | Bin 309 -> 0 bytes
 .../Drinks/alco-bottle.rsi/icon_red.png       | Bin 316 -> 0 bytes
 .../Drinks/alco-bottle.rsi/icon_white.png     | Bin 233 -> 0 bytes
 .../Drinks/alco-bottle.rsi/meta.json          |  13 +-
 .../Food/Baked/cake.rsi/brain-large.png       | Bin 997 -> 0 bytes
 .../Consumable/Food/Baked/cake.rsi/meta.json  |  74 +-
 .../Baked/cake.rsi/plate-slice-shading.png    | Bin 330 -> 0 bytes
 .../donut.rsi/jelly-sprinkles-overlay.png     | Bin 349 -> 0 bytes
 .../Consumable/Food/Baked/donut.rsi/meta.json | 320 +++++----
 .../Baked/donut.rsi/sprinkles-overlay.png     | Bin 451 -> 0 bytes
 .../Food/Baked/misc.rsi/honeybar.png          | Bin 504 -> 0 bytes
 .../Consumable/Food/Baked/misc.rsi/meta.json  |   3 -
 .../Food/Baked/pie.rsi/alpha-tart.png         | Bin 370 -> 0 bytes
 .../Consumable/Food/Baked/pie.rsi/meta.json   |  12 -
 .../Baked/pie.rsi/plate-slice-shading.png     | Bin 330 -> 0 bytes
 .../Food/Baked/pie.rsi/plate-tart.png         | Bin 266 -> 0 bytes
 .../Food/Baked/pie.rsi/whippedcream.png       | Bin 204 -> 0 bytes
 .../pizza.rsi/box-bomb-overlay-active.png     | Bin 710 -> 0 bytes
 .../Food/Baked/pizza.rsi/box-bomb-overlay.png | Bin 295 -> 0 bytes
 .../Baked/pizza.rsi/box-messy-overlay.png     | Bin 612 -> 0 bytes
 .../Food/Baked/pizza.rsi/box-tag-overlay.png  | Bin 180 -> 0 bytes
 .../Consumable/Food/Baked/pizza.rsi/meta.json | 506 +++++++-------
 .../Food/Baked/pizza.rsi/plate-pizza.png      | Bin 265 -> 0 bytes
 .../Food/Baked/pizza.rsi/plate-slice.png      | Bin 266 -> 0 bytes
 .../Food/bowl.rsi/ambrosiavulgaris.png        | Bin 415 -> 0 bytes
 .../Consumable/Food/bowl.rsi/meta.json        | 370 +++++-----
 .../Consumable/Food/candy.rsi/bubblegum.png   | Bin 177 -> 0 bytes
 .../Consumable/Food/candy.rsi/meta.json       | 105 ++-
 .../Consumable/Food/condiments.rsi/meta.json  | 280 ++++----
 .../Food/condiments.rsi/packet-mixed.png      | Bin 300 -> 0 bytes
 .../Food/condiments.rsi/packet-trash.png      | Bin 210 -> 0 bytes
 .../Consumable/Food/frozen.rsi/meta.json      | 190 +++---
 .../Consumable/Food/frozen.rsi/nogga.png      | Bin 291 -> 0 bytes
 .../Consumable/Food/frozen.rsi/nogga1.png     | Bin 316 -> 0 bytes
 .../Consumable/Food/frozen.rsi/nogga2.png     | Bin 257 -> 0 bytes
 .../Consumable/Food/frozen.rsi/nogga3.png     | Bin 242 -> 0 bytes
 .../Consumable/Food/ingredients.rsi/meta.json |   6 -
 .../Food/ingredients.rsi/soylent-green.png    | Bin 383 -> 0 bytes
 .../Food/ingredients.rsi/soylent-yellow.png   | Bin 459 -> 0 bytes
 .../Food/meals.rsi/butterbiscuit.png          | Bin 478 -> 0 bytes
 .../Consumable/Food/meals.rsi/butterdog.png   | Bin 367 -> 0 bytes
 .../Food/meals.rsi/butteronastick.png         | Bin 362 -> 0 bytes
 .../Food/meals.rsi/fishandchips.png           | Bin 735 -> 0 bytes
 .../Consumable/Food/meals.rsi/fishfry.png     | Bin 480 -> 0 bytes
 .../Food/meals.rsi/fries-parsnip.png          | Bin 523 -> 0 bytes
 .../Consumable/Food/meals.rsi/lasagna.png     | Bin 556 -> 0 bytes
 .../Consumable/Food/meals.rsi/meta.json       | 274 ++++----
 .../Consumable/Food/meals.rsi/poutine.png     | Bin 578 -> 0 bytes
 .../Consumable/Food/meals.rsi/soydope.png     | Bin 523 -> 0 bytes
 .../Food/meals.rsi/stewedsoymeat.png          | Bin 583 -> 0 bytes
 .../Consumable/Food/meat.rsi/crab-rangoon.png | Bin 454 -> 0 bytes
 .../Consumable/Food/meat.rsi/lizard-tail.png  | Bin 473 -> 0 bytes
 .../Consumable/Food/meat.rsi/meta.json        | 637 +++++++++---------
 .../Consumable/Food/meat.rsi/plate-meat.png   | Bin 259 -> 0 bytes
 .../Consumable/Food/mre.rsi/box-trash.png     | Bin 438 -> 0 bytes
 .../Consumable/Food/mre.rsi/candy-open.png    | Bin 416 -> 0 bytes
 .../Consumable/Food/mre.rsi/cracker-dip.png   | Bin 807 -> 0 bytes
 .../Consumable/Food/mre.rsi/erp-closed.png    | Bin 386 -> 0 bytes
 .../Consumable/Food/mre.rsi/erp-open.png      | Bin 419 -> 0 bytes
 .../Objects/Consumable/Food/mre.rsi/meta.json | 115 +---
 .../Consumable/Food/mre.rsi/mre-closed.png    | Bin 246 -> 0 bytes
 .../Consumable/Food/mre.rsi/mre-hot.png       | Bin 780 -> 0 bytes
 .../Consumable/Food/mre.rsi/mre-open.png      | Bin 378 -> 0 bytes
 .../Consumable/Food/plates.rsi/meta.json      | 105 ++-
 .../Consumable/Food/plates.rsi/tray-trash.png | Bin 468 -> 0 bytes
 .../Consumable/Food/skewer.rsi/meta.json      |  82 +--
 .../Food/skewer.rsi/skewer-meat-alpha.png     | Bin 243 -> 0 bytes
 .../Food/skewer.rsi/skewer-meat.png           | Bin 268 -> 0 bytes
 .../Food/skewer.rsi/skewer-mushroom.png       | Bin 247 -> 0 bytes
 .../Food/skewer.rsi/skewer-snake.png          | Bin 383 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail-cooked.png    | Bin 512 -> 0 bytes
 .../Food/skewer.rsi/skewer-tail.png           | Bin 519 -> 0 bytes
 .../Consumable/Food/snacks.rsi/meta.json      | 633 +++++++++--------
 .../Consumable/Food/snacks.rsi/tatortot.png   | Bin 255 -> 0 bytes
 .../Smokeables/Cigarettes/paper.rsi/meta.json |  37 +-
 .../Cigarettes/paper.rsi/trash-cigpapers.png  | Bin 239 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-a.png  | Bin 248 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-b.png  | Bin 298 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-c.png  | Bin 277 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-ce.png | Bin 278 -> 0 bytes
 .../Devices/cartridge.rsi/cart-chem.png       | Bin 246 -> 0 bytes
 .../Devices/cartridge.rsi/cart-clown.png      | Bin 268 -> 0 bytes
 .../Devices/cartridge.rsi/cart-cmo.png        | Bin 316 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-e.png  | Bin 257 -> 0 bytes
 .../Devices/cartridge.rsi/cart-eye.png        | Bin 301 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-h.png  | Bin 279 -> 0 bytes
 .../Devices/cartridge.rsi/cart-hos.png        | Bin 291 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-j.png  | Bin 278 -> 0 bytes
 .../Devices/cartridge.rsi/cart-lib.png        | Bin 244 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-m.png  | Bin 276 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-mi.png | Bin 275 -> 0 bytes
 .../Devices/cartridge.rsi/cart-ord.png        | Bin 335 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-q.png  | Bin 259 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-rd.png | Bin 312 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/cart-s.png  | Bin 277 -> 0 bytes
 .../Devices/cartridge.rsi/cart-tear.png       | Bin 315 -> 0 bytes
 .../Devices/cartridge.rsi/cart-tox.png        | Bin 299 -> 0 bytes
 .../Devices/cartridge.rsi/insert_overlay.png  | Bin 155 -> 0 bytes
 .../Objects/Devices/cartridge.rsi/meta.json   | 118 +---
 .../Objects/Devices/pinpointer.rsi/meta.json  |  96 +--
 .../Devices/pinpointer.rsi/pinonalert.png     | Bin 555 -> 0 bytes
 .../pinpointer.rsi/pinonalertdirect.png       | Bin 195 -> 0 bytes
 .../Devices/pinpointer.rsi/pinonalertnull.png | Bin 228 -> 0 bytes
 .../pinpointer.rsi/pinondirectlarge.png       | Bin 179 -> 0 bytes
 .../pinpointer.rsi/pinondirectsmall.png       | Bin 157 -> 0 bytes
 .../pinpointer.rsi/pinondirectxtrlarge.png    | Bin 172 -> 0 bytes
 .../pinpointer.rsi/pinpointer-crew.png        | Bin 275 -> 0 bytes
 .../pinpointer.rsi/pinpointer-crewprox.png    | Bin 323 -> 0 bytes
 .../pinpointer.rsi/pinpointer_thief.png       | Bin 434 -> 0 bytes
 .../bureaucracy.rsi/envelope_open_overlay.png | Bin 173 -> 0 bytes
 .../bureaucracy.rsi/envelope_torn_overlay.png | Bin 192 -> 0 bytes
 .../Objects/Misc/bureaucracy.rsi/meta.json    |  44 --
 .../Misc/bureaucracy.rsi/nano_paper.png       | Bin 182 -> 0 bytes
 .../Misc/bureaucracy.rsi/nano_paper_words.png | Bin 630 -> 0 bytes
 .../Misc/bureaucracy.rsi/newspaper.png        | Bin 1170 -> 0 bytes
 .../Misc/bureaucracy.rsi/np_dispenser.png     | Bin 448 -> 0 bytes
 .../bureaucracy.rsi/np_dispenser_empty.png    | Bin 329 -> 0 bytes
 .../Misc/bureaucracy.rsi/paper_plane.png      | Bin 197 -> 0 bytes
 .../bureaucracy.rsi/paper_words-blood.png     | Bin 356 -> 0 bytes
 .../Misc/bureaucracy.rsi/scrap_bloodied.png   | Bin 620 -> 0 bytes
 .../Objects/Misc/module.rsi/ash_plating.png   | Bin 657 -> 0 bytes
 .../Objects/Misc/module.rsi/beaker_holder.png | Bin 307 -> 0 bytes
 .../Objects/Misc/module.rsi/blank_mod.png     | Bin 343 -> 0 bytes
 .../Misc/module.rsi/bluespacearray.png        | Bin 456 -> 0 bytes
 .../Misc/module.rsi/boris_recharging.png      | Bin 675 -> 0 bytes
 .../Objects/Misc/module.rsi/card_mini.png     | Bin 238 -> 0 bytes
 .../Objects/Misc/module.rsi/card_mod.png      | Bin 371 -> 0 bytes
 .../Objects/Misc/module.rsi/cargodisk.png     | Bin 260 -> 0 bytes
 .../Misc/module.rsi/cart_connector.png        | Bin 233 -> 0 bytes
 .../Objects/Misc/module.rsi/cell_con.png      | Bin 285 -> 0 bytes
 .../Misc/module.rsi/cell_con_micro.png        | Bin 214 -> 0 bytes
 .../Objects/Misc/module.rsi/cell_micro.png    | Bin 193 -> 0 bytes
 .../Objects/Misc/module.rsi/cell_mini.png     | Bin 217 -> 0 bytes
 .../Misc/module.rsi/charger_lambda.png        | Bin 157 -> 0 bytes
 .../Objects/Misc/module.rsi/charger_pda.png   | Bin 198 -> 0 bytes
 .../Objects/Misc/module.rsi/charger_wire.png  | Bin 466 -> 0 bytes
 .../Objects/Misc/module.rsi/clock_mod.png     | Bin 912 -> 0 bytes
 .../Objects/Misc/module.rsi/cpu_adv.png       | Bin 211 -> 0 bytes
 .../Objects/Misc/module.rsi/cpuboard_adv.png  | Bin 455 -> 0 bytes
 .../Misc/module.rsi/cpuboard_super.png        | Bin 535 -> 0 bytes
 .../Misc/module.rsi/cyborg_upgrade.png        | Bin 311 -> 0 bytes
 .../Objects/Misc/module.rsi/datadisk_gene.png | Bin 243 -> 0 bytes
 .../Misc/module.rsi/datadisk_hydro.png        | Bin 362 -> 0 bytes
 .../Objects/Misc/module.rsi/depositbox.png    | Bin 412 -> 0 bytes
 .../Objects/Misc/module.rsi/holodisk.png      | Bin 296 -> 0 bytes
 .../Objects/Misc/module.rsi/mcontroller.png   | Bin 375 -> 0 bytes
 .../Objects/Misc/module.rsi/meta.json         | 567 ++++++----------
 .../Objects/Misc/module.rsi/printer_mini.png  | Bin 285 -> 0 bytes
 .../Objects/Misc/module.rsi/prizevendor.png   | Bin 388 -> 0 bytes
 .../Objects/Misc/module.rsi/radio_micro.png   | Bin 208 -> 0 bytes
 .../Objects/Misc/module.rsi/radio_mini.png    | Bin 278 -> 0 bytes
 .../Textures/Objects/Misc/module.rsi/ram.png  | Bin 145 -> 0 bytes
 .../Objects/Misc/module.rsi/rndmajordisk.png  | Bin 272 -> 0 bytes
 .../Misc/module.rsi/secmodschematic.png       | Bin 323 -> 0 bytes
 .../Misc/module.rsi/selfrepair_off.png        | Bin 408 -> 0 bytes
 .../Objects/Misc/module.rsi/selfrepair_on.png | Bin 517 -> 0 bytes
 .../Objects/Misc/module.rsi/servo.png         | Bin 325 -> 0 bytes
 .../Objects/Misc/module.rsi/ssd_large.png     | Bin 290 -> 0 bytes
 .../Objects/Misc/module.rsi/ssd_micro.png     | Bin 164 -> 0 bytes
 .../Objects/Misc/module.rsi/ssd_mini.png      | Bin 202 -> 0 bytes
 188 files changed, 2207 insertions(+), 3039 deletions(-)
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_drone.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_engborg.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_hardsuit.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_helmet.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_janborg.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_medborg.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_secborg.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_standborg.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_xeno_crit.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_xeno_dead.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_xeno_sleep.png
 delete mode 100644 Resources/Textures/Effects/creampie.rsi/creampie_xenomorph.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert_nocore.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_dead_nocore.png
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_nocore.png
 delete mode 100644 Resources/Textures/Mobs/Animals/goose.rsi/vomit.png
 delete mode 100644 Resources/Textures/Mobs/Animals/goose.rsi/vomit_end.png
 delete mode 100644 Resources/Textures/Mobs/Animals/goose.rsi/vomit_start.png
 delete mode 100644 Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png
 delete mode 100644 Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_green.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_red.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_white.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-a.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-b.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-c.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-ce.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-chem.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-clown.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-cmo.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-e.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-eye.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-h.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-hos.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-j.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-lib.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-m.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-mi.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-q.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-rd.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-s.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-tear.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/cart-tox.png
 delete mode 100644 Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png
 delete mode 100644 Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_open_overlay.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_torn_overlay.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper_words.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/newspaper.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser_empty.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_plane.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_words-blood.png
 delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/scrap_bloodied.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/ash_plating.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/blank_mod.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/card_mini.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/card_mod.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cart_connector.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cell_con.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cell_micro.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cell_mini.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/charger_pda.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/charger_wire.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/clock_mod.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/depositbox.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/holodisk.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/mcontroller.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/printer_mini.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/prizevendor.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/radio_micro.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/radio_mini.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/ram.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/servo.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/ssd_large.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png
 delete mode 100644 Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_drone.png b/Resources/Textures/Effects/creampie.rsi/creampie_drone.png
deleted file mode 100644
index 4530d20115ba221211fd2b85670f519306b3cdb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005?Nkl<Zc%1Fp
zv5FHx9LMo*j9ioKWv~*KfO{uIEHtgv)d#+UZ3-KUdk$NRYx4w$d4YX{TtG-b6G;dJ
z1li55O+dyXPKc+1o9wMw?)Pbvo!$A*{)dp?fQX2Qh=_=Yh{&B%+2tY|c5Ldm0jSUW
z>w(TLcN*(|yO;F>8+L4LJYYR}R|p$+Y_3mMkW2+|lW#-`0F!98DMD<#QWoK#3oz`q
zY-~IhgC42h=F5lotd`?V5f+0UvGEvoTcs*OrZ>Q?yz6_%wSoJ*Ofqd;(e;IGL<y<i
zratd8iDo=_^ptAtl={3+Y&^{Kx24()?`QdPBT9&kN8@MT2LMq*T7&Jqp-eKb*09^M
z51+jRpjtcS`?pU3ECxNEyc(5i^<l@~0dAx7U%a6{?=zZ)rJTHoh=_=Yh=_=Yh}<=M
z|COD5d}oV{$Xx)N`fa?&ulK%R=6L+3A|vwc$=}Q;ceQr`+{3tte0+6&D@7Pzo!i)W
zzuYemnX<vZae3h+nz34r^BD3stL2!lpCK^oe6pI;xVf}|ON@(<`fVCfayTteIlHWk
zrXc`<X>xRYviC#%$<gr%foTFTnufV;xVf}|6C00!W}ZWC1g4qmtMBAe#pwFN!tF=o
w+tK_%9mKF<#};)qXxMGpG9Jbf5jjXd00y_u7Jc&_>Hq)$07*qoM6N<$g7C}_vj6}9

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_engborg.png b/Resources/Textures/Effects/creampie.rsi/creampie_engborg.png
deleted file mode 100644
index ed4a6d94d8d243fbb4c900d19049c9d3a2fd718f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 429
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Y-;aSW-L^Y+&M+-3(6wh!k6
zqf$<VY?*#avXOO9Q?%F#nMeg)?F|Qd1++3&YB<V0SbEY~U8keJz|H0U`a@#r_jlKy
ztz{4df{EL;%!8h~ZF_e--bOb!;;Ea@q(ds2-)uP8@3Td%@eE>ckaxEz3%}CK%CILc
z>;3&Zlfu(WuT2%Ze_W7(hk4_2#~sz&KBDWtROUw~eUx0l+8=)KUIl-{yRW-8u8{8D
zrjvKBvEF-n*;Hx4*`2>{*52FH?}7xjh;E$OaduCB_q1)FxBe));x6z0LDMZqt$$Yz
zuN6by#qWHFcKo=oI^n9qVGCQPJ8|>3ry5EwSW%>`zucICC-)AIQ-{c@RoV%6Hm(#n
zI_Kl>$7?r~{ZjFmlB(w=yubF$zx3~4^@2CcD^-2o^NoL3+W{Bm2PMZg?p}1N_e?IM
z?mk`aE%x_!H}Bk*kf>(6r{vj}njg7hcfa46TH;|}F1%-!>2!s}T`e6TAoo<-OZ(0r
URXb}zU^Fmzy85}Sb4q9e0DXbHfdBvi

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_hardsuit.png b/Resources/Textures/Effects/creampie.rsi/creampie_hardsuit.png
deleted file mode 100644
index 115cb78751abda18aa7c0738eddd31e50cacf384..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC?pEaSW-L^Y)fuUz39f+k^R~
z)~W%sX55HyNZrFI{()=Dz4Yklbq`oqY%>iDxG`ZufK$QgvpJicO}sZAkmmXLU#gkY
z_;cJn9!~y-7fT~+^SqS&D_=8gzslGBr^lrGVSDEKjq~2Fea&n2<J4A0hN;<yquD)_
z{5#j@vCI`JkpGjjkCEZbv)P{N5ASnkaK~NtoU!O!^a0K6n)=v@^>sFXtWtB6YLAs#
z?U-~T`1D&jzsSeiZkhhq|75In-L25l_npC;5XQP0QAeMCS$=1^l#Rgy!yR|t&3?U-
zjsJ@eLqof8{i=h)f-rD#wd5bG=%ehc30K5+z6)k*5S3v+dvmAxjc1a*fh#TVySg#f
z-F_U<u+yzG?^wlahN%~3C~=2=bPQd`yL=7%^d~opJ98M<7QKDuW8lcH@2SEVR<LEx
zCb#J45tH6Id56u)V11F#?o)V5>U(S^XA<Xy-<L{QJ<cmmV~G8?Oxq!!Su?5M(cWjR
rN|V+Sww#G+h7&$kvnav9tM}{<FV@yvdU#v`7&{D}u6{1-oD!M<{M5h(

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_helmet.png b/Resources/Textures/Effects/creampie.rsi/creampie_helmet.png
deleted file mode 100644
index de2866287d6f0bad8fac538456b4530bfb461a21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 386
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$8KaSW-L^Y)g0-eCg~wh#KR
zBSKXT_9!^N6fA3uNi^B6DIqEGRkW&c!AGU=sE11qg<MPc+O=lsR5Q)KxkoO4S9bjO
zd7kX#?+i-nm#!q)-FKN4wd~$$0e-#aB`crKS<AriJg0TW<O|k}W<QP=@iIi{Tn|)V
z7|ygsE3avLj?fmZMcz*Dr6+7-oBm#TpIu!3zRYZ=H~Dp2w2s&{FeJzylJLKOGXH<o
zn*4^zzY~)A><VRX@LE;YmCtMMK!8V!LJhMr&pfZ{w^KWLnu}q9=#!UE1-5uB3RNt#
zePB>wx16oBdYjRl>7f^dD$Oh6uV(0TzW8M+``_t|tp($@Or>02zu$BFZU4U9a$hmG
zcY7PpdUFMR?UdQM8_X4M=S-epe&*zqUct?or)Dg&PbjnHymV#p7oNVYe1b4=aeoQx
Y^V<2R(t4IG0ER7tr>mdKI;Vst0I0^K%K!iX

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_janborg.png b/Resources/Textures/Effects/creampie.rsi/creampie_janborg.png
deleted file mode 100644
index 6d8a6772e03ac5022d761ad03c76df7f5d515ea1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 575
zcmV-F0>J%=P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00068Nkl<Zc%1Fp
zv2L4C6vpv?N;ez9XvtC+S0WSj+9@x<D`d^kr9+;hLzfO&d4;@yr>;&WER`h^l1C8s
zXwkvB6xu}cHP9C6`)y#jzW3<d%Ww{eh=_=YoUB^iRHxh<gA3ais?|+Z_-=jeOcosW
zDPCS42fVto9`j#%WAm_CyqA|alLY{WeTp+#Q1~u|?~X1LP7Xj42le6$-({Mu@$wQc
zFPUa*fI1LK9E>IiZ*3kni}&)9-F(Smp905)vrp?lY<r*PaI6B*%m4@KZ2+``^3?Y<
zhjVrY6r}BI-^CkY23VcgNgPzOFaluvc;EW1dH?cyGpa9vl_U<Tmkznt?u&?sh=_=Y
zh=_=Y$bX}A0mIY+<{v);;J*JfXi=p6@vQ>LzJCSiT!gVIjlE_TMohDHT^=_zLjS{;
zUV@Q7+*ZzHar}?xUW8c~{ZXAdhgE;TOD?ZB7u(1CR@K;4iSvis&XpoF#xz^An=k7+
zWM3t?&H;dS5SkN(Zb2~bHUrz|;-RN40LLICF%@Bi_dHP(gmanqP35`o#Y0aSV3<rW
z8L*o#Y4#J@Dtxy!))1BFK~C&uFA>1zX=Od}Bo3<J-4*bwF=L1Ztie86&0Yd8FRg-L
z7H_g=$ex4V&Vb+5X97SNS+~uY{cgtUdwze_IgJx)wh$2!5fPCg{R9ET8>SqS@aO;l
N002ovPDHLkV1nEm2mSy6

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_medborg.png b/Resources/Textures/Effects/creampie.rsi/creampie_medborg.png
deleted file mode 100644
index ea4476bd795fbb17dd2cc73a606c1d3c8f75884a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 361
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU^MV_aSW-L^Y)glAG4uA+e3br
z?gc(muZ8S%(wm@Nz}5Fe`w5dJ)5<-$tEM>091t<-HgCx37hh95KW%AB{hq~=>X&+0
z5>Dn7>2usW`hH(^mE5NH-><(b^5eUA^lIAj_S3uX$-P%U{y?;v+bNJOhWpUZ9q)~p
zyTs<OExbN``jXq1xQ|P2xb>#)j`Y9HZx~qKFN)4ruXb49b?MuuUqZ+A?dR~F)@*zb
z>tpV){a#r#)6v-pzarO50-X;5(-!ZVInm5B%G_hk{OP6&g}H_=*EE=1x$`MJGkIH?
z#^N2edbMu<YwpxX24r7zmJDT_u*@;zY?a1hD~3$TEort>0%aLIH}iQ#*q>g)(snuV
z8_x!*QwExiAJ5&H^);aFWd64b#o~Yb2^!20`+nLnXe%6dym^p25hUR0>gTe~DWM4f
DlqHrQ

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_secborg.png b/Resources/Textures/Effects/creampie.rsi/creampie_secborg.png
deleted file mode 100644
index 6e8a1558d32dc4b1bba91376549057077e9b24bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^shaSW-L^Y+%p+`|R}tq+qY
zT-%^tpq;<a^G=q=_E{~_9c$G#JY<~lD#giF;AFp}#Gm+72d1;uaz`I!0FC+JY{^%7
ze)IlU$)`_S^8GBd(rJ8V@#Ita&o!d6g(f`9IR5+cwZ^IsK<bjr*Uf7(f|>p;_T}6W
z6Z|8u^|H*{BHxE^BmXXn6@75~K;_Tv8P~IXlc(=4-mh}-dtLVG{B6dJY3o&HY>oUS
zbos{9%r~>Fz5!hh1}j{yYOcFk_%DP%qO2>sSNhlNHJr+C`KC|Sscz?by5m&W1l0uD
zJw;2M>bZeD6%U~YZ#POE++8Yk>VIu}3HOxA!Sy?8Y`%V*q;^34yM^qN@YG8((>G3)
zkBFREWm$DPW-sfRxX=eDL$^FhJ-)y{O=|6}nQM9WtcogU+tCenK*JI7md_^^7p^LN
P0OEVP`njxgN@xNAraG%M

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_standborg.png b/Resources/Textures/Effects/creampie.rsi/creampie_standborg.png
deleted file mode 100644
index 8b79077dc4260283b9bf0d39f11ea1dfebcc3a6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 445
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KVpaSW-L^Y+&MyruvVwh#T6
zd^!76dS*RviLw64w5Mrxv-kX^-tFu5G3g(8k~KqRWj80MGMg-~?3W;?|0>%pm+XD{
zJzBv<Z|CvDi5Bb%N=lc4)KBlKzPB$;$oqTSU8@y)4VV~iG#lzYx4pCJP~npUy4n$+
z#owCNU!Hre|8+`abs|f(L0fbf1H<+;1)tJ=1$<7kysckdRhwsKab~;4&&|&`7|x}n
zhOpgveXqdsec%#9h6CKnJAR7YRAl7iys|n`=q<yJRMy`Q1rJoS{n)N^;O$m}&N5z$
zzB#Yc8r9y0D*SWh&8TPH)n#(5WTIp!b6v`IKD(OVS51`=;MZoCSrT{i0^)T)eJfrv
zZ{by`-+ft=zh0FK&b7=`V$9fn;`a>UfZ5@jIVQO<J@5&;mhL!V(Y06Slsqov_1CN3
zw_#*pS|B-n;vy!ioU=+Eg4_p6CPuyunR<?4Yg)t3jESP!O$W9biD%x4W)sQGIVKP$
kzqV-G{mu>u@Hi&jx&I(rPri#LFj^QqUHx3vIVCg!0K)dX;{X5v

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_xeno_crit.png b/Resources/Textures/Effects/creampie.rsi/creampie_xeno_crit.png
deleted file mode 100644
index e6bfcc51415235bd7f21de5eeb97caef769105be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6`n4RAr*7pUN+=Aq#(iipuJGl
z$f~sUq;>)0`UAI|cYag3vuMp+8C5xk<+H-1mww!S`M297`8YWS4y}#4s@qb}o{4+(
zVBcm|hD!qB=e0Ty=RQu)&g>{q41K%zx9NcpGpU;yH;&my|148YV%&7G`}L`KJ2OSG
z2L-$Lw@OC;$Yv0q6jfDo{PNDMxF_O0%XAqIl&)sbQ@L6`<LcjE#%AHg|6M?Ug@He9
Xx51`uh2NurZf5Xw^>bP0l+XkK;r3eI

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_xeno_dead.png b/Resources/Textures/Effects/creampie.rsi/creampie_xeno_dead.png
deleted file mode 100644
index e6bfcc51415235bd7f21de5eeb97caef769105be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6`n4RAr*7pUN+=Aq#(iipuJGl
z$f~sUq;>)0`UAI|cYag3vuMp+8C5xk<+H-1mww!S`M297`8YWS4y}#4s@qb}o{4+(
zVBcm|hD!qB=e0Ty=RQu)&g>{q41K%zx9NcpGpU;yH;&my|148YV%&7G`}L`KJ2OSG
z2L-$Lw@OC;$Yv0q6jfDo{PNDMxF_O0%XAqIl&)sbQ@L6`<LcjE#%AHg|6M?Ug@He9
Xx51`uh2NurZf5Xw^>bP0l+XkK;r3eI

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_xeno_sleep.png b/Resources/Textures/Effects/creampie.rsi/creampie_xeno_sleep.png
deleted file mode 100644
index 94cb3aa63e0c91ec30a3630a0f85154b711b7be7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=uRUEHLn`LHy}6OM$$_Eu;d0x9
zle)yT!x9+73#>rof~IR-LWdY4Vx4$28XxOT_^++`=cMcU51tGgf~KlFPgOrW@%MDy
zk1FR>Jiq={_1tCu`s)1WtM|WZ_1&|ZmFsrgUEK*Prl}8~2;_WQA02n($l-0_!D3#I
zeDvyt%zn-0J8-0S<HhZtct0F<tG}#j@%7GC*B86_fer%!i?zl*3yS~!Yp<IoSaR-s
z>WL%17GCmQm)bY~J?~oo(ZuZD!<haB)!)SB4^(u1-N^p#YJ3U9{pdZfT`SK2TjX8v
h%2HVaViM4-S^Q5bH@Glgzd9cz<mu|?vd$@?2>`jAeWCyW

diff --git a/Resources/Textures/Effects/creampie.rsi/creampie_xenomorph.png b/Resources/Textures/Effects/creampie.rsi/creampie_xenomorph.png
deleted file mode 100644
index e51fed1e4f58f2d4f060b5908ecf3fc6d7e2e25b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0003!Nkl<Zc%1Fp
zJ#K?Q5QgE8C@r!}OOf1eD)*_lfUl6&ZO)R`t*_t<P^EWeTBJynMn1r%$vEUkN`T!Y
zE8eHU0z8@>7Pi=t007gK4gKSB=e+&Cy{`tx`D?usw}HE5aXDAjrKB_q(JSHO&Uv>i
z)XsCwPUla@sxFf&!d0J}?Wun?`0n+T^eTW&_3ogp2;J)`8T1XfxqHy_)8pmbVzpLt
z*e5srrGcw}eG5#A@4lJ*G6(<w00000001zUFE{@CyZ%q?UYnyo6(iADg^f~xcAf`K
z*q0k`JJ6v;DS!!4gqW|C6rliFvCXV^AjDI%7_-w^S+Nbi340wnp!C)#;WWNu#9D7+
ziBf>YYW=QrWQ=y6%c*#cRgF*XgD3@P4tq5UJOk?SdHt%;t3aq&00000005Ks0+8T@
Uo^FZM3IG5A07*qoM6N<$f-Ci_kpKVy

diff --git a/Resources/Textures/Effects/creampie.rsi/meta.json b/Resources/Textures/Effects/creampie.rsi/meta.json
index 67b4981767..e46355c4a4 100644
--- a/Resources/Textures/Effects/creampie.rsi/meta.json
+++ b/Resources/Textures/Effects/creampie.rsi/meta.json
@@ -1,92 +1,46 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf, creampie_arachnid by PixelTheKermit (Github), creampie_vox by Errant, creampie_vulpkanin by Floofers",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "creampie_ai"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0. creampie_moth by MilenVolf, creampie_arachnid by PixelTheKermit (Github), creampie_vox by Errant, creampie_vulpkanin by Floofers",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "creampie_arachnid",
-      "directions": 4
-    },
-    {
-      "name": "creampie_corgi",
-      "directions": 4
-    },
-    {
-      "name": "creampie_drone",
-      "directions": 4
-    },
-    {
-      "name": "creampie_engborg",
-      "directions": 4
-    },
-    {
-      "name": "creampie_hardsuit",
-      "directions": 4
-    },
-    {
-      "name": "creampie_helmet",
-      "directions": 4
-    },
-    {
-      "name": "creampie_human",
-      "directions": 4
-    },
-    {
-      "name": "creampie_janborg",
-      "directions": 4
-    },
-    {
-      "name": "creampie_lizard",
-      "directions": 4
-    },
-    {
-      "name": "creampie_moth",
-      "directions": 4
-    },
-    {
-      "name": "creampie_medborg",
-      "directions": 4
-    },
-    {
-      "name": "creampie_monkey",
-      "directions": 4
-    },
-    {
-      "name": "creampie_secborg",
-      "directions": 4
-    },
-    {
-      "name": "creampie_standborg",
-      "directions": 4
-    },
-    {
-      "name": "creampie_vox",
-      "directions": 4
-    },
-    {
-      "name": "creampie_xeno_crit"
-    },
-    {
-      "name": "creampie_xeno_dead"
-    },
-    {
-      "name": "creampie_xeno_sleep",
-      "directions": 4
-    },
-    {
-      "name": "creampie_xenomorph",
-      "directions": 4
-    },
-      {
-          "name": "creampie_vulpkanin",
-          "directions": 4
-      }
-  ]
+    "states": [
+        {
+            "name": "creampie_ai"
+        },
+        {
+            "name": "creampie_arachnid",
+            "directions": 4
+        },
+        {
+            "name": "creampie_corgi",
+            "directions": 4
+        },
+        {
+            "name": "creampie_human",
+            "directions": 4
+        },
+        {
+            "name": "creampie_lizard",
+            "directions": 4
+        },
+        {
+            "name": "creampie_moth",
+            "directions": 4
+        },
+        {
+            "name": "creampie_monkey",
+            "directions": 4
+        },
+        {
+            "name": "creampie_vox",
+            "directions": 4
+        },
+        {
+            "name": "creampie_vulpkanin",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_alert.png
deleted file mode 100644
index c4c0b8efbeb55c660cb2f91d3d731dc828986e46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4327
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
ST!HcD0$^@pZHzW_d-^}}$decV

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/goliath_preattack.png
deleted file mode 100644
index 743e9f35be44fdff9f8b43dec365af9a5646111c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4249
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

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
index 062ec6a91c..fa37e37ba7 100644
--- a/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/goliath.rsi/meta.json
@@ -1,111 +1,51 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5a68c5f6d3b60ee82c06e0287d1eb8108d2e1fe2/icons/mob/lavaland/lavaland_monsters.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "goliath",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/5a68c5f6d3b60ee82c06e0287d1eb8108d2e1fe2/icons/mob/lavaland/lavaland_monsters.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "goliath_alert",
-      "directions": 4,
-      "delays": [
-        [
-          1,
-          0.2,
-          1,
-          0.5
-        ],
-        [
-          1,
-          0.2,
-          1,
-          0.5
-        ],
-        [
-          1,
-          0.2,
-          1,
-          0.5
-        ],
-        [
-          1,
-          0.2,
-          1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "goliath_preattack",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "goliath_dead"
-    },
-    {
-      "name": "goliath_tentacle_spawn",
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "goliath_tentacle_wiggle",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "goliath_tentacle_retract",
-      "delays": [
-        [
-          0.1,
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "goliath",
+            "directions": 4
+        },
+        {
+            "name": "goliath_dead"
+        },
+        {
+            "name": "goliath_tentacle_spawn",
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "goliath_tentacle_wiggle",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "goliath_tentacle_retract",
+            "delays": [
+                [
+                    0.1,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert.png b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert.png
deleted file mode 100644
index e9ecab5eb7ba15b9d0036e3d565691b33ed504ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<Tdr3q=RCt{2np>{JAPhvQ)E#yIOX!+<6-5z*hq29=$0hSsH7zy=
zV=(0Hw$tb5KYw2v0=O#!;7-UbudqL<DiLt}SqmX&cs`(vDWHKsQ@4}E?%Ahz>4Ch#
z+JCG^|FRp~iT$}huSCG{<D&s?6wt=(MEQ4ppC1^5RRGcH(rC6Q-xdP^Hww`6Ueb9z
zC}sp)5bPZBYFT;Y5>A1>&e6i;8vy`r6d*)_#`++PfZP&;jtDJioi7cmz~$s+xX0AE
zgZa6yd$~{aT;_)o!0Cv002v7}*t`zgcOP_80yx9e8%B4&uETa~=MObZforagTNTpI
zhr2$WUy5ZgG}OEERDvwk0JM(+0JR1Y+gHvCz-d2M(5bh=^+x<NN#Rs$2c@_e5><m5
zV<-q{<?{pML`Y)@0l`w<w>SNxP}1rQ3BeAgpc<4agb=o&O_m4<X+#$QSQI^@&IxJz
z%mWdvsEp1TQ53ZDbS?luA4QEG{jxgU3~3<rIbiL0HAbJ#-qr7RYQWu~bSrCX^SK;#
zo9hAKhHKPa;;9J$gyPrna&;+(TNHN`RZztdCMt(Vs}({x>fLUK(Q4gFhv%2+k^2Gw
zw8}+I3iF==;77~^0IZJCIHmS<?+H>%A7@$QzQZtG4yYwMP9l_4kdS2%y-~?$>9Sp_
z9ln}whttokFenH%Crb(d-U-C*Y~5BFLTbP33lb$Kkg9iR!21Dy6l^-qNnj=W@^eJs
zDlqFc7_EjkL`H~{aAk>dl6?Rr>1+4l>2rN|xd4Dz*yvjj09U+y!vX-pjz~wp>ndO=
vyQI4a06RSZ+~#@!xXtwdaGUD^;5OGEE`KP%@bK+800000NkvXXu0mjfcE~*s

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert_nocore.png b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_alert_nocore.png
deleted file mode 100644
index dc61d81d2be0b1729d3e72db1793175213d1fbd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<TRY^oaRCt{2nqh7PAqa(SGB@h|kI*x<nQY8Bjw0X#wa)w1bazER
z5d}TMcKZIk{{H#e5Wrmp0Cz%Rd8Olds^J0WkF^j=hUWvySOOXdG<7>k?0&{{)IN|m
z*!qq2>_@w~oxDHy&l?_ae)(*G>jktiJ5l|M|1VFB!7hLpbZs_!RBnp_fa?Y5buSsb
z9u(69A_TjRT<Y0*<Pt6c-_Fs(#2Wzst`{IgfyVYh=mDiI2JI1A(7L{K>;kcq(XhwT
zXn~PKPy)z1g7kzOtgVy)ayLZ}-cKD%AVQdBS2&fP`gr|PY=fyG@4-_6vX%qTeG~v_
zHHbLAa&`bt`=x|VeH3mta(yOAoLcRmlqW-?Y*1qi1p%#cd|*_BG=>lmEOqtmpudz#
znw=pb*ufNJgHojs(l)fg5&_}q(G>s|2a-{BLfSsFAfgo&(K$1Uf>vM76#(c`)aco-
z%jsrF1Hq@j>UcFqS7-0?yPX<vHz+;I+S+_CN5kfN0fgZib(i?j1OQU;^LV*j(%~NE
z14SiNbOCoF044Q8NN3&cb{MVRqjXxoe3sl70H9ULYo0LwDFD95OaQ>DgvLp=r+X(z
zZGD_=k^6>Wx){(3beupa$si%yAo`$Ej?#6zR6BeDZikV%I|ad}vZMguS>BRDaD5=*
zp()=7SQj}t0gS3NOWJ~Zz^vC`v^rjhj1VW_%Di*(7;sAZ>^`kNw@;S~0LX>)z6Akr
z#S7L807wTSoqg9`z*2TWcM$+~dI5yZ^#TZ+>je-t*9#zQu0PhQ74Sb`RuljL002ov
JPDHLkV1n@@CKmtz

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_dead_nocore.png b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_dead_nocore.png
deleted file mode 100644
index 5f2a004190719a547da53ce37a0132ccda73b633..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0sxv
z#WAE}&fBShd<_a5ZMl!#?*8YPyYksAZb5;|TiE}(JOA@{Y}ydP_kaO{>RE1_7wF3s
zbTFCE?Z_}GlSP7YBA?6WZU&1D;!Lw2*I0I3YRL><zjK~H<AxcRgNqKO>OK}|aQVyT
z6SS3mOI7x<X?72jdzw4;+uc1=7R;fLyXxvD*RQrdoI5VpC7)wR=&-yTAn8)9@~3Bm
z+o37N%oV}i8%0B^c)wR2mRYc9qb~ES%(4^WRZ{1fLiXuAu<x6od!O~4bm0EB+ZVn8
P{lnnt>gTe~DWM4fU}|WY

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_nocore.png b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/hivelord_nocore.png
deleted file mode 100644
index 7d38dbfe899cab6583acc76728ed90fdae3a5158..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<UBuPX;RCt{2TTyN+F$heh+^F|ILeKP`s>ljq0ndPOthV!0ZPsh>
z*kBCq{r1aIAmH=g<L}qU?FbBgB<8v$39y7kZ97R~bh#oyfE0Mj>`QPu6-)pTRGS?h
z{Dk}<CzxA}n+RCt2fP)P?>j-jw=heQ*&w@|VXe<aD?k&{<tRsAvi};fAOU(naury@
z$NR2b!XhFEfPiRrqvy)tQClBG=gD>mK%=VJ;PrcE>y&Mynf82=r{}8<4gtDTWbiYA
z%uF$}iRxiP5rEnhyB&>zBP1|8iFSs3pA#Rz%zQL>*(T$-<afv_iu86(08z}c=}57v
zLzLfZS+nmvKlG}nS^<orv$pR%2Mkm5@FYPHzzm3;(Va2DSS^??$xv87YcoK05Og=t
zv+4N}b~}84Bw*%TW=k)FDAKGW5ei4Y>kzop4|opO0v!ldAO%=wg3c_`TN5IlU3aI=
zm{oSw1tehR$aZgemP{lNyJAsRxPB_j$(8bF?d>+jtne;mQejx!QrHD{*?Z<ljkgO3
zU{6;&Y6R<L1O!;Y#)*ZH8WP9h-RRZf2Ngzg_#@!<%kf7*Pq(=Q<yyJrIG`fj!q<^o
zX!CLSd>8~&<L)jnK^Z;?Kw)Hd((Aq~mAm|eBB%>knH>+OEPFmz7}N$Cbmsvi)|w(v
z7eKswck+|D5W!6Zu?wuI_h<Xiskf*M$AKW=U3Y*Yc^WNQVPuJ;Il&z{!!{F`!6T~b
zAJ8&bE-_0Iz}jA=pz8IFI6&OzOd`Ro(&M`oj?>e{sycaXeM~M$3<2Inh^S_`($>Ac
z&`Px5M{q&Hs_8}N1glECyDS#TwBOy4Mo)P4`l#Ir5#qpApZoI#+96YzSV00ZA>Ww!
z1G`;wN~}9fW?<`5xFppLb_M0y5SOGP?8phMI{-<jZIInYkbzh2U)pZ9KiSWtulrRH
z@}X9;6SMyH791h;0hxiE;xpKt=?O9)&~5AcK^%v71vM7Q)$@tO>nb2FNy!LsClS`~
zjC`&0>vPfsI#<JLha89R#ebgeBmt3c{l*=S6L*DA3T^B74;*&bT2+Z|mjD0&07*qo
IM6N<$g8Z|X5dZ)H

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
index f941898aaa..1283d38809 100644
--- a/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/hivelord.rsi/meta.json
@@ -1,74 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/9bd459b27c73575fd5e3bf2efea13b816d0ac7c8/icons/mob/animal.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "hivelord",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/9bd459b27c73575fd5e3bf2efea13b816d0ac7c8/icons/mob/animal.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "hivelord_nocore",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "hivelord_alert",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "hivelord_alert_nocore",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "hivelord_dead"
-    },
-    {
-      "name": "hivelord_dead_nocore"
-    },
-    {
-      "name": "hivelordbrood",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "hivelord",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "hivelord_dead"
+        },
+        {
+            "name": "hivelordbrood",
+            "delays": [
+                [
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5,
+                    0.5
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Animals/goose.rsi/meta.json b/Resources/Textures/Mobs/Animals/goose.rsi/meta.json
index 3f826a2be4..51d4c1f440 100644
--- a/Resources/Textures/Mobs/Animals/goose.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/goose.rsi/meta.json
@@ -1,131 +1,18 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
-  "states": [
-    {
-      "name": "goose",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "vomit",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "vomit_end",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "vomit_start",
-      "directions": 4,
-      "delays": [
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.5,
-          0.1,
-          0.1,
-          0.1,
-          0.2,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "goose",
+            "directions": 4
+        },
+        {
+            "name": "dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Animals/goose.rsi/vomit.png b/Resources/Textures/Mobs/Animals/goose.rsi/vomit.png
deleted file mode 100644
index b0c034029fe3eac65ee216bfed57388403d878e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2872
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
W`Lf2<G7r%J0000<MNUMnLSTaQ@OOm(

diff --git a/Resources/Textures/Mobs/Animals/goose.rsi/vomit_end.png b/Resources/Textures/Mobs/Animals/goose.rsi/vomit_end.png
deleted file mode 100644
index 6f2d097e9939406ab49ef98c300851d8e5d9c1b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3587
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
JPDHLkV1hQq<o5so

diff --git a/Resources/Textures/Mobs/Animals/goose.rsi/vomit_start.png b/Resources/Textures/Mobs/Animals/goose.rsi/vomit_start.png
deleted file mode 100644
index 2c2a6c3f6a5219f3f2086be957706e7b89a9fda5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7376
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
U6x7s$E0uteo|*1@?Hkem4^FR0WdHyG

diff --git a/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json
index 165cbf6bf8..2485dbdf8b 100644
--- a/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/meta.json
@@ -1,68 +1,60 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from fulpstation at https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447. 'mothroach-moving' by MilenVolf",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "mothroach",
-      "directions": 4
-    },
-    {
-      "name": "mothroach-moving",
-      "directions": 4,
-      "delays": [
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ],
-        [
-          0.2,
-          0.2,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "mothroach_lazy",
-      "directions": 4
-    },
-    {
-      "name": "mothroach_sleep",
-      "directions": 4
-    },
-    {
-      "name": "mothroach_dead",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "0-equipped-HELMET",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "mothroach",
+            "directions": 4
+        },
+        {
+            "name": "mothroach-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "mothroach_dead",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "0-equipped-HELMET",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_lazy.png
deleted file mode 100644
index c44dd1cc654e876add9d7720d9d6c7c96ba4ea22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1293
zcmV+o1@iidP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$uSrBfRCwC#T3KimK@ja-;<dyRKOzw{
z2!e<QDhPrnVn9^H;1!XG7*P>a6h9656H)X-yb*)AMnw@7F%mpc5KO!fF(8S;dgLRL
zgH@wA?(3x5-rn9xCp+thsalpkrn{@&o9^nKsR?<WCwjAlMK2d7fC*p%m;fe#3FyU=
z<I<=+@iQf~>Y_YBd6g?ddj4M+?W(&h@e70ioAS~5!$d=@DY=|wB23+-wIjS!8R`yq
z*8nIZ10cm)*2xrQx<-ZuA)B7&dL{RMdb)0s_LdJSuj@v8^mD@G@+^QQKn6g@P92xF
zZC%Y9MMzLHLDx-VLw1*M75mB#D+2WE(CxAWoCx^x^nmxR?W-ye$Q>$B&Kr?0np@*y
z@W6=p{3)jD^>)XmwS|HJPoPN_FP|r_U%I1GU8wz@%GaSlmca4-rzKbb(m`H45fxSE
zugVmHdTN9A=$8!v=vR-Q%REw)v$_iq*jbBbOJKO;D9>NBR$Z??cUG*}SS<6H4Im~c
zA^$>ofTkHC(@rw<Hd#9d035)VUx|r$TeGY~iZbePJ!sL_H_6J<;-s{z_8AcXhXPhV
ze{Ae<iV3ih{(VJZ$x#U&DaxpqBqiDf<pfE$erG4lm@F=wjEY5tQ)G&=e!V-ood~!x
zKB~Mh)_2*md=dZNE~+Xv%Q~beqaN4kE}&ng1dwih8PNLAn=~`2thaO3?c@X6;&C}}
zL+p`QutZ2-P$uq+A5HK7p1Km?QD0y8R@}b!NcGE9NVj>1H|*XfXCG$4jjGy|>#n+;
z&jIG)gd8CW93ZyDOt(GP(;$Fj27rX<ku$<}3JmNVV0#uQjK)$rRu$*}lV<^)2*2ZR
zU<B~vFcZK8Fab;e6Tk#80ZafBzyvS>OaK$W1TX<i029Cj{5O*FTHN*m)F$ad;Mx92
zB2&HQi_)B)Dz}B73Rf=`-|l@?ZGwmn;}v{T#Cg|xYuvHH;VrQhllfNIoB=k_6o8;I
zLQ@o-q4)rV46m5er$;2<LkA)fqQ@e1ou)l{aI~vfLD=tZo8WCxSBlF~{&~$a2^_}4
z@CVoLi-Mii-G29uKIn@vFc!wd*rvXenV^NxY&g2~0n|xnlk(|EFa<_q7PQ8Hs}Oqi
z&a+<qf%zd<@YJtWMxf)Jv!KzppUqZ<BZ0}bG{S!1ZJ^Dyk7*bglBe=CRY?%Knpw10
z65%ov2t4{w_+1~9bU-KNZMK;+A>Fr2VVgJY2!#Iqo9oIX;mOTgDQ%Qv><pa)kgK3A
zh2L#=S=X5kJf-^IHUo0}wiGZ{v}&&CH*Az>dG}I9VNFG*5#$6BJ-&8up;)rxrc7%d
zzHlNy?}IT0MheuJ>6W2hhrsEeF%xCq%awP1cLm>r5ISOjNbX?K-fw{XBo2cUP=u%{
zk9r6~;|P(%X$>D)pa229iw{5>v_&5X#=uy5*qwAiH*BCh>R}^nh0R@ociINct?=@z
zUo!SyGJTM5`SGRgN!ymI1Jr$izOBw!en{j-BBE$Q$E2-z(&AfAcOEdeK_>!wA{0K)
zG-MvsIL-v{!w?g|1TX<i029CjFab;e6VN;4j{pMz?9K;UlHcXA00000NkvXXu0mjf
D)M!?a

diff --git a/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png b/Resources/Textures/Mobs/Animals/mothroach/mothroach.rsi/mothroach_sleep.png
deleted file mode 100644
index 5e9179d7286a571c7548dae0228db7cec3f1f0a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1288
zcmV+j1^4=iP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$s!2paRCwC#T5CvDK@^@{3~5=lq92Aq
zNf1Qzpn^c?i6lf?Bv~0@L`FqWQ1~<HUqn(rqBoI9n<++AM21ur20@l35e1P2_WGfu
zveJWYexqlcoxQs|x_A4L=Pb)S?#!I|zI*1(+<UIiaU3z0#V^LVFab;e6Tk#80ZhOc
zmNc72hX;P9_%_wa6O>b1;?wj0V$vhgT{-YengBQD({m<?j?S*ga*ByCb(cSz;#^2l
zw|}G)fHIl@q;$_VnW9YBXrf-ouBSn#?7=Tb*G=-X=cCH&y3ro}65V}?$>v!AOMoT-
znYnOQ%(ib^Un@eqvIJc>jSZ<dyjL8pJgErKuaoXXBv=vf^=XyU-`B0m<AW0g%GpzL
z#P{B?$jS(aFP}SAz25H3qCTG&;0ZKI;f9ssX8k>t>O$=g)xPq1vINc^yC}f|kPfo$
zTu3xtxh_)(>ZuLdqhBfnpxYm}$vje&Q@RTf*rkQbBrx1@l=HW2Ro9y?*NBpxr7{m|
z05M((`4`FqG+Bg9hse;|r0g63Z~&jTwn&8gzRNnKD5D<Ny%v3alWZ(6jYt!<Pl^CI
z6tMc`)3-sVcx@15LD^{u9;sfBc3wF_(yiawIeGKN)$<{-reJ|gQP!`MZnyKxs0g?=
zJEXiY)_3Ll90|Iydbg}YiZbePo$dnqB})M5)|UaT|Ll27BFcI@^t0Ipt$aXVI4lS5
z=xh<IiiGq9m7-bv==v~x;u-*t`uA_&h`TphRKH|}beng0N5wvAeXxRCjnAU4+v>JH
z2bhNwa)cysfY=g~-S%uxg8&W-012T}mqe^npeN@5x3yFd>Wu2xSeo-so&|Iw5*>d%
zA%Gu;nE)n$319-4049J5U;>x`CV&ZG0+;|MfC*p%m;ff=zmcfd;x@qqNURWesy~uQ
zR<HSzG;OrX-NH`=o7ai{2i>ZT7tvw7f{%zeAKdO5ckHlyOB{vCd@F2PfE#EEKu{T>
zDT>Zed;mfduU<ZGR3zX-2O<)p$0Br{=6v+vs7Z!t0seS*+XU|xb)~o*<=a}HOW>F+
zCjRhdv&cQrG~##f=!3o(17l%KjBV<RvIH%J=7uAo51>vuo0N}5f+?6Zte`jiM}^Rv
z4%9gBtMYxe;Hh7)j6jEntl(SRer|JBI0i7eEe(G>@NS^ZwGT54OvqMwGF1`^p#zYO
zCFtO(uRbQ}fKJN0&CRrgSl=%B-Mr~wAawX|t}By-C%5lJwNZ|7D1^SG_=vUnqpcox
zH}A5pGZuJC^}m}1q{Z7(z*zC76(W7oG|}_!rHaCuip)un6GZg*#_`n>2-4O^FRTdA
z`(TWWK&~1y)-u%V5ID`8F<16&sJ$O|SBQHMLPrb`2xf_&>Eq=maTuI{B1BDj)I$&&
zM~ECwYx2}w1qk46d;r>@E&4z(2FB9E?xYL4F$c<{9&^N8G3P|!t+qjPD{N^0Eo1Lx
zi!<YvAJ^}X*tTpPpzaIwZ8dMh2@wngMDd(Kqpg0@6So}eJYa5vRs@VjD14r5$lR-O
ytO?+UAtrzcU;>x`CV&ZG0+;|MU~I@=0R{jP69+$&9T7VK0000<MNUMnLSTZUFjngT

diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_green.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_green.png
deleted file mode 100644
index a453a9d0ad0260dae18e9ef8fe81d4d0da02a88f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKb|g*Ar*6yZ3-SR9Clz@#<;ci
zg!O_gTfVqtX1?U~I+L)_rTF_U-6HFCchVCQemHKEbhhSl+rd1=bpFlL9kyH_4fJn+
zocmbvudIXW0go_Gj<2@Nhi~Q^EIcJ!Z(?In?=dk;#8vUYi3xnipENP{Go6wt5bIsG
zo4IG<G->`R%xp$166a^tD6i>i<4XX68x>+xm#t<#XJlaTLs~h*i1FvukCQj^@c1X>
zu(7def9jEZ^z=Zq$*gsJ6{imzQ0Q^Fe3#L{UEy*``2kaq=#FCt4lHPeiKZ}ol2YN}
x;dyb^ph!xYhet%j<w;ZrUt5KviHr;b!#Qz>x(xYHC15x(c)I$ztaD0e0su&1b)f(N

diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_red.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_red.png
deleted file mode 100644
index 3e1a070d379f1b2180e5f75211e791971f191910..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800034Nkl<Zc${NA
zaNq#LKmw)#wSCAtptQ8~L}_X12};ahp+s}{x-D`$uH0u}VE93{8ACe?Mz{l%HJ{nb
zh&>ANFfZHjo#Pq(9Y7_(NLEP*^*zJUqr5Po%Fir<9-Kd<NHvP0Y{+nW^-DNgBT|qY
zBL+MQD09Htv#2!P9T02`u{_v#fE+NOAz*9!jcmPCaR37Y!?PntP-wb3;MtKQ3{o~W
zaGLH8fH?x0rn>{E0Vs07Ni>?S4miocz+jF<)7=4Y1qL_-gg-DaT!OMM;ZsN}2V7!c
zV9-ON>FxlSBamrw0D0|!yVs?DY(Ih03?rv8LcRkiun-*#?Sg1nH~;{y{!G&EI&{4N
O0000<MNUMnLSTaR^n9!U

diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_white.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_white.png
deleted file mode 100644
index 2c350b524bcc4aa6d043c765c3b24a4045a0ff3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJAr*6yZ3-SR9Clz@#<;ci
zg!O_gTfVqtX1?U~I+L)_rTF_U-6HFCchVCQemHKEbhhSl+rd1=bpFlL9fez~XB5Bv
zaqeT!KfVP*3g;OE?jPQ9)9O-6`ym0|#z6KStAs0zi}@sU_;%F(He&{Y!{6WEfBC-Q
z_V#?^6{}Vm-Pu<=yK(a5$^ZBoBG;{2WhKSrY|SEZ^6jjJ<_<O%^&S(G`ELGYD$;df
hciycaCC10VFr&>e<;%>QSAcG3@O1TaS?83{1OU1FUQ+-7

diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
index 52cb1050a0..2a43d4fe4e 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json
@@ -1,24 +1,15 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon_blue"
         },
-        {
-            "name": "icon_green"
-        },
-        {
-            "name": "icon_red"
-        },
-        {
-            "name": "icon_white"
-        },
         {
             "name": "icon_open"
         },
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/brain-large.png
deleted file mode 100644
index 75ba8bb40753dc24b33d00b658b3f80b26ec920d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&pGibPR9J=WmcMHoXB@^q3TjtHJx4zxUvNFORH~3J9*c|N(2}8e2^72(0;L*4
z&>9f>15D}Q66nwr?<PMWU<3(<(#1Wgl2xoJ6+KILI_Ge-n_dU`eRHQf31`aU@1plT
zJ@5B<zR&v;uHq^_aKuDo{Aj!o*r>02mreTfxF5R&41oA$No!S|<!lasR?7gOT-Ib?
z(<_+0&J?_Z99M4~M2bm&pN4r32;y2*$FXcl7E_k++&9yK$`VF%pHwy@G5#o*HBPJ{
z+dIujAwodNfku7Z6V;wrLrEaWTP=ffS;J`V14!~zHUq$NHWv`LwOJsQ&CsZ?dr@v&
zn<d}cETHC##FQmzxt|b_!u-UJWlQ|5ILET7RrSbqBo+OT{><}R9%ZKpwX{Yox5}Tt
z{Dh`gB&mNLIF>El6Cwe&cbe222Qe`P*JjByy~6E#_X8E4SVL~zxr<s_1Hfz_;tgL1
zss-@eH>jmGZr!;%6`C({``-PKL;o5-N+$vW)O-=M*TEa~aV#56ub}3OIF^k!=;PTV
znap_cT#7V%9oaTsJm){-cT(BRG}nbtQAn+-^Xs!GL<%r_9gMC4AAKBIT})XD><W=s
zRPA3I0%x`laV#4(Uqmgfg{C+lV0)*@H{X6YzdE0wSrTvfdZ7^E&hFmPd;#TB9JAL6
zRj1~QGO74)mc(oy^5nNic!RzaBFHtpBF~Sl&BA;EA|5<^%yKp-6C2Haxrm<bKf^p7
zhDesPIn*0DS*bVZ2d1ypGT7ZaqWRZoz5peu&^_)_F2&`x^B*)P))4JW4fRGYL?S8;
zIC|mMgNKi?-#X|UX>KMa0ZiZ|bkAJbb}XCSy(4)X`{&ZX-$h&84`PnRSo3tq*I#`S
z$URrU7oUF4-~Sw=Bo)llA^Ju-kd%u#6pK-u^R=oj$CXRdl%q+4SAV>c&iZr1I9h;T
z#AuQL&VeraMjH3bMM)~yZyf+K*He<Ld)!4yDiSj#1yCf`pW7dS+ptkz_w<c4nd_+l
za5PC!Sc!*hRFaCs&cn>&n=i+Kqd4S%d*;d{q8e~<&w`1<xM<A0zKFmss5cH`t@b%e
zQeiYna5OlVgGZBu{Pl}lgc08bw$(lly$eDP)EfseacyQ+gCru}^%D`_{QU&r(rTZ}
z+_QWO--Q1AJF}`#Scyv_e_Mq3R#=JCeEBY46!F3*Sya5wqm=i2m|n$Ie9-tG`<W=`
T<t2PA00000NkvXXu0mjf%s$b7

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
index c8d773339d..1a74c2bc8e 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json
@@ -76,9 +76,6 @@
         {
             "name": "brain"
         },
-        {
-            "name": "brain-large"
-        },
         {
             "name": "brain-slice"
         },
@@ -150,9 +147,6 @@
         {
             "name": "plate-small-plastic"
         },
-        {
-            "name": "plate-slice-shading"
-        },
         {
             "name": "pumpkinspice"
         },
@@ -241,7 +235,6 @@
                     0.15,
                     0.15,
                     0.15
-
                 ]
             ]
         },
@@ -250,28 +243,28 @@
             "directions": 4,
             "delays": [
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         },
@@ -280,36 +273,35 @@
             "directions": 4,
             "delays": [
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ],
                 [
-                    0.20,
-                    0.20,
-                    0.20,
-                    0.20
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
                 ]
             ]
         },
         {
             "name": "lemoon-slice"
-
         },
-		{
+        {
             "name": "cotton"
         },
         {
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/plate-slice-shading.png
deleted file mode 100644
index 8874e9045456814d4a53d8380533e8a3a9e04c9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003INkl<ZScUD;
zy-UMD7zXg?j+2HKQ+kaa8G_Kk!4APGlOMPTMI1Bx*A+nujz!Wbw1Eb+qnnd~KoLQ#
zo_L}G2YZ`??{B-1yw7uQKnNj(5c1cUP5$&8=pF3?)!dvrd<%J=BRJT@WHiS83~&OV
zA%N%Q=Qo}Qyd4j99LK+AaGL^8NviKgDbU$5=c?U8Z`VV9Rfm808SeZ3%GtuEfa|(g
zB&o*jDKjOix!FQ<y~J9hzInF`=#!z|Pzs!L2q9K(*s4GnhO8(Gebc|tua{@+aJ$6A
z5_o*6-)SWS-INki%CAROzt^fjmSu>d$P64~ps!7d0R7DpjMeKFLVO1+rQkS@&3Hlx
c`Og5n1JtxjyG5(VvH$=807*qoM6N<$f^v<N6aWAK

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/jelly-sprinkles-overlay.png
deleted file mode 100644
index e50cb2b63b2aff900d6c2c2c4497aa716f245c83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349
zcmV-j0iyniP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003bNkl<ZScPL4
z1*2dTjDk@x(14K~`^{w7FvJ$`*zjLn$BSh1NYVhaSdyI`OlMDO`#&|W3T(#npFhE3
zr=I*G$pK8HSl%+T_rH>$5QB=A9vH(chdHXCrSw0x(7^|Y3IULzAPYFTxEV|=EE%Mf
zG#H-UyTNev(j|s>Z(gCOB{d`nh5)kVjmzi#H?VOATke~m`v3d4uW)tYwR!(RG(QUq
zk$#5&f+4VL>tt{|gM!@H$_{M#^B1oeo<6wCfb0Mm`1bcNgI7k#|H6tzM1?LvMH#xR
z49~xDfZ4JNiVSg0<^TIKiWzZP{_)QrFq>*o00Nm2tYF%&DD{79Tn5~7P%eO}aYzmP
v53}4>m7OTdN5Lo<1*2dTjDmp&3=9kaU;b;CrI+S{00000NkvXXu0mjfu~L}b

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json
index 837de9f8e8..34506a234e 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/meta.json
@@ -1,166 +1,160 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, further modified by ps3moira (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "beige"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, further modified by ps3moira (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "blue"
-    },
-    {
-      "name": "box"
-    },
-    {
-      "name": "box-open"
-    },
-    {
-      "name": "box1"
-    },
-    {
-      "name": "box2"
-    },
-    {
-      "name": "box3"
-    },
-    {
-      "name": "box4"
-    },
-    {
-      "name": "box5"
-    },
-    {
-      "name": "box6"
-    },
-    {
-      "name": "chaos"
-    },
-    {
-      "name": "choc"
-    },
-    {
-      "name": "green"
-    },
-    {
-      "name": "homer"
-    },
-    {
-      "name": "laugh"
-    },
-    {
-      "name": "meat"
-    },
-    {
-      "name": "olive"
-    },
-    {
-      "name": "pink"
-    },
-    {
-      "name": "plain"
-    },
-    {
-      "name": "purple"
-    },
-    {
-      "name": "yellow"
-    },
-    {
-      "name": "pink-box1"
-    },
-    {
-      "name": "pink-box2"
-    },
-    {
-      "name": "pink-box3"
-    },
-    {
-      "name": "pink-box4"
-    },
-    {
-      "name": "pink-box5"
-    },
-    {
-      "name": "pink-box6"
-    },
-    {
-      "name": "alpha-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "alpha-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "box-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "box-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "pink-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pink-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "jelly-beige"
-    },
-    {
-      "name": "jelly-blue"
-    },
-    {
-      "name": "jelly-choc"
-    },
-    {
-      "name": "jelly-green"
-    },
-    {
-      "name": "jelly-homer"
-    },
-    {
-      "name": "jelly-laugh"
-    },
-    {
-      "name": "jelly-olive"
-    },
-    {
-      "name": "jelly-pink"
-    },
-    {
-      "name": "jelly-plain"
-    },
-    {
-      "name": "jelly-purple"
-    },
-    {
-      "name": "jelly-yellow"
-    },
-    {
-      "name": "jelly-slug"
-    },
-    {
-      "name": "sprinkles-overlay"
-    },
-    {
-      "name": "jelly-sprinkles-overlay"
-    }
-  ]
+    "states": [
+        {
+            "name": "beige"
+        },
+        {
+            "name": "blue"
+        },
+        {
+            "name": "box"
+        },
+        {
+            "name": "box-open"
+        },
+        {
+            "name": "box1"
+        },
+        {
+            "name": "box2"
+        },
+        {
+            "name": "box3"
+        },
+        {
+            "name": "box4"
+        },
+        {
+            "name": "box5"
+        },
+        {
+            "name": "box6"
+        },
+        {
+            "name": "chaos"
+        },
+        {
+            "name": "choc"
+        },
+        {
+            "name": "green"
+        },
+        {
+            "name": "homer"
+        },
+        {
+            "name": "laugh"
+        },
+        {
+            "name": "meat"
+        },
+        {
+            "name": "olive"
+        },
+        {
+            "name": "pink"
+        },
+        {
+            "name": "plain"
+        },
+        {
+            "name": "purple"
+        },
+        {
+            "name": "yellow"
+        },
+        {
+            "name": "pink-box1"
+        },
+        {
+            "name": "pink-box2"
+        },
+        {
+            "name": "pink-box3"
+        },
+        {
+            "name": "pink-box4"
+        },
+        {
+            "name": "pink-box5"
+        },
+        {
+            "name": "pink-box6"
+        },
+        {
+            "name": "alpha-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "alpha-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "box-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "box-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pink-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pink-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "jelly-beige"
+        },
+        {
+            "name": "jelly-blue"
+        },
+        {
+            "name": "jelly-choc"
+        },
+        {
+            "name": "jelly-green"
+        },
+        {
+            "name": "jelly-homer"
+        },
+        {
+            "name": "jelly-laugh"
+        },
+        {
+            "name": "jelly-olive"
+        },
+        {
+            "name": "jelly-pink"
+        },
+        {
+            "name": "jelly-plain"
+        },
+        {
+            "name": "jelly-purple"
+        },
+        {
+            "name": "jelly-yellow"
+        },
+        {
+            "name": "jelly-slug"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/donut.rsi/sprinkles-overlay.png
deleted file mode 100644
index 1ce26ce00d241b15ca7d9ba4498c4a4295fdf02a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004sNkl<ZScPL4
z1*2dTjDk@x(14K~`};fM{%@SN3a<Ctzkdv;p8O)qD<nC<L5>4VOYjT8#gaOz|4+@U
zVtoGdCzwyFLzqah9Aq&Fn@79-fBX3pSbX>NrHq_h+zgWJ><p1P5&z9(*r@M-U0Wyr
z2U#p2D8%sn+gFCQ(^fHl|Mw5fzIFX7gRQeG1IQ5vX0InXN{Mp7yoy#vS$PG9!f8GK
zKm7Rv7Bg37Wl)i0U~n-1&ai9q1_qEk$Pu7Wpt=J<@hmPW$uOs)iBW)sg@Kuok>Sga
ze_;INIVZ!nzkeBAGo$~5LS);FH6(=sQHuSQc^T9+wHXX8Z5YlUKLQSRSV*ujGBODB
z@`0lR<dBbl{*aUqi3)+t2v)GAAj?4^0dmZ&t!w{F^6_I>PHGeo6$1THEDV~8d<@f9
z{08$uaSgH*1{_iY|1Y1i0&JG8Dmz2({?9}^fT$2Sah8$c`u$JfkjS3Y29E2@AQrH%
tK^SB?$YKy41*2dTjDk@xv;YGG0|0uIpfPWrfF=L{002ovPDHLkV1n!v#PI+C

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/honeybar.png
deleted file mode 100644
index 35349d92669cd37aa048c97ae0f1aa84f18ff12f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 504
zcmV<U0SEqxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005MNkl<Zc%1E&
zy=zlZ7>A$qnro@S#zbz94V4g(LJ4Z-3SEl0i(3c(0YMzH*r|yBK*wyQAD}}7akFu8
zDAJM?N)}6L42_4&%||81^oHbg2oyTB_a=1^InVz7p7*@(IR`Wvjpl#iWOq>==hxLB
zHG#h&KF+VJ(UBtZz$F}%j85I<`hz#Vvai&@$?l?(2QE=d(5)9RZapLzs?qMvV6-Hm
z*;k(VLp5+tJSH$&5`gZQ0HASLARLr@Ui-+?jrygIYlDbO*|Y*^_ht}@BAsSmCK4v?
z@(&ueAZiK9#cjSxhdap>kh?U~R|BPNT8V^7ry1#wx+RgeOE@kF#|53Hq|tHv;+%tF
z_ApGaYqn>$=L$;Mw7O`=Ra+twCZAS50H7*I1SVss$`RxDrkP*b^33;~K+UNTwFJbT
zP(3UVMPSgEZ@<f&2`7>%Y~bdN5c3=L0Bm`l-d_XU=F84LkLPN*PJwRxIh(6*u_6|M
z$ru0=$rL}O!?WeRfiJbMf_!E{0aVNT{QBKI8#RCxv3T@4H}rG%UAUQfsak(r+TXuo
un7u2Dha#U@Q14&dALy&qXfztlKhG(LJi9=hE$3JO0000<MNUMnLSTYw#pyW!

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
index 15e15c4208..aa94ad932c 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -13,9 +13,6 @@
         {
             "name": "dumplings"
         },
-        {
-            "name": "honeybar"
-        },
         {
             "name": "onionrings"
         },
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/alpha-tart.png
deleted file mode 100644
index a5e2508c2e5cc05de01acc4b983641ba2af4bda5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmV-&0ge8NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003wNkl<ZScUDA
zy{dyi5QWE!SojWs6qeRjHYxQ1@(3veEp6>B6$B-(An7)(wY8;%;46qfAZ$1b-r{nL
z4FuBc*X+*jFz3uVl0u<SD87yMu6`JXyzhI`b)EKoC(E+vh|lLU<$3;gO=)4z^Y}Q9
z{P}!x#DDj=Kk_~*j)HYvi^33u*b)C{0xM#f+PX{<p4o96GEI|g+om*4DUM@mnucz-
z8&y?B^E``l?7OZLpXFl)hGC$#ZRvi$Qxru)9Aduj3*o~A3?dK4FcUKT$RuIdQ2gjL
z2m&F_7!xl8Q!s=(h@*Sgb)|+;%I5WY)fi(u%d+22v4=3s6h$HOaE8t=my0${lhg}H
zxh%_)mSqvbkH>>!CIC7;enYIM(@8T7gSKs>bzLb*5-Af3g+ifFd=Dae0Sv*w?sW$d
Q1^@s607*qoM6N<$f-st&!2kdN

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
index 8c4a026d6c..83bd2b0bd4 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
@@ -10,9 +10,6 @@
         {
             "name": "alpha-slice-filling"
         },
-        {
-            "name": "alpha-tart"
-        },
         {
             "name": "amanita"
         },
@@ -83,15 +80,9 @@
         {
             "name": "plate"
         },
-        {
-            "name": "plate-slice-shading"
-        },
         {
             "name": "plate-small"
         },
-        {
-            "name": "plate-tart"
-        },
         {
             "name": "plump"
         },
@@ -104,9 +95,6 @@
         {
             "name": "tin"
         },
-        {
-            "name": "whippedcream"
-        },
         {
             "name": "xeno"
         }
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-slice-shading.png
deleted file mode 100644
index 8874e9045456814d4a53d8380533e8a3a9e04c9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 330
zcmV-Q0k!^#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003INkl<ZScUD;
zy-UMD7zXg?j+2HKQ+kaa8G_Kk!4APGlOMPTMI1Bx*A+nujz!Wbw1Eb+qnnd~KoLQ#
zo_L}G2YZ`??{B-1yw7uQKnNj(5c1cUP5$&8=pF3?)!dvrd<%J=BRJT@WHiS83~&OV
zA%N%Q=Qo}Qyd4j99LK+AaGL^8NviKgDbU$5=c?U8Z`VV9Rfm808SeZ3%GtuEfa|(g
zB&o*jDKjOix!FQ<y~J9hzInF`=#!z|Pzs!L2q9K(*s4GnhO8(Gebc|tua{@+aJ$6A
z5_o*6-)SWS-INki%CAROzt^fjmSu>d$P64~ps!7d0R7DpjMeKFLVO1+rQkS@&3Hlx
c`Og5n1JtxjyG5(VvH$=807*qoM6N<$f^v<N6aWAK

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/plate-tart.png
deleted file mode 100644
index 1e86936f2737ec212fd076a21582c37f46cf7b42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmV+l0rmcgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002dNkl<ZScUDA
zF$#n*5Jkr=f}nlK0mNJA+4UB|1BCPu#3suOWGg2cUDz$=HG>5Ie~A$UK@bE%_%#*R
zA7i9BO%u(&?_-IpwU)BSair&}I<8^`63#g)Ue~qgteU2wX^hEsWEZhK6^9Ut1lqR!
zh~y;Lg;ZWzd?b>Scs)x00$G9d9iMQP!3r$P0(D)3*7|lmzKa={#gV;)^E^kT6#jy+
zZ5w#+i;Atau<ttz!%%(+Igu-*;;!o`-xzc61UM1g-4S?7XFC=I;lBWYH!9UnECRNc
Qv;Y7A07*qoM6N<$f=SYDOaK4?

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/whippedcream.png
deleted file mode 100644
index 087318d2e0aeffb29e4a178a48602b92503fdcc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ$(}BbArY-_FC64N<RH-caJy5F
zKr`D%m5sW;H|XvbnAlOVfnD&6Kn%yDb3*Q0T5c|WZ+$NDN2P+&B9ZksGG8?`UtwSV
z*-Z10%z~;=&aR6UosaLyC35}n(@*TWW<PPS=;X>?=gr2hH^g4FPq?vI%lnDzN9)kd
ztuLo)KG+s%`JVaRTUI6h9Xd++*Up7FxVX6d=RLsAqiU#<{BxHQ(0L4=u6{1-oD!M<
DcwAB?

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay-active.png
deleted file mode 100644
index 38ae75f67aab992d1b88b51705a64278d150daeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 710
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVCwaBaSW-L^LEz$?As0^$Msb&
zELGs*E9v5He6aH7BvpGh=V?J)YD=TTE}Js;OBzXC+M4op*2yVOoD~IgkKUc7qc%ZI
z{9@UQ38(EJd=OFbJ2dHC_RFfEzjoc{s>;8=n|FWiyW_$<htHUDdpviaepg}d#;x{}
zd{*2SO%C0+zu!{v$0cOmx&!|mC;hwCef`!~9VM^1OP_Dtzt~9DhWSi{8UJ6Fl!mC>
zYNzuTU!1;DZ|yrzH1=;tx-*-?tsu58k=D3bDZ0l`?!K>>q912}a*oxq|ALb$EnZZ}
zt_fSc=wb%P&oHi?T6<0QDoZ{!WWDMu+jH69D8$~1eL{9+Sb1!C$KLku@A%DU9p_N{
z;yhFKxMxXm{4#6yJ29nu*B>~Q73*C;YxZv=&821g7brTc$n*0z&8_+)ylS@l*Ts+L
zH?%dZKU3~{^zNQ71s7(jgiR2P{i}AJv2$H&(Vy9u_(gYE*ngX+e}9gT-CWtWQ-0Oc
zk3D-AxFRn0(wE;~pXD)>YR+MgoOZ}l!I@zm%YSpDx2&5cmFiDmFMiLM)4;UlpcW>1
z!Ry1bUE)jhZ?P-hOnYs6r$52?%JI|B7S3-lb6)OnFWi2=+9`Xz_1(*Y*8A1P&bnop
zZXtRt@%bk0cX{>Bsh2(l&#g_Ee%zo(%viSbDQi(lD%S~y{ZnS{`mAT8{l4B~-qGbB
zYrovwCAg-lL8C$3VgA8Wo3|>=jjm}(<r0)n5YEtdC@+3B)kI5Q>4VpVbqgQAd+uo_
z*AI*r8@mQ8iE?{?qsbo`)igqD8aN;PXizc#p6XH4@b<hyjl!Z`m0#-i<vgAbmh=*p
oPiS&F!fwEG7=iwCDIT#^RPcM+<@wJMm_8XiUHx3vIVCg!0Qk>Du>b%7

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-bomb-overlay.png
deleted file mode 100644
index b6556f482dfee20749c142ba271cfbda95b17e1c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 295
zcmV+?0oeYDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002)Nkl<ZScPL4
z@qm$(0Jw2!Bb;q+8~6X@;YEz-Y!J}U^C#L&7E&C*FRFl(k1j_O2WV*6{Rh!EZXCiI
zaxi&PLYAZ`;OFQ6FE208@bKY7tnx6qj~_phWG>O*#-)w_L5|SV)BB&8nD{@9f#JU~
z0|S^15(CMB)R1B(sc8V@Gq43uo;+a)fr{UM@&sKC(O_sr0muQcV207iY?wSLW|9;I
zCl4=zI0PCMNWl$epFF$>Y&k8<0lYy=YW$PzfV-C=C82j{@Bgi<iy2{j5F1nmfM`-3
tFbYP&C>RB!U=)mkQ7{Sy7BDa{006J8Yh83l;FJIW002ovPDHLkV1nOIb)f(N

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-messy-overlay.png
deleted file mode 100644
index 7c8b686a4fb743bd5e83301016e68debefc98f35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 612
zcmV-q0-ODbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006jNkl<ZScUCX
zJ1;~*6rMq$ka#5Gs!*+JZy{L{v46m0ldV*QV*LY!trV;94{Re;D#?<dN3yo_C|nH+
z$xS5Kj)IXh>x{E=XXa9%uwOEnopa92_nk9m?y?5{J-A)~A%vWR^Bp-S@);2nN-7T5
zFv~dNqd1=15c88SEXd}J{=sBM&Q<|ocqZrS{f%hv?pJYM&KF_vl!G1C)ThH+TdIl7
z=2V<Fmlnb5CJ5k80gQ1GoR^FQx0Nl?mzw6fIP}4ceku~kF^(TprLD=Po{~e>XzvLw
zL~3|U5>av_?id)61Bq!2WUj+1AhBIkC1gY6%6`?=#wsU=ibT(zlA`e42Vc-?Q6W|V
ztbC+?h6^hy3pfPG_3WYKkt!BS*5l&^e29R1!@ESXr|WVg6k_zMpvd&==XFB%RJ>il
zepQt!u{gte_?;4=6JbT@!Fv<S!t;F9gs^6YSL6B)$UCFi<2sSgFnEe+mqb%c*^q2>
zeO3|bFQ&KG|C#_(aZJyT+P?CQh!ybD;JildZo*%{p9^Tw4fr1bcnmM=?xU%>mA$<_
z%Nb!>>*(|bNy8@Vyw(Z;IUGy}6=4F3(TAQ$tN<jB0}6rJCJIH{L`1Ft16>EY{H}d)
zw&x}5US321Dvl$!U4?6}F<v)7!??1bKH3*JOndQ)Xfs*`xJ01Ml_mO+6!)0OtpcbB
yIxtHYObuxx2N-+6w$awf-yv+Efd=Zp7<&i$=U4Y}pW5yK0000<MNUMnLSTX^%Ntn$

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/box-tag-overlay.png
deleted file mode 100644
index 51a1a1047162dcf547e2a100c00568950896ef15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJYEKu(kcie~3D(64B0Wuk23&3j
zH6%VZOpIduP;|`O!aBeHUcG?r$wDFJp1nm+z1EZkUS%{meSz_W;v>mN5nne3oMz++
z=-$xjEZY{^m&JGBX|+>>S|)?^0&fw61WwMFi%!Dq4La`I1dg~D30!rm23g`@d*HwU
a28Q4K8c(VtzrP1MgTd3)&t;ucLK6VyMm~Z7

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
index 001278b0d0..bafcde4e8a 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json
@@ -1,264 +1,246 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke, cotton made by mlexf (discord 1143460554963427380), world peazza modified from margherita by MisterImp (GitHub). Inhands ported over from Starlight at https://github.com/ss14Starlight/space-station-14/pull/72 with edits by Orsoniks.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "alpha-filling"
-    },
-    {
-      "name": "alpha-slice-filling"
-    },
-    {
-      "name": "arnold"
-    },
-    {
-      "name": "arnold-slice"
-    },
-    {
-      "name": "arnold-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "arnold-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "base-1"
-    },
-    {
-      "name": "base-2"
-    },
-    {
-      "name": "base-3"
-    },
-    {
-      "name": "base-4"
-    },
-    {
-      "name": "base-5"
-    },
-    {
-      "name": "base-6"
-    },
-    {
-      "name": "base-7"
-    },
-    {
-      "name": "base-8"
-    },
-    {
-      "name": "cotton-pizza"
-    },
-    {
-      "name": "cotton-slice"
-    },
-    {
-      "name": "cotton-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "cotton-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "dank"
-    },
-    {
-      "name": "dank-slice"
-    },
-    {
-      "name": "dank-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "dank-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "donkpocket"
-    },
-    {
-      "name": "donkpocket-slice"
-    },
-    {
-      "name": "donkpocket-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "donkpocket-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "meat"
-    },
-    {
-      "name": "meat-slice"
-    },
-    {
-      "name": "meat-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "meat-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "moldy-slice"
-    },
-    {
-      "name": "moldy-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "moldy-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "mushroom"
-    },
-    {
-      "name": "mushroom-slice"
-    },
-    {
-      "name": "mushroom-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "mushroom-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pineapple"
-    },
-    {
-      "name": "pineapple-slice"
-    },
-    {
-      "name": "pineapple-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "pineapple-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "box"
-    },
-    {
-      "name": "box1"
-    },
-    {
-      "name": "box2"
-    },
-    {
-      "name": "box3"
-    },
-    {
-      "name": "box4"
-    },
-    {
-      "name": "box-messy-overlay"
-    },
-    {
-      "name": "box-open"
-    },
-    {
-      "name": "box-bomb-overlay"
-    },
-    {
-      "name": "box-bomb-overlay-active"
-    },
-    {
-      "name": "box-tag-overlay"
-    },
-    {
-      "name": "plate-pizza"
-    },
-    {
-      "name": "plate-slice"
-    },
-    {
-      "name": "margherita"
-    },
-    {
-      "name": "margherita-slice"
-    },
-    {
-      "name": "margherita-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "margherita-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "sassysage"
-    },
-    {
-      "name": "sassysage-slice"
-    },
-    {
-      "name": "sassysage-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "sassysage-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "vegetable"
-    },
-    {
-      "name": "vegetable-slice"
-    },
-    {
-      "name": "vegetable-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "vegetable-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "box-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "box-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "uranium-pizza"
-    },
-    {
-      "name": "uranium-slice"
-    },
-    {
-      "name": "uranium-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "uranium-slice-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "worldpeas"
-    },
-    {
-      "name": "worldpeas-slice"
-    },
-    {
-      "name": "worldpeas-slice-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "worldpeas-slice-inhand-left",
-      "directions": 4
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke, cotton made by mlexf (discord 1143460554963427380), world peazza modified from margherita by MisterImp (GitHub). Inhands ported over from Starlight at https://github.com/ss14Starlight/space-station-14/pull/72 with edits by Orsoniks.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "alpha-filling"
+        },
+        {
+            "name": "alpha-slice-filling"
+        },
+        {
+            "name": "arnold"
+        },
+        {
+            "name": "arnold-slice"
+        },
+        {
+            "name": "arnold-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "arnold-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "base-1"
+        },
+        {
+            "name": "base-2"
+        },
+        {
+            "name": "base-3"
+        },
+        {
+            "name": "base-4"
+        },
+        {
+            "name": "base-5"
+        },
+        {
+            "name": "base-6"
+        },
+        {
+            "name": "base-7"
+        },
+        {
+            "name": "base-8"
+        },
+        {
+            "name": "cotton-pizza"
+        },
+        {
+            "name": "cotton-slice"
+        },
+        {
+            "name": "cotton-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cotton-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "dank"
+        },
+        {
+            "name": "dank-slice"
+        },
+        {
+            "name": "dank-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "dank-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "donkpocket"
+        },
+        {
+            "name": "donkpocket-slice"
+        },
+        {
+            "name": "donkpocket-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "donkpocket-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "meat"
+        },
+        {
+            "name": "meat-slice"
+        },
+        {
+            "name": "meat-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "meat-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "moldy-slice"
+        },
+        {
+            "name": "moldy-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "moldy-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "mushroom"
+        },
+        {
+            "name": "mushroom-slice"
+        },
+        {
+            "name": "mushroom-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "mushroom-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pineapple"
+        },
+        {
+            "name": "pineapple-slice"
+        },
+        {
+            "name": "pineapple-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pineapple-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "box"
+        },
+        {
+            "name": "box1"
+        },
+        {
+            "name": "box2"
+        },
+        {
+            "name": "box3"
+        },
+        {
+            "name": "box4"
+        },
+        {
+            "name": "box-open"
+        },
+        {
+            "name": "margherita"
+        },
+        {
+            "name": "margherita-slice"
+        },
+        {
+            "name": "margherita-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "margherita-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "sassysage"
+        },
+        {
+            "name": "sassysage-slice"
+        },
+        {
+            "name": "sassysage-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "sassysage-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "vegetable"
+        },
+        {
+            "name": "vegetable-slice"
+        },
+        {
+            "name": "vegetable-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "vegetable-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "box-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "box-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "uranium-pizza"
+        },
+        {
+            "name": "uranium-slice"
+        },
+        {
+            "name": "uranium-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "uranium-slice-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "worldpeas"
+        },
+        {
+            "name": "worldpeas-slice"
+        },
+        {
+            "name": "worldpeas-slice-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "worldpeas-slice-inhand-left",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-pizza.png
deleted file mode 100644
index 5f95d86cb38dc8aa7f2f66face0e8a05374ca5e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmV+k0rvihP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002cNkl<ZScUDB
zK?;K~5Ji8Ah@gA%1YX0Vdk0s+1BhEu5Eoj0=oE>y-6X5dTc{)^?`IMMMNt$*QIx;O
zumEk_Ug}WS^%1f-)>`AYHBE!$PP{Bj(9Mx~{UC||gNWyO4jSMth<gmfaKsi1MNzn~
zJkL>8m3c@98)D1xS|DA*<JW-LxBz|MBg-<BWf@&a2VHa$cL?`=H(l2qX`1qoU|m;?
z;}}J3t;M!&&iM`?At*iv35hQjF86>RgoF5I`ZLos;ak7Jxju;%#R1?6DJXM~wEw#$
P00000NkvXXu0mjf4ry!l

diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/plate-slice.png
deleted file mode 100644
index 1e86936f2737ec212fd076a21582c37f46cf7b42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmV+l0rmcgP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002dNkl<ZScUDA
zF$#n*5Jkr=f}nlK0mNJA+4UB|1BCPu#3suOWGg2cUDz$=HG>5Ie~A$UK@bE%_%#*R
zA7i9BO%u(&?_-IpwU)BSair&}I<8^`63#g)Ue~qgteU2wX^hEsWEZhK6^9Ut1lqR!
zh~y;Lg;ZWzd?b>Scs)x00$G9d9iMQP!3r$P0(D)3*7|lmzKa={#gV;)^E^kT6#jy+
zZ5w#+i;Atau<ttz!%%(+Igu-*;;!o`-xzc61UM1g-4S?7XFC=I;lBWYH!9UnECRNc
Qv;Y7A07*qoM6N<$f=SYDOaK4?

diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/ambrosiavulgaris.png
deleted file mode 100644
index 8bacd436d1c64763820e2ab3fce7aefe9aef521a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004INkl<ZScUDA
zu}i~16vn@k3@XM!QE0bLiVh+jI#hJ%<SHF4SQo)1gP^zzf>1CHf{P&S|Da1Zmkvc7
z6t{wd1wogHIs{I>T(2h3E7=^pZ^`Aocklb%%LP_eR#sM4e=TA1mr_EA-}F(#K|ZVv
ztUYXbQm>B-eza+Q%S&~%p#V2mXNg#GqYBq`vAio}JbrgBqdrqhLhkK5xb24UX8c5N
z6VOlqie@xm^NB1lode!Fz+y?&wdz2j0(2gM*ET?adNYjH@AtCbKR(UW06`F7^<Ywd
zeFL9eWxA4aP&)~u8Ul@Hl<{mHsFYMr$8!t7Llbzumcj(!m;mOt)tK2_H>CMRBaBYW
z#vd=LmgY3mU^|-%L__y_4I~&b0dT|EX!4Z&w&;zWF^-#NG$I_q2t!EbH1yM@G)~%>
zn5(Mi>6+h<>Dyi|s!4DHG}Kel@7geaiPQcSR#sM4R{u-@egHU8gQmE#>FNLg002ov
JPDHLkV1ll&wWI(5

diff --git a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
index d6c3ed7676..396309c3a7 100644
--- a/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/bowl.rsi/meta.json
@@ -1,190 +1,186 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Fills created by potato1234_x",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "aesir"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. escargot from tgstation at https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Fills created by potato1234_x",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "alpha-filling"
-    },
-    {
-      "name": "alpha2-filling"
-    },
-    {
-      "name": "ambrosiavulgaris"
-    },
-    {
-      "name": "beet"
-    },
-    {
-      "name": "bisque"
-    },
-    {
-      "name": "bowl"
-    },
-    {
-      "name": "bowl2"
-    },
-    {
-      "name": "bowl-trash"
-    },
-    {
-      "name": "bungo"
-    },
-    {
-      "name": "chili-clown"
-    },
-    {
-      "name": "chili-cold"
-    },
-    {
-      "name": "chili-hot"
-    },
-    {
-      "name": "citrusdelight"
-    },
-    {
-      "name": "clowntears"
-    },
-    {
-      "name": "eden"
-    },
-    {
-      "name": "electron",
-      "directions": 1,
-      "delays": [
-        [
-          1.4,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-	{
-      "name": "escargot"
-    },
-    {
-      "name": "eyeball"
-    },
-    {
-      "name": "fill-1"
-    },
-    {
-      "name": "fill-2"
-    },
-    {
-      "name": "fill-3"
-    },
-    {
-      "name": "fill-4"
-    },
-    {
-      "name": "fill-5"
-    },
-    {
-      "name": "fruit"
-    },
-    {
-      "name": "gumbo"
-    },
-    {
-      "name": "herb"
-    },
-    {
-      "name": "jungle"
-    },
-    {
-      "name": "meatball"
-    },
-    {
-      "name": "miso"
-    },
-    {
-      "name": "monkeydelight"
-    },
-    {
-      "name": "mushroom"
-    },
-    {
-      "name": "mystery"
-    },
-    {
-      "name": "nettle"
-    },
-    {
-      "name": "oatmeal"
-    },
-    {
-      "name": "onion"
-    },
-    {
-      "name": "redbeet"
-    },
-    {
-      "name": "rice"
-    },
-    {
-      "name": "rice-egg"
-    },
-    {
-      "name": "rice-pork"
-    },
-    {
-      "name": "rice-pudding"
-    },
-    {
-      "name": "slime"
-    },
-    {
-      "name": "spacelibertyduff",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "stew"
-    },
-    {
-      "name": "sweetpotato"
-    },
-    {
-      "name": "tomato"
-    },
-    {
-      "name": "valid"
-    },
-    {
-      "name": "vegetable"
-    },
-    {
-      "name": "wingfangchu"
-    },
-    {
-      "name": "coleslaw"
-    },
-    {
-      "name": "caesar"
-    },
-    {
-      "name": "kimchi"
-    }
-  ]
+    "states": [
+        {
+            "name": "aesir"
+        },
+        {
+            "name": "alpha-filling"
+        },
+        {
+            "name": "alpha2-filling"
+        },
+        {
+            "name": "beet"
+        },
+        {
+            "name": "bisque"
+        },
+        {
+            "name": "bowl"
+        },
+        {
+            "name": "bowl2"
+        },
+        {
+            "name": "bowl-trash"
+        },
+        {
+            "name": "bungo"
+        },
+        {
+            "name": "chili-clown"
+        },
+        {
+            "name": "chili-cold"
+        },
+        {
+            "name": "chili-hot"
+        },
+        {
+            "name": "citrusdelight"
+        },
+        {
+            "name": "clowntears"
+        },
+        {
+            "name": "eden"
+        },
+        {
+            "name": "electron",
+            "delays": [
+                [
+                    1.4,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "escargot"
+        },
+        {
+            "name": "eyeball"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        },
+        {
+            "name": "fill-5"
+        },
+        {
+            "name": "fruit"
+        },
+        {
+            "name": "gumbo"
+        },
+        {
+            "name": "herb"
+        },
+        {
+            "name": "jungle"
+        },
+        {
+            "name": "meatball"
+        },
+        {
+            "name": "miso"
+        },
+        {
+            "name": "monkeydelight"
+        },
+        {
+            "name": "mushroom"
+        },
+        {
+            "name": "mystery"
+        },
+        {
+            "name": "nettle"
+        },
+        {
+            "name": "oatmeal"
+        },
+        {
+            "name": "onion"
+        },
+        {
+            "name": "redbeet"
+        },
+        {
+            "name": "rice"
+        },
+        {
+            "name": "rice-egg"
+        },
+        {
+            "name": "rice-pork"
+        },
+        {
+            "name": "rice-pudding"
+        },
+        {
+            "name": "slime"
+        },
+        {
+            "name": "spacelibertyduff",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "stew"
+        },
+        {
+            "name": "sweetpotato"
+        },
+        {
+            "name": "tomato"
+        },
+        {
+            "name": "valid"
+        },
+        {
+            "name": "vegetable"
+        },
+        {
+            "name": "wingfangchu"
+        },
+        {
+            "name": "coleslaw"
+        },
+        {
+            "name": "caesar"
+        },
+        {
+            "name": "kimchi"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/bubblegum.png
deleted file mode 100644
index 268c55bad4d8b2a4a7dcfb3bf66b5b90d9279701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3Qrfukcv5Pr)=aspuod2SEIQ?
z&@Iu*Em0t51N%y)r8X)7OJ1!1b*L(y(M;Hh<D((F?3%58GapS6dgpdJI{R^BidIb!
zXZiMy12dag%RGHJU0QZppYvud)0r=H<13q<(HFh9dl&n-eu&py>T|bo&gWg$3M~SU
auHWep>v+ifPW=|p4Gf;HelF{r5}E+j2tnTf

diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
index c50a8f0ece..946d8b1a54 100644
--- a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
@@ -1,57 +1,54 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, swirl_lollipop taken from tgstation at https://github.com/tgstation/tgstation/commit/9bfce7e50375ac0b347c0236aa282de77c001767",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "apple"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, swirl_lollipop taken from tgstation at https://github.com/tgstation/tgstation/commit/9bfce7e50375ac0b347c0236aa282de77c001767",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bunny"
-    },
-    {
-      "name": "bubblegum"
-    },
-    {
-      "name": "chocolate-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chocolate-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "cocoa"
-    },
-    {
-      "name": "coin"
-    },
-    {
-      "name": "corn"
-    },
-    {
-      "name": "dice"
-    },
-    {
-      "name": "egg"
-    },
-    {
-      "name": "orange"
-    },
-    {
-      "name": "swirl_lollipop"
-    },
-    {
-      "name": "swirl_lollipop-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "swirl_lollipop-inhand-left",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "apple"
+        },
+        {
+            "name": "bunny"
+        },
+        {
+            "name": "chocolate-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chocolate-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cocoa"
+        },
+        {
+            "name": "coin"
+        },
+        {
+            "name": "corn"
+        },
+        {
+            "name": "dice"
+        },
+        {
+            "name": "egg"
+        },
+        {
+            "name": "orange"
+        },
+        {
+            "name": "swirl_lollipop"
+        },
+        {
+            "name": "swirl_lollipop-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "swirl_lollipop-inhand-left",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
index a2398a2fa5..776d2a903e 100644
--- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json
@@ -1,146 +1,140 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e. label-v.png made by deltanedas (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "bottle-ketchup"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and baystation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Shaker sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/7ec204f85ed34a3d9c9d09d51977f2ad610c481e. label-v.png made by deltanedas (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bottle-hotsauce"
-    },
-    {
-      "name": "bottle-empty"
-    },
-    {
-      "name": "bottle-open"
-    },
-    {
-      "name": "bottle-enzyme"
-    },
-    {
-      "name": "bottle-vinegar"
-    },
-    {
-      "name": "bottle-coldsauce"
-    },
-    {
-      "name": "bottle-alpha-1"
-    },
-    {
-      "name": "bottle-alpha-2"
-    },
-    {
-      "name": "bottle-alpha-3"
-    },
-    {
-      "name": "bottle-alpha-4"
-    },
-    {
-      "name": "bottle-alpha-5"
-    },
-    {
-      "name": "bottle-alpha-6"
-    },
-    {
-      "name": "label-b"
-    },
-    {
-      "name": "label-c"
-    },
-    {
-      "name": "label-e"
-    },
-    {
-      "name": "label-h"
-    },
-    {
-      "name": "label-k"
-    },
-    {
-      "name": "label-v"
-    },
-    {
-      "name": "packet-astrotame"
-    },
-    {
-      "name": "packet-bbq"
-    },
-    {
-      "name": "packet-cornoil"
-    },
-    {
-      "name": "packet-empty"
-    },
-    {
-      "name": "packet-trash"
-    },
-    {
-      "name": "packet-frostoil"
-    },
-    {
-      "name": "packet-greygoo"
-    },
-    {
-      "name": "packet-hotsauce"
-    },
-    {
-      "name": "packet-ketchup"
-    },
-    {
-      "name": "packet-mustard"
-    },
-    {
-      "name": "packet-mixed"
-    },
-    {
-      "name": "packet-pepper"
-    },
-    {
-      "name": "packet-salt"
-    },
-    {
-      "name": "shaker-empty"
-    },
-    {
-      "name": "shaker-pepper"
-    },
-    {
-      "name": "shaker-salt"
-    },
-    {
-      "name": "packet-soysauce"
-    },
-    {
-      "name": "packet-sugar"
-    },
-    {
-      "name": "packet-layer"
-    },
-    {
-      "name": "packet-layer-open"
-    },
-    {
-      "name": "packet-label"
-    },
-    {
-      "name": "packet-label-a"
-    },
-    {
-      "name": "packet-trans-1"
-    },
-    {
-      "name": "packet-trans-2"
-    },
-    {
-      "name": "packet-solid-1"
-    },
-    {
-      "name": "packet-solid-2"
-    }
-  ]
+    "states": [
+        {
+            "name": "bottle-ketchup"
+        },
+        {
+            "name": "bottle-hotsauce"
+        },
+        {
+            "name": "bottle-empty"
+        },
+        {
+            "name": "bottle-open"
+        },
+        {
+            "name": "bottle-enzyme"
+        },
+        {
+            "name": "bottle-vinegar"
+        },
+        {
+            "name": "bottle-coldsauce"
+        },
+        {
+            "name": "bottle-alpha-1"
+        },
+        {
+            "name": "bottle-alpha-2"
+        },
+        {
+            "name": "bottle-alpha-3"
+        },
+        {
+            "name": "bottle-alpha-4"
+        },
+        {
+            "name": "bottle-alpha-5"
+        },
+        {
+            "name": "bottle-alpha-6"
+        },
+        {
+            "name": "label-b"
+        },
+        {
+            "name": "label-c"
+        },
+        {
+            "name": "label-e"
+        },
+        {
+            "name": "label-h"
+        },
+        {
+            "name": "label-k"
+        },
+        {
+            "name": "label-v"
+        },
+        {
+            "name": "packet-astrotame"
+        },
+        {
+            "name": "packet-bbq"
+        },
+        {
+            "name": "packet-cornoil"
+        },
+        {
+            "name": "packet-empty"
+        },
+        {
+            "name": "packet-frostoil"
+        },
+        {
+            "name": "packet-greygoo"
+        },
+        {
+            "name": "packet-hotsauce"
+        },
+        {
+            "name": "packet-ketchup"
+        },
+        {
+            "name": "packet-mustard"
+        },
+        {
+            "name": "packet-pepper"
+        },
+        {
+            "name": "packet-salt"
+        },
+        {
+            "name": "shaker-empty"
+        },
+        {
+            "name": "shaker-pepper"
+        },
+        {
+            "name": "shaker-salt"
+        },
+        {
+            "name": "packet-soysauce"
+        },
+        {
+            "name": "packet-sugar"
+        },
+        {
+            "name": "packet-layer"
+        },
+        {
+            "name": "packet-layer-open"
+        },
+        {
+            "name": "packet-label"
+        },
+        {
+            "name": "packet-label-a"
+        },
+        {
+            "name": "packet-trans-1"
+        },
+        {
+            "name": "packet-trans-2"
+        },
+        {
+            "name": "packet-solid-1"
+        },
+        {
+            "name": "packet-solid-2"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-mixed.png
deleted file mode 100644
index 8684eb7359ef2314662f70f00218e9fd19b5ad71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 300
zcmV+{0n`48P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002<Nkl<Zc%1E(
zF$%&k6o!9`r^wJA!KKF#D!qV%=jb4GsFM)!8ZKTUcjzDl$q8(yhUXxHttB?GMTC6I
zgZxSO-%IiWcsw4@zagb0Q?w;;StNv@zUactX0nu$wpoT%lJx3}I7S$TR(o1iKq&<P
zxLmJTrfDm_>XR8@jP;J!b#2r~LkK~e^_mEvq9}*};+zu!bUvNP<t~g;fuZ`>2D)c_
z;M}N>Zs3{WF3*9cL7+7Pt#RD%Tl!=MK4ti`S1?rn+CVqMTU8nLA<S(iKQk=L@=c4P
y$f*KWZ4-F3W2F=rW9UZPHtfXMzoEzD@!SE@g@|(cIO<mb0000<MNUMnLSTZ3%Z3jC

diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-trash.png
deleted file mode 100644
index 00262668e844f935989fd16d852a75c3d8bb33d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmV;@04@KCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001)Nkl<Zc%1E&
zQ3`}G3`C=Nia_Teo=i`$o@Wo?L0ZT)^s6G${YVzkk9klMm_UZKjR+xxkca6!#X0BA
z%tTd}s|H|>7#KXoW>(X0!`vrgqW2W5>XE0E)_P7Rwp$IHCJ@qFxUN7|k0zy*v88)?
zd;;M&5YhiOzzMwO7ns@F(3aaL0HCW)u2DoL0It;@qHeoikq|<>>~hOY4IRg4(EtDd
M07*qoM6N<$f(&9+>i_@%

diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json
index 38f056fed4..1e521abedd 100644
--- a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/meta.json
@@ -1,104 +1,92 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "cornuto"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "sandwich"
-    },
-    {
-      "name": "sandwich-strawberry"
-    },
-    {
-      "name": "spacefreezy"
-    },
-    {
-      "name": "sundae"
-    },
-    {
-      "name": "alpha-filling"
-    },
-    {
-      "name": "berry"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "cone"
-    },
-    {
-      "name": "cone-trash"
-    },
-    {
-      "name": "fruitsalad"
-    },
-    {
-      "name": "mime"
-    },
-    {
-      "name": "rainbow"
-    },
-    {
-      "name": "jumbo"
-    },
-    {
-      "name": "jumbo1"
-    },
-    {
-      "name": "jumbo2"
-    },
-    {
-      "name": "jumbo3"
-    },
-    {
-      "name": "nogga"
-    },
-    {
-      "name": "nogga1"
-    },
-    {
-      "name": "nogga2"
-    },
-    {
-      "name": "nogga3"
-    },
-    {
-      "name": "stick"
-    },
-    {
-      "name": "stick2"
-    },
-    {
-      "name": "popsicle-base"
-    },
-    {
-      "name": "popsicle-base1"
-    },
-    {
-      "name": "popsicle-base2"
-    },
-    {
-      "name": "popsicle-base3"
-    },
-    {
-      "name": "popsicle"
-    },
-    {
-      "name": "popsicle1"
-    },
-    {
-      "name": "popsicle2"
-    },
-    {
-      "name": "popsicle3"
-    }
-  ]
+    "states": [
+        {
+            "name": "cornuto"
+        },
+        {
+            "name": "sandwich"
+        },
+        {
+            "name": "sandwich-strawberry"
+        },
+        {
+            "name": "spacefreezy"
+        },
+        {
+            "name": "sundae"
+        },
+        {
+            "name": "alpha-filling"
+        },
+        {
+            "name": "berry"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "cone"
+        },
+        {
+            "name": "cone-trash"
+        },
+        {
+            "name": "fruitsalad"
+        },
+        {
+            "name": "mime"
+        },
+        {
+            "name": "rainbow"
+        },
+        {
+            "name": "jumbo"
+        },
+        {
+            "name": "jumbo1"
+        },
+        {
+            "name": "jumbo2"
+        },
+        {
+            "name": "jumbo3"
+        },
+        {
+            "name": "stick"
+        },
+        {
+            "name": "stick2"
+        },
+        {
+            "name": "popsicle-base"
+        },
+        {
+            "name": "popsicle-base1"
+        },
+        {
+            "name": "popsicle-base2"
+        },
+        {
+            "name": "popsicle-base3"
+        },
+        {
+            "name": "popsicle"
+        },
+        {
+            "name": "popsicle1"
+        },
+        {
+            "name": "popsicle2"
+        },
+        {
+            "name": "popsicle3"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga.png
deleted file mode 100644
index 5553bbf95e9a491ef60c9c876bab95cc21f2c191..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002$Nkl<Zc%1E(
zzY4-Y48}jjy|a@DE>0r2_$a=F?!J(3p!ft16{IIc3WB)k6%=|cPW|VgEe=IYd$xl2
zn?iC)K9axz3WcI#YI&0Sy<wc?-xw=$y+)qqlkpUcnE(LJIb6>{6h;W+AZAP_i6A{r
znlI){csKXqe9q!>JpllOXT!3#AJ-*MfEgxsmYx|4LLWiklj_x}0=Ufq0GigMrpghJ
zAjCPfi-;i$a6RX(n6C>+_^B0CBH)!$Zy<|OZ$JnqwPoBvp$W*i11T#g0{Qpat!Hto
p-N}p{4|{Y6qg+3%LZMLnFLx$(Qm_9DoOA#H002ovPDHLkV1i>jcP9V<

diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga1.png
deleted file mode 100644
index 1c2bf264c26cf160045837784b31de9bd20e3ccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFfx0(IEGZrNluVpU7R4oW00WY
zK6&B3r}YxQ{~UdsGLw;6=Sjr8`Qb+kUS0}i1A?~2zt#Re7cx`5EvRD2koNOiuC=6H
z{of-8fZ)TUjWRpSCck3<sq+?JZxpk?QtBLk$Ig=l?+<PI@5L6F(#j;fQYvmw%|Vd*
z1LyTSpLBHceAm<Y{r~OTm;X<llKNlx@+g}JAEU&NA0I8}oIS69Qb53X;=}Xz@2kvq
zF5;;9^@nkNa>hFb35Px=FNT|Z3yxe5DP%BOpklJ(5yP%!js5cW2X0>RU>9j+FulYW
zx~M_Oq3C1f-!q^7f9leTcq(^q|KSChLY{$dEx6ncYDlmu^D{6++WOWXJ|>X@3>5}X
LS3j3^P6<r_ATx&K

diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga2.png
deleted file mode 100644
index 22500bc614a357b96d4fb8fb99861a3c4caf1889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6P_-PAr*6y6C_v{Cy4Yk1sY6g
z><>RwAN{)Fzrnxl+n4{>*3SNOd^x+U!Nf&30`7nM4-%`duKu+jsO*3BcYVV>wck4&
zy)VD`znA;;zu7mIOiq$v1_ADsQiqb38`)Hq%zb#|pr*znv2T_t(SFmI6As*6KlS0`
z<IkUDwKGpz#2^`PxTs5}f#=6hRrYI)Q(D+g^8NVnk$H}9=lPRm3`P<cTs(9Sc&uuB
yoj&dV^ze{_THinXlV$Ur>@n%A48+wFc^T@hZ47*6R@MOh#Ng@b=d#Wzp$P!k%5P%;

diff --git a/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png b/Resources/Textures/Objects/Consumable/Food/frozen.rsi/nogga3.png
deleted file mode 100644
index 1974e17fb3d475d49d2f3e4c6179d40b218c8c0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJot`d^Ar*6y6C_v{Cy4Yk1sZU<
z9SmS<`!((V{=K$;<&S;;==CE%TlT~J#>U2n_gYiI!ts%jkL~k>4H$)2_HlI2J+)wY
z^1uHe$@h2nANla@t}>gh@8bVFK%i#!a*5RO15TUxG&nkDo+x;B!pGwNA-i^+Vvn)|
z$NS|U<dp9ZYwMSvKRMNqXMzmtioS(sin?SScn^52YI~hN?f>-fkb_#^Km3zr^PTK5
g>8uRInG<;#R1!_ZzkPG;26}?Q)78&qol`;+01&Tc&;S4c

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index e12873f088..751b501671 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -141,12 +141,6 @@
         {
             "name": "salt-big_open"
         },
-        {
-            "name": "soylent-green"
-        },
-        {
-            "name": "soylent-yellow"
-        },
         {
             "name": "spice"
         },
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-green.png
deleted file mode 100644
index 0376f183f7a15e18b746aca0257b58d07ce250e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003-Nkl<Zc%1E&
z!Igv{5Jdm%GXW11NgptTy_g23F=;?VdLR}<a1V&04-`+c2kK%!EU50T2B@g0sHpfd
zUQfuzu-tKm;n|r#kHj^g0fB);tU>gBk}-<1Jyb4$OT>U(V`s~|a7#3X#Q~zd*x<mN
zW55pk9sxv-=j5y@vOoZ=7d5Hap19yGiM}FfYnn3k0=S(jW=%@_ueJGYSqqF|aW41Q
zTYt{&-1dNwK+~vgZJMSRWGo22Bi?%}zA7tz%>jCiV@}u;+8$Tl_aEA}J%~f51KZR`
zQ$DbIj-PhD^_%3a2;%SeFJ0F$jwACtAH<U#*zUXdDMx#8VXsVwDkIJzj&LQO?7-b?
zcc?zcS*!2+&!sq=Zh=y2L8j}|Q`46~i8w?ZP)aRr+tPL2{pkfL5#JI}N<DhNOK~S&
dQBm<P@COhfj^zlva@_y`002ovPDHLkV1jVatF-_C

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/soylent-yellow.png
deleted file mode 100644
index e0f1268e4cc1cf66bf17866701af9d64afa0a7ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004!Nkl<Zc%1E&
zy-LGS7>1vwRzik~A@~PHw_<S-3N0KnId}<Pf#U2Hco_jFFTlyY9hxFeE)sEb5Q?P)
z5iCX9#-S$tNt2v{phKP|hr`SFe&2h}38bW?q@?^YnMK65rFu!4gR|a3HKoP2rFx=b
z0Pytqil!}7*j}Al16<Z!PS3m2b)|%plN<Q~o%d{L4d8SYfZuJvwp1^>)u&q6NSr*N
zJ*2cVT_@^jq#8)lz<7GvLjX>W4VrfyL}m1Ky2{*SmXZpWtDiFdI5joaJc`H!Y)kc=
z=NQK|B{1}vjXh}Yr-7^M{a~-zY-S)L0ozhNrPyPy2zo0wb?)xw7Z3LuC2fdu)C0zv
zmz59nR*vHCdN6rO8#VdXzd+X;xUL(RM<(E(d(@4eEF7l+xTzmvnkJ1#*c>2qIR1M#
z@&hz&nb|c!NgIatXEi=?=5rHBy7iOO$7x^`dz?AU+yNnkSFYa17q6*_FT<&+Qsyv`
zfDppdbsf_*V~fioV;(dhgpm5#EJ~7jN=nMV;2XwB*JV2>IQ;+s002ovPDHLkV1kJ9
B&nf@_

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterbiscuit.png
deleted file mode 100644
index fe06122bf9f9d348e908406d6d4bb6745058149c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 478
zcmV<40U`d0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004{Nkl<Zc%1E%
z&1w@-6o9`;J2#U|XVP@iA|m+%Wt0XtF1mMD$RqdwE_@LeZoBmX+!fpjT_{%QLMgVv
zENWXC+Q4MYG_jMpQ^rMUKvy>s(8c|B_i%o`1NVSNqtR&oF~+O~`&)kI)YdTyjcF|E
zY~$3{sc*iSxu0^u{+6G)ew)$x0hNsx$RxlN9st?d9>M8HmhL<v>TJ_`-cjzWlz2Pb
zsz05^^7a~|@DSiPk%=76B#~1|a{V?|rHM=e^7a}s35dVF#S|W1_Guck9&BP&nz(*j
zr7Zx9N|qNVkn}O{ZgACo#bV}@Twfs0_V{58SmrfX!GK8;L2s8_7|&P0toDf~Psn}U
z0YH?y<N=6~p(Gj&Nka+jaBYvVs^j?z^gkT2aIc70`*~ATeufNskb8&e+`KcpM;z`_
z5FUf~2g(9Uf52F>C@lz#%POUn7Bc9Ot~MyGv<Qxi6phcMs|^amLk=TSM<@#@pUdIP
zX6Do%17Mb1GW$NpxXZ+H$;T0L7;*Xi3#lXKe};dG+-_L*9s>N;V2wtj(fl|30%o6_
UHXv&CivR!s07*qoM6N<$g5kZ|`~Uy|

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butterdog.png
deleted file mode 100644
index 082cd1496b90a87e0199feafde87c647232707de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 367
zcmV-#0g(QQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003tNkl<Zc%1E)
zu};G<6h%)FTNMeV6$4|o<{zR?nVC9vN+niSzJPB)f{$Qk;wQ*Phe{oyD9XZYhT;lb
z)qYOQ=DSArx$izdI}jBWP*s_$s?3$on#)jNfK`#vv^|ik=cii$CfVb}w$}Pl3SSi&
z08QJozAyN?NdcJdJEw_J3268%NvOBGKX8D}-K%qti~oX8_Z>PJ+qoEIKmym*FBj>#
zZH5_;!gcj7c^UA9H*L>*-GwpW1D_?y&p00R^7e6d3Pc8c;q`V0;H(}5_dr$VYPm?c
zo?o5Jxd{i3m20@IdJrZcf&Y$O3U?aN(M#ZF>=L-s0GwX0A>kqeuAYy9iwtO}2_M>X
zQ_cnI^Wk`phl<_HfHpB^)NB&9K)>fr+Xsb%=MRbbtd508MMXscd;`ax|F<=-Ckg-n
N002ovPDHLkV1iY)qCfxu

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/butteronastick.png
deleted file mode 100644
index a102602c40c97dc41057db4cfcabd1c0b4affe05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003oNkl<Zc%1E%
zF-pWh6hL1#L&%B<VxyAMB3{80c!qRZES|u|$`e>@zk=P`c!7W*2;RVeYY+?yf*?y)
z!xD*&S)APrWMa@}UN=Md@A1Qc!C)}_Ggh0!rcbAZ=x!|BcUE_mo?i#3q*YXfG!D=a
z1LPmi063d_l2bdNsd#pNe_(0rc;*#<DFzt7TuJw}0<y>RLUdPJ6>9|mOw%y{&T@5#
zu2?G|%Q9Totqf@@)(ZH{b0%quErb-(u_ukiS^)q@CpV1Zm|;JVLUhIJJC}OT@SxW#
z07h|4k|bPT90Fhqfn(h_7MCbD@KX#h><6_(b;Zhnd2twq-vff8O>v3zk?;G3=XrBt
znb+Gv0qS2+S6s5Nfh0+YqDVPpZF}DWc)L53Hliyw7z~DzFP1r*sw!ljVE_OC07*qo
IM6N<$f~=sF=Kufz

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishandchips.png
deleted file mode 100644
index 6919be0fcccffa4878d454705679e5cdf2aea358..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007}Nkl<Zc%1E&
z!Al!K6o<cULquE9cxpjxL!k)qWFaUi?a>NiPc4NWQgT?@ledbO9P%IJBt!`8)gIae
zTlFdxgH$c*s!$|mS<sW&K&wPjria;Gvq`jDdTAlQ%bS^O-uIg~ZwA_GtF8Y{B8L#0
z3E|G|v8b+k*8S?5ADF1FN{FTj`V(Me5t|7YSUM;Qc4y_frU_A96(WZ(Gs^Ei5IH2&
z(bi)bd*aZafSCZisli+p1~hna9~MWz(!jFdbrcpyP@cACwOsU+awY(=7$=1|y=uby
z;oUJfT#(Vx@-qnsX=Zm8W&$Xgj6VY+op#|T`;%U%k(J5!<M2Eocm4LAgcg8dyj5}j
zbC?EQhe!lva?-=}OkB9G!}vIq%dj8k#Dd-@cJg{Nc0YL59nEE>p~Ey(DqxxriAZRj
z3AYJFJ}(G|Asoh-nwD_Of&q=*vAo=&k-Y#oa|iDHHkXy-&J=u9F~%prH02T4`9(hO
zR#|c30Oc}DJg$@uiUOej^D=}&5RJmx+J&h~1-iSv(KMm2Pe!LmQ_}$4xfgbKEHq6J
z3Q73Hgc1OtSiDFE>}~BaH2eVL;UkXCBcjQqET67>A(zCpm#?_hcbm?xE;b75-lMTB
zD3x56;+}h@f|5+SP8Z*Q62V{xgF}Oyot|=R9yOkFOF7`3jUCR<tBfvuXu1I+l@gAD
zK+~?Uo6-0Nz|wgY$A}-f;OjNm{tA%@LRE#wL|w%K&cOLVsH$wnav4G)MybKi8cT(B
zg24^|Zrto_0{{4aCc)cZn){<cN+zQSRTa?c9Z*$4EGEyYr|0S>^dnur^brE=3N&hE
z1!A$kx&c=~>(%-xw#!2*1+8vCW2{f;6MUrsu-}IHd4Ea%5ZYE-ZMF4J=@+3uZ71W*
R^MC*V002ovPDHLkV1l-PRZIW?

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fishfry.png
deleted file mode 100644
index bf1975cdf02b2079a4a4410214962aa3031458ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 480
zcmV<60U!Q}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004}Nkl<Zc%1E$
zPfHs?7>6H4!pcx%NN{%*JVZC~5{vf`!LuL2Q=tf6bMPb->RFInL%)GglpJg!@zhfw
zB7{Wo4`v&UL|ImsAjU(;SZg;;@H)?BVBUA;`OWZxLZMJ76z}BI&$0G<&JPXJY}<Al
z!0@8{)=pSEFmY-yJwL|ATp1&mduguM8A_-Bd;dtkV#ABlxHO4`M`_$VV1%PMHP{Pg
z;SBiojqB4>R+lnt|M<-6Ql_s*^-S1(vFo}7Z)c@E5*`J6ztdDGNb%IP&gFSsu3JeP
z0Mj&mJ-!9ow%e}j@^m&!C<x6v2n8W>n1xsj3IzZucWUrqk~bl~E>sah_=Xtn^#ei(
z?!!fzcVJy)U&%ek;pk%;K+2sOujK1i5g|k`h5rmxDisom1iG$c6tkVpSPXA>7l4!G
z7vk19%X1ki@2)FW4lK}h9Zl0Hl}f$=dd@&TpKk{O0pjsE<2yTe)vA<FMBu7HC&c$#
zDc@WyN^!YdrqybZN~H#$0ly%B@^~C#WTyG1zaQ~H0sao6Y1%*Qp6B%~Rwxt-MVDt!
Wy}14%d`R&C0000<MNUMnLSTY371SC4

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/fries-parsnip.png
deleted file mode 100644
index 9fe88f6aaecc1b63f4ba6f645e8423a4fbef8583..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005fNkl<Zc%1E%
zF=!J}7{`ANK`M7iDoSZxb0xSq3X(-!GIR~N-VnIu)@<VB_BL@5Zm3fc0!|$qTH<iD
zh1*M-%TlP;LNQ+MutT`dLGIaLt_JEN-VfgLeZ2eq-}l}@K|w)5LBYR*1WJy#JCfHA
zT|@$v+y5(sE;_{3FnRLp0xwK<@^~DH1WG~|iN}#-VKRAE&%`&H$klOY;^Xa(oQ_Vk
z>~wS@p^JR!|LTP<dMzqn%4>u!k~TXSk6r+9|LZ%3!-4LXe2=u*q2zlr`|7sh)17D3
z?yhk5ysGQg>-ny^#dsWv5x!xx)t#wV+6sVG6NbY9we<#*UYAN+abdK0u=GLiNt+!u
zHX0<BgSk@8J!m<vkys9O8_r|+_IW_b_q2H8d(_&BNv})YR*bf~l$!%azBdyxv7Efm
zYfAHqfgfO)CW+-}c_yl@H-Mj^>bBxMMqfpxtyneT!f26L4u)wG_`$USa!1qO*^}kv
z+uVEqn7XYvk`@5B-agc#BWY0%UupTI*JbTxgkhQ-emvyz@;gs9pXNILNcNf!cK1c5
zseauuO@CXVi^w#UgWY}U@9Zu7`z@R<n@F{4%<V@}a`O`x6cqfI`~Z~%E$}Eee479O
N002ovPDHLkV1kff{kQ-C

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/lasagna.png
deleted file mode 100644
index 198d1d6fec0ec5001ca2e3269e58e232b7c726e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005=Nkl<Zc%1E&
zKWGzS7>A!6<@{{4=O8(RV$}{Y3Xu{75zHV>2`SV;aBvjebSO@uxP;P4TwD|!bPz36
z!Qm9*;t~H1MYj-QsjbM7gKPe1;NynIAx&B}mpfg(2abd9d*Ao>eDK{tNJvP?|4!sz
z8&?)`ZNHj>=M3NZz6D-E2eJkXKk)4P^7Kg{315Nx7inLZ9)sNDt;N!HNX!9HE!;sL
zwWum*VeKvKKZ&;YGXRfn-sbdFZlHwXCjelN9K|l?{|E=rM=eOqAwS$Ava{9;Z<fkI
zMh_OSEUOK$IBRr7ig{RB-V)hFIt%F2XBbJu`_B1MZ+hOBp+VuTR*RY(W}lEO&KhV!
zVRAkT#XPa*GS%;Q(Z-MUJ?*P&FChsZ*XpDk$McY$0$q+@dV%wBhQd+<+zrh0?@5o<
znVioOac!C<yA!sJg1Z60DZk-<0?}v`P1A6InUu!!r3L`z>K+PL4Kk|I3j>%~k9FR?
z728+9^A1!h6@(Dzy3V01uVGUH;K+_4Ce~xU@QkXEQ5AMg*}ptpR=<7q6d3p!nx@%S
zRh4)=j+ByjHx2_(i!?lYQkOrW>pDUR%H=Yy>yl2VJ#zy63Ac*?ym@wy-Qy=nCX;>Z
ug9QJT!0#eLh`#$$%D}-PAt50lU48;@zP0%)BbvPc0000<MNUMnLSTZ`i2V})

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
index e3fa26223a..4890758890 100644
--- a/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meals.rsi/meta.json
@@ -1,155 +1,125 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "amanita-jelly",
-      "delays": [
-      [
-        5,
-        0.1,
-        0.1,
-        0.1,
-        0.1,
-        1
-      ]
-     ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, taco from https://github.com/ss220-space/Paradise/commit/6c9bd827610433093a79d814b96bd50f9cf12eec, corn in butter from im_kreks",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "bearsteak",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "benedict"
-    },
-    {
-      "name": "butterbiscuit"
-    },
-    {
-      "name": "butterdog"
-    },
-    {
-      "name": "butteronastick"
-    },
-    {
-      "name": "cornedbeef"
-    },
-    {
-      "name": "cubancarp"
-    },
-    {
-      "name": "eggplantparm"
-    },
-    {
-      "name": "enchiladas"
-    },
-    {
-      "name": "fishandchips"
-    },
-    {
-      "name": "fishfry"
-    },
-    {
-      "name": "friedegg"
-    },
-    {
-      "name": "fries"
-    },
-    {
-      "name": "fries-carrot"
-    },
-    {
-      "name": "fries-cheesy"
-    },
-    {
-      "name": "fries-parsnip"
-    },
-    {
-      "name": "hotdog"
-    },
-    {
-      "name": "lasagna"
-    },
-    {
-      "name": "loadedbakedpotato"
-    },
-    {
-      "name": "ribs"
-    },
-    {
-      "name": "memoryLeek",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "milkape"
-    },
-    {
-      "name": "mint"
-    },
-    {
-      "name": "nachos"
-    },
-    {
-      "name": "nachos-cheesy"
-    },
-    {
-      "name": "nachos-cuban"
-    },
-    {
-      "name": "omelette"
-    },
-    {
-      "name": "pigblanket"
-    },
-    {
-      "name": "poutine"
-    },
-	{
-	  "name": "queso"
-	},
-    {
-      "name": "sashimi"
-    },
-    {
-      "name": "saltysweet"
-    },
-    {
-      "name": "soydope"
-    },
-    {
-      "name": "stewedsoymeat"
-    },
-    {
-      "name": "softtaco"
-    },
-    {
-      "name": "melonfruitbowl"
-    },
-    {
-      "name": "yakiimo"
-    },
-    {
-      "name": "corn-in-butter"
-    }
-  ]
+    "states": [
+        {
+            "name": "amanita-jelly",
+            "delays": [
+                [
+                    5,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    1
+                ]
+            ]
+        },
+        {
+            "name": "bearsteak",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "benedict"
+        },
+        {
+            "name": "cornedbeef"
+        },
+        {
+            "name": "cubancarp"
+        },
+        {
+            "name": "eggplantparm"
+        },
+        {
+            "name": "enchiladas"
+        },
+        {
+            "name": "friedegg"
+        },
+        {
+            "name": "fries"
+        },
+        {
+            "name": "fries-carrot"
+        },
+        {
+            "name": "fries-cheesy"
+        },
+        {
+            "name": "hotdog"
+        },
+        {
+            "name": "loadedbakedpotato"
+        },
+        {
+            "name": "ribs"
+        },
+        {
+            "name": "memoryLeek",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "milkape"
+        },
+        {
+            "name": "mint"
+        },
+        {
+            "name": "nachos"
+        },
+        {
+            "name": "nachos-cheesy"
+        },
+        {
+            "name": "nachos-cuban"
+        },
+        {
+            "name": "omelette"
+        },
+        {
+            "name": "pigblanket"
+        },
+        {
+            "name": "queso"
+        },
+        {
+            "name": "sashimi"
+        },
+        {
+            "name": "saltysweet"
+        },
+        {
+            "name": "softtaco"
+        },
+        {
+            "name": "melonfruitbowl"
+        },
+        {
+            "name": "yakiimo"
+        },
+        {
+            "name": "corn-in-butter"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/poutine.png
deleted file mode 100644
index b19ffc30b218f7dba66624a6ba53399960d16bf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 578
zcmV-I0=@l-P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006BNkl<Zc%1E%
zJ!lhg7>A!4nop4`iV>tz+)5m*P>RH%s2~c0lej3};FN=cAHhK!MRX9dwGg38XqV7J
zLLjsf3KtWw87$qxkwl1T!9mibml$4$G^b)NM9@LF2afyS`wq|Vefb~Q*x1<E*!)k(
z3L*tXEc-@QWChFqKMB!0i;*1|&Wc0B$i&DBK&hw;;|i*}gcKB0SSsqm_5zfnl#06i
z)lHZo4xT4hj!UJYNhs)(hqFheQqjzMDCjfgrK0|0GXuhm^p*a!%JPwC)W6p8&!6M@
zM;`#LQ6~UKyG1yb=FQz3%q=E}+`kFHy;tu5n4GM`_5vg4qkTP=0ie6q!>=be_CPUf
z;m4~q_M3!bX#if{xoQS7+AUn8P8<#gjr}H($nAp(qLc$VXU<Oabq%}&^+!4^NBJ@z
zMOBwj->%|ydrYy{?EzqJF+n(%#%Q<bbUI!6a@3R$!g2$tcv7ZjF3@Z=`24BLbm}7N
zhR>Wfa%m5B!-v=Hq0{MfYd!G{<i|Apr%&PWdf9ycfor#}Te>Vs#gnq0Sd*P<O-e;w
zq@YMB=#yMVGvD%*?&T{elFMk4%V<(6>atU<$$DZ<Qt{-#zhS6Usd!SHP8WfxfLS|{
zKgsTN?U!%H6?XkE*xKBp)iQ>f`j6Jq3o`rdGWjv>xBgzeIkecu#>S?{cdR@wxBH!n
Q7XSbN07*qoM6N<$f<4$7NdN!<

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/soydope.png
deleted file mode 100644
index 3bbc18231755db3a69503402a8510ef1bd1f6c7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 523
zcmV+m0`&cfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005fNkl<Zc%1E%
zv1;2;6o$W6)V{$IDA>jpbZC|uLWVqnhi-X+&^a&ArH~~A3LOJ2p-YDrI&|n%$O{zw
z1RYALBd79UxE8izhb!T0*To%Ft8S@`+@*`YO*;3S|NoD!ASWj$CnqQ8KXdC}8$X;K
zFTDOBdF~BHoW6O#@w|;2R)y7Qh_ziodL5j44W*|%dUdhU%*=;Zg?H*zJnt)PS&0b%
zCMq_zfsxx;4!wSS6pK$3*S#)Ye}K}{q%OS<JN0TJ{w)eQd-!0HW%gQ^Qp&}bx6fIM
zD?P;$#klx0eK;Ot+IIYY%YunQ_I&_M+vf1;OB}~Z)k)oelyVV8Q6hdF1WCeWdP@{B
zZJV390mK(k_I<vaWdOqQm?(;nQl@TW?I$ReN-$A;{PdYSB{NBHiDI&mo4LW=>NdS_
z&ait4fDs1x!{FD9HKZDFT^At)2Pfz3@9koVB1%uW>Rh4plwLT;5=D$Kpf?y{gaNfm
zIqBcu+vVuRJA@FpuA6FL?Hy>fT8l!VK%>z>YmM*wTs(UMz_5Es<=*|@64xqaoO+Fe
zlXHX+wA*cFvl-21GgT+kud-?+3t5CWGVrGnA;e$nTI<ZhIXO8?egFXu=Fow>XsiGL
N002ovPDHLkV1kFd?JNKQ

diff --git a/Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png b/Resources/Textures/Objects/Consumable/Food/meals.rsi/stewedsoymeat.png
deleted file mode 100644
index 13c1ffc1155f76a9961342d5993d0d75b28298ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006GNkl<Zc%1E$
zO=}ZD0EQoB4JnH*+DHgW4yE}JU6dj;h(vOziU$vcNT~-e0ns1eMS2tuy?79zsNg|G
z5X?_VvWJq0hRO;iW*Z??hQw4&yJ^x;SWj8}NYbP?VV}#gGqdwP^Ui{UgM)*EgTw#I
zRx)Ab7GoAbZZT#(yA`(fvd_M~1Ow>CDxb=N8Kc05laq`e9Aka6#gzxfNP9}71pj#S
zgf}l=6A1fJr>0?}PO7d@P8m!D6##?~7J$#^8%kvVZVQAE*7LYx>G>RM5tSW}4|Qr9
zJ)dKJv&E5PN0|sJ%+AM&{cP~~vXAT?m91pL>dFkFuVwdRCA)xbtWtWL2cZ19!NO^H
z(NgSpfJ;|ZIOKtiI;BDdfXMy#$g&LdZ=~m-5W;FUn*f-m$;#3kGe&{Kw-cl@X}*8`
z2EgomoOC8lZCgUB3wAudKc0cGpYa<>0AyM2Dbe=|WLd^EO+MbcfK(Set%07;+4F(0
z-wwZa@jQXBpUQH9>thY1x&WY5s9>6=-NMifXqslJs!F@vrdq8M{PNJg^LHtOv$08P
z+Y%={2RNS9S&OK4?Z3Bh=H@HBUN3I98(r6lMx+1a_5BAlO|x7s7okwd76DjUnggJ+
zT)=-W3}BzQ8-D6;#ttqPi*!1jp5X%pdWnp}Zoxwf{4L^ky9cgox7$MnJ2*IW`31L<
V^S`<{V=Mpw002ovPDHLkV1h*F3ZMW0

diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/crab-rangoon.png
deleted file mode 100644
index 5171bbd737681609a5d23c8b98ce6c9f836d20c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004vNkl<ZScPL4
z1*2e~0V6*94;(mvA*RlG=Ksy_COGwBlXq}%z-b2)DFFa7oOOK(m?lS_A_ssBebijS
zaQ6y+$KjHv*a0AL_6>x_<x7y|Ff~+n0Laq7i9HN*wLM^qusK4tcO6*G_syrN?|>^F
z2N*$?f-uMtFz~S}=|3!betx(Iw)~MxCf>wNmIFZGiDMVTCzf!qBYp?=Ft7_KF__h7
zf#pEH2Z77yi1$6o4*0-s2KL#}OG<DtkRw1C<oi>N(-`>6<`M0Ck{!SR^&!aDpdbeU
zki{Sj;)BFN(LqW!WFf_Ju)$EvK|v1lH3*p1L!#t%aS%jpZ4cf83kHZP31L2h`5N7F
z7=Wb*m_tB`732ttN<vr)2jSbl<-z$JmfGd>Gf>om#9n^*2bKpp5~PPvbl{BwnB}k(
zF8ARc+#+ylKX)3Q=mdVA`hR)i3<g~g$JdmQzu<si6d?Nm<U78@XW>~5J;j5{1Q4xj
wWXiw^bp)X(7zLwX6pVsVFbW11FfcFx0B&B_<oXo@jQ{`u07*qoM6N<$f_neIXaE2J

diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/lizard-tail.png
deleted file mode 100644
index 3d63372e719425d447179e2de575045a94cc6b52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 473
zcmV;~0Ve*5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004?Nkl<ZScUDA
z&r1S96vy90v=m<Kx8aJ0rF6;2eozn|>J*&~|FAAaN2$o0b*Y0C(GQf&L-dO>w@X2I
zk!tHO@g6&i)o!~%hoJdfcAQ<`_cL#1Kq8SyB>x`frU7Hg5iZ8}R}at??)>u2`a;I6
zrM3m=$+`JAV9YwoQ2@ieelK+Nw!`l79);s?1m^@7JC`Jf2*HDuBlcZ5(&!{mDQZ->
zdRGO#rqkG}3pf`|MCiNzsXm$;pC9Fhl&yiIfLIY0QalQzSJP&(R5HcuSB&BKo#+^f
z7~SIK!mXu*qd;aO!!Ss+UWB5^O}<P;d!jy$au|+XLJ@)JoE?s5Kzpo!R@EpN3k6~-
ziJaxm>3zL~U5%x+MK(J)XZg-iVEc3nV(Jh)zdnJ#RfSMI_(9|(TcWMeYdSNw2vn~M
z%}p&()Q&-adjY#}R|4?qI)&mvYN_H;xbdXJhaJi13RKTcu%O{5;hUwbImQ*^`4D@K
z67j?^KfK<D>46zn;fSkSV0Vuv!joWZqiN|j_}B48x@`}kL?V&=T>#)6URJxp(%X}9
P00000NkvXXu0mjf#O~fK

diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
index 1707edb5d9..8f68bfbc0b 100644
--- a/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/meat.rsi/meta.json
@@ -1,325 +1,316 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord), anomalymeat/cooked by august-sun, dragoncutlet, dragoncutlet_veins, dragoncutlet-cooked and dragon-cooked by JuneSzalkowska (discord), raw and cooked patty taken from tgstation at https://github.com/tgstation/tgstation/commit/b83c7deee4c91df4de130db242facce20308aa8a. A lot of inhands by Orsoniks.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "alpha"
-    },
-    {
-      "name": "bacon"
-    },
-    {
-      "name": "bacon2"
-    },
-    {
-      "name": "bacon-cooked"
-    },
-    {
-      "name": "bacon2-cooked"
-    },
-    {
-      "name": "bear"
-    },
-    {
-      "name": "bird"
-    },
-    {
-      "name": "bird-cooked"
-    },
-    {
-      "name": "clump"
-    },
-    {
-      "name": "chicken-fried"
-    },
-    {
-      "name": "chicken2-fried"
-    },
-    {
-      "name": "clown"
-    },
-    {
-      "name": "corgi"
-    },
-    {
-      "name": "corgi-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "corgi-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "crab"
-    },
-    {
-      "name": "crab-cooked"
-    },
-    {
-      "name": "crab-rangoon"
-    },
-    {
-      "name": "cutlet"
-    },
-    {
-      "name": "cutlet-alpha"
-    },
-    {
-      "name": "cutlet-cooked"
-    },
-    {
-      "name": "meatball"
-    },
-    {
-      "name": "meatball-cooked"
-    },
-    {
-      "name": "meatball-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "meatball-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "fish"
-    },
-    {
-      "name": "golem"
-    },
-    {
-      "name": "goliath"
-    },
-    {
-      "name": "goliath-cooked"
-    },
-    {
-      "name": "lizard"
-    },
-    {
-      "name": "lizard-cooked"
-    },
-    {
-      "name": "lizard-tail"
-    },
-    {
-      "name": "plate-meat"
-    },
-    {
-      "name": "plain"
-    },
-    {
-      "name": "plain-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "plain-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "plain-cooked"
-    },
-    {
-      "name": "plain-cooked-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "plain-cooked-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "generic-pink-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "generic-pink-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "plant"
-    },
-    {
-      "name": "product"
-    },
-    {
-      "name": "product-cooked"
-    },
-    {
-      "name": "rotten",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "rotten-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "rotten-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "salami-slice"
-    },
-    {
-      "name": "sausage"
-    },
-    {
-      "name": "sausage-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "sausage-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "slime"
-    },
-    {
-      "name": "slime-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "slime-inhand-left",
-      "directions": 4
-    },
-	{
-      "name": "snail"
-    },
-	{
-      "name": "snail-cooked"
-    },
-    {
-      "name": "snake"
-    },
-    {
-      "name": "snake-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "snake-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "spider"
-    },
-    {
-      "name": "spider-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "spider-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "spidercutlet"
-    },
-    {
-      "name": "spidercutlet-cooked"
-    },
-    {
-      "name": "spiderleg"
-    },
-    {
-      "name": "spiderleg-cooked"
-    },
-    {
-      "name": "tomato"
-    },
-    {
-      "name": "tomato-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "tomato-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "xeno"
-    },
-    {
-      "name": "xenocutlet"
-    },
-    {
-      "name": "xenocutlet-cooked"
-    },
-	{
-      "name": "dragon"
-    },
-    {
-      "name": "dragon-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "dragon-inhand-left",
-      "directions": 4
-    },
-	{
-      "name": "dragon_veins"
-    },
-    {
-      "name": "rouny"
-    },
-    {
-      "name": "rouny-cooked"
-    },
-    {
-      "name": "anomalymeat"
-    },
-    {
-      "name": "anomalymeat-cooked"
-    },
-    {
-      "name": "dragon-cooked"
-    },
-    {
-      "name": "dragon-cooked-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "dragon-cooked-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "dragoncutlet"
-    },
-    {
-      "name": "dragoncutlet_veins"
-    },
-    {
-      "name": "dragoncutlet-cooked"
-    },
-    {
-      "name": "raw_patty"
-    },
-    {
-      "name": "patty"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept, potato1234x and deltanedas at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, snail by IproduceWidgets (github) and Kezu (discord), anomalymeat/cooked by august-sun, dragoncutlet, dragoncutlet_veins, dragoncutlet-cooked and dragon-cooked by JuneSzalkowska (discord), raw and cooked patty taken from tgstation at https://github.com/tgstation/tgstation/commit/b83c7deee4c91df4de130db242facce20308aa8a. A lot of inhands by Orsoniks.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "alpha"
+        },
+        {
+            "name": "bacon"
+        },
+        {
+            "name": "bacon2"
+        },
+        {
+            "name": "bacon-cooked"
+        },
+        {
+            "name": "bacon2-cooked"
+        },
+        {
+            "name": "bear"
+        },
+        {
+            "name": "bird"
+        },
+        {
+            "name": "bird-cooked"
+        },
+        {
+            "name": "clump"
+        },
+        {
+            "name": "chicken-fried"
+        },
+        {
+            "name": "chicken2-fried"
+        },
+        {
+            "name": "clown"
+        },
+        {
+            "name": "corgi"
+        },
+        {
+            "name": "corgi-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "corgi-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "crab"
+        },
+        {
+            "name": "crab-cooked"
+        },
+        {
+            "name": "cutlet"
+        },
+        {
+            "name": "cutlet-alpha"
+        },
+        {
+            "name": "cutlet-cooked"
+        },
+        {
+            "name": "meatball"
+        },
+        {
+            "name": "meatball-cooked"
+        },
+        {
+            "name": "meatball-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "meatball-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "fish"
+        },
+        {
+            "name": "golem"
+        },
+        {
+            "name": "goliath"
+        },
+        {
+            "name": "goliath-cooked"
+        },
+        {
+            "name": "lizard"
+        },
+        {
+            "name": "lizard-cooked"
+        },
+        {
+            "name": "plain"
+        },
+        {
+            "name": "plain-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plain-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plain-cooked"
+        },
+        {
+            "name": "plain-cooked-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plain-cooked-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "generic-pink-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "generic-pink-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plant"
+        },
+        {
+            "name": "product"
+        },
+        {
+            "name": "product-cooked"
+        },
+        {
+            "name": "rotten",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "rotten-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "rotten-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "salami-slice"
+        },
+        {
+            "name": "sausage"
+        },
+        {
+            "name": "sausage-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "sausage-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "slime"
+        },
+        {
+            "name": "slime-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "slime-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "snail"
+        },
+        {
+            "name": "snail-cooked"
+        },
+        {
+            "name": "snake"
+        },
+        {
+            "name": "snake-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "snake-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "spider"
+        },
+        {
+            "name": "spider-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "spider-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "spidercutlet"
+        },
+        {
+            "name": "spidercutlet-cooked"
+        },
+        {
+            "name": "spiderleg"
+        },
+        {
+            "name": "spiderleg-cooked"
+        },
+        {
+            "name": "tomato"
+        },
+        {
+            "name": "tomato-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "tomato-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "xeno"
+        },
+        {
+            "name": "xenocutlet"
+        },
+        {
+            "name": "xenocutlet-cooked"
+        },
+        {
+            "name": "dragon"
+        },
+        {
+            "name": "dragon-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "dragon-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "dragon_veins"
+        },
+        {
+            "name": "rouny"
+        },
+        {
+            "name": "rouny-cooked"
+        },
+        {
+            "name": "anomalymeat"
+        },
+        {
+            "name": "anomalymeat-cooked"
+        },
+        {
+            "name": "dragon-cooked"
+        },
+        {
+            "name": "dragon-cooked-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "dragon-cooked-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "dragoncutlet"
+        },
+        {
+            "name": "dragoncutlet_veins"
+        },
+        {
+            "name": "dragoncutlet-cooked"
+        },
+        {
+            "name": "raw_patty"
+        },
+        {
+            "name": "patty"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png b/Resources/Textures/Objects/Consumable/Food/meat.rsi/plate-meat.png
deleted file mode 100644
index 7934423ee045c90c5903e44dce7fdc2b1ac62b2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 259
zcmV+e0sQ`nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002WNkl<ZScUD9
zK?;N*6oy~JAVTh?6Lbxa-W^<t2Z;6x(xQeJ(=e504#8~Rw=qTk{}Tg(AP9o^H&v{^
z>$<~Q+qQG5t1;$~uaw%%pSh5=*n3~v|2Z2I$qMX?opZ$kS45&_ec#V_6t4&&man?5
zp=p{;=Oc9pH{VeX?@M4_jHrOM7C7f1rMyJ|b1)Bc_eB4JX__jn^~@N<_k$1u48!nq
zu`ve5aa?jQ39J%W{4G+-S#ee%C4zxC;>}Xv{#-FZ5CpLR053&IZH-?y7Z?Bl002ov
JPDHLkV1mDiY8e0k

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/box-trash.png
deleted file mode 100644
index 9a2d989b36838179e80f27d14c120e3ad0678e93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004fNkl<Zc%1E&
zv1-Cl6o!9`&^UBZBqc*FjSwLj;?gk?gyLG4Y~9W33*-&DIP?MBI{5@$d;u*eC|J=B
zp&{fB8BC|!DIr4J9HB%g`L>XA&-u=|hYJ)G6cqe7hW#EtwF8Fz9=8qov?7jWk|fS3
z$&T&DHe~L(J5nr3K-F~8SZzb*@eZh(j;G06DJyrGBCwdxplUi)O@|HebmCY_)pP)W
zA25hg1B>~Lk{X$Y=^~=k007i$)dMjA*sPaH{630E-2;Rxa4eIHQUj`{BV-;z<|PFy
zf`H9>2|r)}fSYCuX;BK9SKzrjR0IJb^RSO1EI&$^ZeNrC?dx;YYgL5IgC8(lR7Ip0
z&>dM^dU*bE8ku7n_Iun97$(zq0Km&?ot)_?&2N{ob;;4aE#v-imBfw*3QvEN1O|61
z2Y~7J^Puo=bd)AH+E?)09eEG_9NUn&W0|D4gY*s@OWb)Z;f}0)pJm4~$rH$(@j%H}
gEcb#11qH|Q1)ye^z#=mUCIA2c07*qoM6N<$f+*~}(EtDd

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/candy-open.png
deleted file mode 100644
index 48b953ee44f5ae7487f4d24f0d3156defc6b9cbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004JNkl<Zc%1E%
zze@sP9EYDQ$k7UdNc6T63<Sp@s6U`Z*M`Q%qA41M7Rj-pz@k;BhM>VCL69U6I+Vyk
z#fXr|B`Bh<A${}CI?o?N!~0p@`@TQ!dG5=-AR{9qBQxZvAw^e1if(uR$S}bGPmKlu
zQ!W<(%gM4OV_*R@`1$P<fQfO3Es?$il8LBjv3?Nw6>P503Jp#kI(cKgfRE!lI)GR4
zi@D0iE&!8F88i5*{%-kB+a1VgTjHzla!vsJ3rmJQm9hp+k#_K7{RN=E4zz;-!qK33
z-Xm?0@G5?^n>2+c+zQ-PAab<Yah1Z+Ac^g3F#>40v{;{Y&)Eid6#&Q=tK^GS05;cG
z1hh2*)IPr3?jHU5FYJI@as0J#etBW2WAPNRcuLf2wuG83iTW_L&wcIIE?30TbaBn8
z1I$d%8|DK(Plssc^tG=mZR?O(B;fN54DLz5EHVtRjEs!TzsVN{JduEWY7>$G0000<
KMNUMnLSTZXi@Trz

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/cracker-dip.png
deleted file mode 100644
index 14846b7a04925098754a526d26f60855bb028738..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 807
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V0!22;uumf=k46{UebXg?fpx+
zV@t$cHl1FjdTCM0#JQY1PMiw=Alss~&vB_HM{QFcx6{IPOGLKB?v#k)n##qxu-k-3
zPm5)8>jb@9lIt$tIMeg}nT7fN?WbC#_x(=yOOtuu-vP9Yp@CKJ+qL!|my6GD`?JYD
zV0MerueG`kD);Z+oZg@B|J3#GK^OIfE9$hl6HbL^`9J!uZp!KU?S2)b($16HFAHm4
z4Rdu#$u2ziQbpvheX_G%^r{n^m+LRRm2tB2!@v1uiSNDU)xW)e>gj6xa@HBz^<Uog
zc63asvUfkVx_27O+htdcFN)W%W8HBhTE5Qyx1jv>>C;n^t9|WQ;-6eR{A&KWD`Bc{
zVmmudJU*qrGFL9jnz{DV{qxHE-|#QlW1v4bPvdFp&xvpS`uISatnOa;^`Q1s`l^N}
ztm>~?I!@%Q6q?U^@zidqJ^uf$h$fusx38V{>(iyJep7n4U3EL{dGq%R|ErFlv+OPG
zyYHL#pDns`_vZGh>kl{A=K$TBe`@maG|OEQHDddHV}Ady=H<9`Hak_k@N%}`#;9+V
zf4BKHc>XwU#&hdz;wLZpsd1ZFa{cNi{*CS~KD?!S!m7Y4olnXWT2>$QZ??aho00pu
zVA*Bf<eiaa>)7A#w!h3i`Kd+c!Qb!Be`${>QM)lIJ@wXK!)@|857|MH0s<!-FMfNT
z{re=l2GRJqnN;cgYT-c3eRZWdxlEsa#MZsN@y+@qd&c|o+aJ!GGQXx_6A0h;v^((a
zv-l^*`j3V6`?lRbUDL2yeZj5A{TJ`a+rO=A*xmcOo{16S3<n>QoiX<bbJrI8_}lNF
zzGoLX>2K$76NJydhx%mi8TKEqpjH9x*s*%TM6dJt_0mhvDti8Y53<$M)z4*}Q$iB}
DVBe0}

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-closed.png
deleted file mode 100644
index 909147cc6ab070846a89b0b814eb054ba7f1b361..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 386
zcmV-|0e$|7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003=Nkl<Zc%1E(
zF>-@25JkT;8O}hJaSCyQY;7vlzJXnO2Fi34ski|JB}Yi@ie5L68oToqQYnQX!C;F`
z>`5BEhTWCWe*FOn2m}IwK;WNQa3*Q3?Qa_-N#gA>D?n>)%d!L!K`AwP7DWNyI1wSw
zbJj+$3b@92Y?y1Ut=8IBRpoW>kt^i*yg-}+r`F|h3Pde%?BY`kL;yYp@!M(xBJ!^L
zz!d<vh2xYTb6`1OjKNb1)D3{f)ppx1?_vOWKXf@d5sXil<$w_4E8cCt8;*rs%I_jz
zNZp(_sGD;^<NWRdI1c=Tn;q~$M37Q?=deG*sCB#Re?tIRFJ0c(*GpIL=P0XY1<X3I
z-|r!Wn4AHexPRZrtOHq=!5D+mZh%!+v;e)jqZSqy>-0i^Qgh4mE~D{rI<$4TLn-BC
g$2Z*rfxutz3371EbZb{&R{#J207*qoM6N<$f)*X8J^%m!

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/erp-open.png
deleted file mode 100644
index 70d56114b84779670ffc8a77e2d9743b6e2a3f40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004MNkl<Zc%1E(
zF>Zq}6o&s)72*h)s&wE6^%#YTIU8d#MuM?>2h<xdFmi;<o{$*1fxR>vSLoypHmw81
zcAL-+<(uAnHhRB**$==1V@%lgOok9b#Bn^SfIHJ7=N#+xddmK00RT|f_1_AZ9he=M
z9r)i4P)a9vz{=GBf_vMBEX&~g{-_8-$e`9V&0sxE)5VV!GRDLu`fGa57!!;!k>|P5
zL8}8Dr^f}BA<$MbUxt8J0Vfr=72pAQ*W#DWZqy|m>nqS{E7{C7cEQO3&N&`JpeO;9
zvUb?3T*Uxzd{a4;2#4$I<UkMvpYdV;)vzyQEWe2WouWK%P?YC_`uWWTxH#|~u6Do#
zAp}tr8TU9}La&mi>z*M1Y*#Yx>f4p9cY7MqSOr)epp+sAg24=MiM#JjSRF``1e|lc
ziXE^~MFEg!BFC=4Xq`L}KpV@KaGKHmajM&@pD>D|!HKW>56sN`1|K*e)EDVi{+j>*
N002ovPDHLkV1nEVy9EFM

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json
index eae9ce1928..c2e8a364ed 100644
--- a/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/mre.rsi/meta.json
@@ -1,83 +1,38 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/633736637f35321062f723752cb9e5d797c532aa/icons/obj/food.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "box1"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/633736637f35321062f723752cb9e5d797c532aa/icons/obj/food.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "box2"
-    },
-    {
-      "name": "box3"
-    },
-    {
-      "name": "box4"
-    },
-    {
-      "name": "box5"
-    },
-    {
-      "name": "box-trash"
-    },
-    {
-      "name": "box-closed"
-    },
-    {
-      "name": "candy"
-    },
-    {
-      "name": "candy-open"
-    },
-    {
-      "name": "cracker"
-    },
-    {
-      "name": "cracker-dip",
-      "delays": [
-        [
-          0.6,
-          0.6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "erp-closed"
-    },
-    {
-      "name": "erp-open"
-    },
-    {
-      "name": "mre-closed"
-    },
-    {
-      "name": "mre-hot",
-      "delays": [
-        [
-          0.5,
-          0.5,
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "mre-open"
-    },
-    {
-      "name": "paste"
-    }
-  ]
+    "states": [
+        {
+            "name": "box1"
+        },
+        {
+            "name": "box2"
+        },
+        {
+            "name": "box3"
+        },
+        {
+            "name": "box4"
+        },
+        {
+            "name": "box5"
+        },
+        {
+            "name": "box-closed"
+        },
+        {
+            "name": "candy"
+        },
+        {
+            "name": "cracker"
+        },
+        {
+            "name": "paste"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-closed.png
deleted file mode 100644
index 66d37db21ecf9f64efc48c8f7319fac3e5ee7ff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJy`C<PAr*6y6C_v{Cy4Yk1sWV^
zm>AKjc$DqGr(uQfd)7r~)Vu;cHXi(c$VGjT?)&-s`!n1P0&f?w0l|za*?PaGg~y!M
zEd1?%NAaZK5vC?Zg}>@0*Zv8YOX$6SmXeT=pfD?~Zqc~|2M!o?Px#65m_v+pN!x+e
z*ZmTCcXpmENPS$sr%Zr{F{(L`y~iry3gcov2`RoC^^f=t1J!hxO%d7Za<$EX+0$@F
oghNPk3(!hwg%H7BCXoFM^YR>gtya#;1bT$Q)78&qol`;+0QI?Cz5oCK

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-hot.png
deleted file mode 100644
index 2a5437c826178eb194692c31fbb3da4fd5766e77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0008hNkl<Zc%1E;
zF=!J}7{~usmoAkIPL&K|C`el}iA$9hf?XsODsk=5p@k};qc{eni-UuTgANWkQjnUd
zw0aaNWDzB5v~V~?2XP7Q5{r~L=nLt2z4zX|_wst@_g})jyu9E4zI^%aF7E?Kq)^Q+
zXFEye5Afh8zl|Ikt5n?ylZJTwAXTdFL{wj)0VvK*VJz2<vaS}1@~>Z;d>xe$8UO%z
zzcI*N#AH?k@pbaJ0SNjAf()1nf}gLOEu8@@-Fl%aDJaYL^O%pQ9wKFc$rBdg`$aWC
zLE377sjTqxgE)Py0bxc=h?jw?KBxxpCWzDkn^yr<oeF#N-ji3z=F)H+pi*_E?#Wl5
zJ%r;pCsfS!gU_8%C=@z3?+oMl<I^&HeEr_Q$Dc3oVXdtc1k?P`3;=+GvpWEWF*Co5
zwZa1cz=bPU(b!tY(s&B@>#e}CgXs~#lkzOYUm8#0W$GdtTkD6IY)qEV4FHo{^N@EI
zy2qKt1vCNV0i;W1G#Afx$1bmI;|unsPgaEA1d#d5XFgCWBNLG?8~|n_NPG1bhI-!H
zds7Fd`H!)(GQsCw1w=Gd%;{Lh3SUbA;w&Qph*L&T2G}-WTND7>25gH0ATr6Vd3g7!
zDZHr6T-$u1J3+Rf?h_N0NxsmN+Gu_-()N_<li+dTlSrihSkxa7gZ==fDBcp$AE2UG
z?hWc>#;!j=H$RsB0e+@Rk3b^!1_6T&5>x|@S%1J$tiII%)t($#$?Q%?2?F>3fU#T~
zj`J_9U-I*hlGPeu`zoL!>JQ*eNP2$&_b2dYe;$~b-^HyTk1()#7o)%4c3=Ht?3jH{
zRlWRPt}Z_J+nHU?c8YUTaBChWFP#sZlP;CfynUm4+*;Yj(=+?{?CmILfN4JU2k0;s
zr`=$`XlKa8qH)Ry$^hF2Y>NV5+kkCR07NEHe*pCdP=5d^srn7$<ud=Q5qbLn0000<
KMNUMnLSTaM>T0C`

diff --git a/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png b/Resources/Textures/Objects/Consumable/Food/mre.rsi/mre-open.png
deleted file mode 100644
index 701c46970ba8eba14ff073dabdeedb2810f70159..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 378
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFgkj=IEGZrNluVpWpVJ>c(6Wd
z)_Io`MbFe<ZP_BfpP5T|u0%=fe*QVk5<sB${+Ub!dr#Ye3=SZ%fuB*VX42o!-wh>p
zoHAS!bMnB3s?T+kUbUEdrx~n?**R(A1gj>lLx&Ile}2`=c+LE?{#}20`r~7gcl=5g
zK0LMe{>NL5<}4s{|DC#%l8`VVjl<{fi4BG|R?I-qJZ-P_;jPWql0{!xB-P@p`a|EW
zZ?|GTEPIGg^#y~(jrvD?&HqpNSj3xZPktx}RBsQ&F|WDW+#|gT40o?v%=2BMPAFCH
zB42|glk|_0m$uCElkP0vJY7P<repOn&Sy+X4Dk!KZ&s~*#Nfr?E92nR!E;_fqV&Lr
z;sgJL%O&(;>Rq-hT(UxSl}d}GN7un4Oif!ALGJ3aSC71F>}2{-BLN5)7*1@>Ecx?B
Rqzf3P44$rjF6*2UngGtOmmB~9

diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
index 0ea1e6c4f7..8307d78eae 100644
--- a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json
@@ -1,57 +1,54 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Muffin-tin sprite modified from the original tin sprite by RumiTiger. Plate inhand by Orsoniks.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "plate"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Muffin-tin sprite modified from the original tin sprite by RumiTiger. Plate inhand by Orsoniks.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "plate-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "plate-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "plate-plastic-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "plate-plastic-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "plate-trash"
-    },
-    {
-      "name": "plate-plastic"
-    },
-    {
-      "name": "plate-small"
-    },
-    {
-      "name": "plate-small-trash"
-    },
-    {
-      "name": "plate-small-plastic"
-    },
-    {
-      "name": "tin"
-    },
-    {
-      "name": "tray"
-    },
-    {
-      "name": "tray-trash"
-    },
-    {
-        "name": "muffin-tin"
-    }
-  ]
+    "states": [
+        {
+            "name": "plate"
+        },
+        {
+            "name": "plate-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plate-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plate-plastic-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "plate-plastic-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plate-trash"
+        },
+        {
+            "name": "plate-plastic"
+        },
+        {
+            "name": "plate-small"
+        },
+        {
+            "name": "plate-small-trash"
+        },
+        {
+            "name": "plate-small-plastic"
+        },
+        {
+            "name": "tin"
+        },
+        {
+            "name": "tray"
+        },
+        {
+            "name": "muffin-tin"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/tray-trash.png
deleted file mode 100644
index 3b3ab971c1cd071059c79edcbe021263b84c3fbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004-Nkl<ZScUDA
zy-R{o6o-FGNh%78@*-hkh=K@?x`<BE)L2v06hu&?e}iK!flEPKw3tgt!7D;&Q#3d@
zqz)mHXee3fV4OpmX_||;+-JF8hx?p!E*AoUKp+qZ1hYm#ep!}BrV$Q@JJZN9lgY4q
zZd?$_4F&@iP5R#6bEOVV`vuaH3;9wNowqWyDkYlpW<IC2LM!pyZZY;^XphF%mI{$b
zL=g&wFgAg%-0%1E+No(G*VMr3_?b&KVCCr;iRE363ECErEPh}|I)&U==a^PI3z+nr
zcvs%<QBEQcWDof=f`q#J69ko6UMDOYz<U+tVvgmsACJ`$(w)PSK7!TZW_hhv8<PK-
zz@VHiPuVvS)RlSu=?L<6?(T*wh1!Tf{tS}M$;l;)6+Bp05iP8t<ljd+ogOJ4dV)cD
ze|wV+0BXQxzC_fs#}y-X1$e7Sxeqv|;MoG`X}<6KPyVX|J-OG3$5foFrS?+g)K+?T
zB3j<&kt(K2sRP|kU0mPxE}leA@S)G=o61)kC-43Ofj}@@0DJ+Z<h;ca%f3|r0000<
KMNUMnLSTY4lhOA8

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
index d4e98e98bd..ce9944791b 100644
--- a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/meta.json
@@ -1,53 +1,35 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, skewer-holymelon edited from skewer-watermelon by slarticodefast",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "skewer"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, skewer-holymelon edited from skewer-watermelon by slarticodefast",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "skewer-meat"
-    },
-    {
-      "name": "skewer-meat-alpha"
-    },
-    {
-      "name": "skewer-mushroom"
-    },
-    {
-      "name": "skewer-pepper"
-    },
-    {
-      "name": "skewer-bluepepper"
-    },
-    {
-      "name": "skewer-tomato"
-    },
-    {
-      "name": "skewer-corn"
-    },
-    {
-      "name": "skewer-tail"
-    },
-    {
-      "name": "skewer-tail-cooked"
-    },
-    {
-      "name": "skewer-rat"
-    },
-    {
-      "name": "skewer-snake"
-    },
-    {
-      "name": "skewer-watermelon"
-    },
-    {
-      "name": "skewer-holymelon"
-    }
-  ]
+    "states": [
+        {
+            "name": "skewer"
+        },
+        {
+            "name": "skewer-pepper"
+        },
+        {
+            "name": "skewer-bluepepper"
+        },
+        {
+            "name": "skewer-tomato"
+        },
+        {
+            "name": "skewer-corn"
+        },
+        {
+            "name": "skewer-rat"
+        },
+        {
+            "name": "skewer-watermelon"
+        },
+        {
+            "name": "skewer-holymelon"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat-alpha.png
deleted file mode 100644
index c35173308fc6de6f8b92a42991a88bab0d0263cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2z=
zPBi2?q9EW}FSh=H@1C%CN-uniI1g^gd@H87O-P{S=BW*9CuiNPR0#h0KbcK{#ZjPc
z?lq~{>#leHuV4OjYuKFUoa<Pk7i@L2OkXmEf#G;zL&m*E-3i5RnygW;tKa>$%RL~b
zvGjn%=AKWvw|4~EbiAlLXW3;qsW`8S`Bi7j)@f6MUhGwFX}I^hgzY!Wz2Dz8{?FU2
r6T`?Lp)LRP^)9<p!aytkP3AwlAmy{Gs>gSr!x=nX{an^LB{Ts53#??3

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-meat.png
deleted file mode 100644
index d8989e080af28de252ba02a378ca741c7cad4da7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn2z=
zPBP>=<RIYsziWc7>h%pD+0^8Ydg(tBy>!&*M&ykSr$xQjytuUa71q7YQ%rvBwPCie
z>bd6BRe#?b^C)mMDg3c2Irk#+oW_^><y-%3Ia<5fIioXA`sdn+MP_1uBa-(=G<PhR
zlJt}%e}U%r&9l__^ZW`LZ$+p?F5Od8x`JVW_^jh?9d`Qu%3A8qr!IHYvL7^OU^wb9
zu~#|calu}hg}uq?EaEfzO&;oQ@8$g9^}+8O_x>V%`RVII=K*d1Fn<rjrTUm-Npt10
QfIedIboFyt=akR{0OAd7!~g&Q

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-mushroom.png
deleted file mode 100644
index 2b007414bb0d3aa13950c0f585a23d5c7b6e338a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2y}
z6C_v{Cy4Yk1sZU%Nf=C8_3%I=Gtcwoq5snp5)yX&`yuTdQf;ry%*@=}+{_%wm!K5N
zyy@wzO))&DwYdLp-nemMs%0df!I`YomdLulAI;lZ?yc;Z-G5K{HlxmytQN~8$HH&*
zD+Eqn^qj_g<Hik%mgX)=NeKywKD~^8`bUnt_U$cj*tB~6+sla+M@?AI&7U;)-~7hL
n#>BH%XQ#9t(11Jc0RzKaDZR~WyDvom9nawD>gTe~DWM4fMKoYa

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-snake.png
deleted file mode 100644
index ad93db93542359a87ffa654ab2e742c9ad6f8de1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$IY~r8R9J=Wlp$}zKorOSw=9q#s)}k5hz40s)gee~meZ}|15{S^6HHa|0gy%G
znjq$;7;-@%ma3boXhO|Rz!65aggZ72_jB(q@9zKZ{oerwgTZj`5S^qn^u>D9Mc*kg
zU97aukUXj;JW(b9j>&ijz{a*@!gD#E=dW5q9#j+hPKja90sur=K_=rJs=7G{yMch|
zVnt@l_A!pKf{X^X&fR(f0Kjwkw>ZiQ;<+4o5-7idwt-?sg{(Zv3IgoSS=9|j1N*r4
zuf&XsJPE{k|I^UF_$97ZnTEa?_AI=-e`<}Sk_Xbz7crwhR%dluT9crpSXL`J?X%od
z?Y&kDP7Nr9<VhfA%eM0Gc-0haOXu(-?s@yDP}R+C1V|B9r-k*V3(w`sm;VVdqrV!{
dU@#ai;R|^fbl{^f6M+B#002ovPDHLkV1i~9sqz2-

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail-cooked.png
deleted file mode 100644
index 9b02bb0166baa7e16944b6d06467261bf134ba25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$x=BPqR9J=Wlg~>VK@@<$g%TGO0znd2VRtWf4<3T_q+mcuPC*a3=3g*>f#?1O
z6?$z?J!zpi_8>&4xs+rNJ*0&a17;^Gfq(-^F4IG^i>+=q{RM^2cN*S2-hA`k3}`eO
zjpl#Hm?!CA+g0J(7n1zS;=P>1<MXJNWm$ht;9%QTww1<lvmCu{lV4fHw$cDNZZ^t0
zJO6|)BtRs1^sbv&|4~xH>BTJ>A;||Lh7*M^<bz%Cg=BAYm0mDnXKOtSD_=;?K3~U*
zBnrUS8~H+#Sul8Z@-`|~tCZAi-vH<ZBjpQ;-Mzwbv+QiGV|T9rRGdU&i`wlrwMt2a
zt*^KG0N;pI%SCpbC43>(aH80CmZCBBf)S?|w|uy~`89zc2p9|o)GDRB#f^HaukMOe
z%S9De<N2!-qfjV3xR)r<Y&P*ckMVdMiZByVww2~(^YY$ka=9F)Y0~L*m`<m}9X^);
zK%>zhl}h1xUKHDZ@>mTgip+w+-sURxR-ZTTKN`SX2mh47_adfgMzLzSsKS}oTYa9s
zIF4=iZwth+v9_#ckMM_I?ys`3wjBEiH5!fPpXLj%PqTfg?-jNH0000<MNUMnLSTY1
CN9r2@

diff --git a/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png b/Resources/Textures/Objects/Consumable/Food/skewer.rsi/skewer-tail.png
deleted file mode 100644
index 555e8678b5eea60dfe629c35df133a9343a071d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$!AV3xR9J=Wlh11tQ51#02imbAo6-JAN~Q^=?PS+VjB!=6FI{yplD|t`b{Q;~
zmBxju(2!E3rPWoV1J)*+83?n<!okILQQr_S>5Sq+a6WkOxZHQoc?T|}q@<*z{O_nF
zO*N+~`tG?t%j-+O^t^h}ie_04Rsj%+o}tuqsaOLwrz&Q_WN~eQ?m>^`^(D-L3Bcmo
zLe%%^=rf+{14IT-UcOhii38k;GjM$|z;k_qVL&(z@mzmu3ZCmzuG<8|fX$r^0G>R3
zEI&=nbP#I*ZhqvsK1SA{dDx7GHJpY3d^x>RlY%<2&7BRMmRy~EooXW1K&#zS4W}VG
zdM(;KY$`3R@m!y991;wJsHT(qV+NyZj@=%mN>TE5PHIk7M1)eMD5XkKM1*6vN8ZlK
ztkeGRdglDt1o~c|ZR;W3cU@JuZ$)*T$VxdcM%JL!p4bA@Vty{e#o(Oq`!{yC_GZpc
zw1$)G1TY$pcvP=QI1Vwg2IacVWv9<+=S%^KgcBQ>6o32i4aVJjWactaZGU%PR<|w8
zg2`p4&+~(4Dv7Wr(H7jc$J~4(a``*rf0ewQllZQbl$4ZzkRQf5wa`X>8m9mN002ov
JPDHLkV1g0(^Xvcs

diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
index da7c3e965e..2460fa2c49 100644
--- a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/meta.json
@@ -1,320 +1,317 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x, ramen from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Some inhands by Orsoniks.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "ramen"
-    },
-    {
-      "name": "ramen-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "ramen-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "trash-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "trash-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "boritos"
-    },
-    {
-      "name": "boritos-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "boritos-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "boritos-trash"
-    },
-    {
-      "name": "cheesiehonkers"
-    },
-    {
-      "name": "cheesiehonkers-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "cheesiehonkers-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "cheesiehonkers-trash"
-    },
-    {
-      "name": "chinese1"
-    },
-    {
-      "name": "chinese1-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chinese1-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "chinese2"
-    },
-    {
-      "name": "chinese2-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chinese2-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "chinese3"
-    },
-    {
-      "name": "chinese4"
-    },
-    {
-      "name": "chips"
-    },
-    {
-      "name": "chips-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chips-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "chips-trash"
-    },
-    {
-      "name": "chocolatebar"
-    },
-    {
-      "name": "chocolatebar-open"
-    },
-    {
-      "name": "chocolatebar-trash"
-    },
-    {
-      "name": "chocolatebar-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chocolatebar-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "chocolatebar-open-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "chocolatebar-open-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "cnds"
-    },
-    {
-      "name": "cnds-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "cnds-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "cnds-trash"
-    },
-    {
-      "name": "cookie_fortune"
-    },
-    {
-      "name": "cookie_fortune-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "cookie_fortune-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "energybar"
-    },
-    {
-      "name": "energybar-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "energybar-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "energybar-open"
-    },
-    {
-      "name": "energybar-open-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "energybar-open-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "energybar-trash"
-    },
-    {
-      "name": "mre-brownie"
-    },
-    {
-      "name": "mre-brownie-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "mre-brownie-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "mre-brownie-open"
-    },
-    {
-      "name": "mre-brownie-open-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "mre-brownie-open-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "mre-wrapper"
-    },
-    {
-      "name": "nutribrick"
-    },
-    {
-      "name": "nutribrick-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "nutribrick-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "nutribrick-open"
-    },
-    {
-      "name": "nutribrick-open-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "nutribrick-open-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "packet-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "packet-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pistachio"
-    },
-    {
-      "name": "pistachio-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "pistachio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pistachio-trash"
-    },
-    {
-      "name": "popcorn"
-    },
-    {
-      "name": "popcorn-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "popcorn-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "popcorn-trash"
-    },
-    {
-      "name": "raisins"
-    },
-    {
-      "name": "raisins-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "raisins-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "raisins-trash"
-    },
-    {
-      "name": "semki"
-    },
-    {
-      "name": "semki-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "semki-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "semki-trash"
-    },
-    {
-      "name": "susjerky"
-    },
-    {
-      "name": "susjerky-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "susjerky-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "susjerky-trash"
-    },
-    {
-      "name": "syndicakes"
-    },
-    {
-      "name": "syndicakes-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "syndicakes-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "syndicakes-trash"
-    },
-    {
-      "name": "tatortot"
-    },
-    {
-      "name": "fortune"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, chinese from paradise, ticket by peptide, cnds-trash based on boritos-trash and syndicakes modified by potato1234x, ramen from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Some inhands by Orsoniks.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "ramen"
+        },
+        {
+            "name": "ramen-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ramen-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "trash-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "trash-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "boritos"
+        },
+        {
+            "name": "boritos-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "boritos-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "boritos-trash"
+        },
+        {
+            "name": "cheesiehonkers"
+        },
+        {
+            "name": "cheesiehonkers-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cheesiehonkers-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cheesiehonkers-trash"
+        },
+        {
+            "name": "chinese1"
+        },
+        {
+            "name": "chinese1-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chinese1-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "chinese2"
+        },
+        {
+            "name": "chinese2-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chinese2-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "chinese3"
+        },
+        {
+            "name": "chinese4"
+        },
+        {
+            "name": "chips"
+        },
+        {
+            "name": "chips-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chips-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "chips-trash"
+        },
+        {
+            "name": "chocolatebar"
+        },
+        {
+            "name": "chocolatebar-open"
+        },
+        {
+            "name": "chocolatebar-trash"
+        },
+        {
+            "name": "chocolatebar-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chocolatebar-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "chocolatebar-open-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "chocolatebar-open-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cnds"
+        },
+        {
+            "name": "cnds-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cnds-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cnds-trash"
+        },
+        {
+            "name": "cookie_fortune"
+        },
+        {
+            "name": "cookie_fortune-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cookie_fortune-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "energybar"
+        },
+        {
+            "name": "energybar-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "energybar-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "energybar-open"
+        },
+        {
+            "name": "energybar-open-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "energybar-open-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "energybar-trash"
+        },
+        {
+            "name": "mre-brownie"
+        },
+        {
+            "name": "mre-brownie-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "mre-brownie-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "mre-brownie-open"
+        },
+        {
+            "name": "mre-brownie-open-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "mre-brownie-open-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "mre-wrapper"
+        },
+        {
+            "name": "nutribrick"
+        },
+        {
+            "name": "nutribrick-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "nutribrick-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "nutribrick-open"
+        },
+        {
+            "name": "nutribrick-open-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "nutribrick-open-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "packet-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "packet-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pistachio"
+        },
+        {
+            "name": "pistachio-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pistachio-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pistachio-trash"
+        },
+        {
+            "name": "popcorn"
+        },
+        {
+            "name": "popcorn-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "popcorn-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "popcorn-trash"
+        },
+        {
+            "name": "raisins"
+        },
+        {
+            "name": "raisins-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "raisins-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "raisins-trash"
+        },
+        {
+            "name": "semki"
+        },
+        {
+            "name": "semki-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "semki-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "semki-trash"
+        },
+        {
+            "name": "susjerky"
+        },
+        {
+            "name": "susjerky-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "susjerky-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "susjerky-trash"
+        },
+        {
+            "name": "syndicakes"
+        },
+        {
+            "name": "syndicakes-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "syndicakes-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "syndicakes-trash"
+        },
+        {
+            "name": "fortune"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png b/Resources/Textures/Objects/Consumable/Food/snacks.rsi/tatortot.png
deleted file mode 100644
index 802b7e05c4feb612ce8e952cd640a28185b230d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002SNkl<Zc%1E&
zI|{;35Jiu_fN4#UZfbki;4Z9e(`E;DHg3Qrq!z4PfUQ^y0VTvz3n7Vx5d0N7Nh8jI
zSG<9ld$|JxhG7{0PD9hQU5<<AT7NiK&C-e&yY;kuK=IDhCp0xpnFuln0gypRCZZVw
zKwI0GiO{Mjt~L-y0gmgl2a>Y5QW;RKz;XSD|K)s8i9>}I_@fyBd72VOf!cs7fzxqA
zo~E|}p7)Z-H>eXx78AATJ*osc-Cix?@QatwFbu<}n=3uUH)B7fc>e$Z002ovPDHLk
FV1o5;X0ZSO

diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
index ec11a1e87a..affa6762ed 100644
--- a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json
@@ -1,23 +1,20 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "cigfilter"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "cigpapers"
-    },
-    {
-      "name": "trash-cigpapers"
-    },
-    {
-      "name": "cigpaper"
-    }
-  ]
+    "states": [
+        {
+            "name": "cigfilter"
+        },
+        {
+            "name": "cigpapers"
+        },
+        {
+            "name": "cigpaper"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png
deleted file mode 100644
index 7a251dc9e87ccf9f5a5f6bba47771a031360ce35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy;Q>A&t|v~M;NhuLQraLTHIIj<
zK~L|9y!<LDskuBnjVdae6cyJB2z2rA)T^uSP*hweDLIdqw@FHBJ|AC;n%XuwxuxRb
zGljUj#Mt^JS^K3}CMhd#5EGlKuD<=O+?8OU6^tc8e!&b5&u*jvIc}aVjv*Gk$q5py
z%>o8O6Vj8?4z6#Q+B>(oL2^#a9h)DaA3lBL7BFb>4d`fyZgq7zdPG&_qvph<Y15A7
jbFAiJEbn2u#lT>EkMSTk`^h;#6B#^R{an^LB{Ts56kJI$

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-a.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-a.png
deleted file mode 100644
index c3c65c95e8128d2473d0fd9527aab73fc078764d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 248
zcmV<U00;kxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002LNkl<Zc%1E%
zEe^s!5Jn#av9j4KG;o8a7F|zof~T6J)K_Dhy#b__R5g`#MUYki0cQCV%u}1$*`1d!
z8Bi2OQU0BYq&bQf{k?nV_M-m)W|HA?ynNKwOC_Eb7-*XIX5HFA`jwx6wE<x`CrQ=-
z<oSlWK6(xJ5*UUT#TJ0o>U^%M!*>J#jA2Z`7_Ygn33MG}0)vPzQ|W`tsExU<N$}c&
yEK30gfO9F(dT)U^fp;THpe%PE(ohsd`5`BSura|koMNB=0000<MNUMnLSTXk9c5?$

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-b.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-b.png
deleted file mode 100644
index 88d44bea5bcde4ac61552fc22af28cd6ab786069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002-Nkl<Zc%1Fj
zv1-CV9LMpm;wVnpjR+lzi!=z5m$;!@-yj_%PoQs5T!d~?xXr;=P{<-mrY?18g^n4!
zr&C0!sQ)X~q5scv;qLOkA4l>BrIb?tT}iSz=-lMT)|ZPnQ9Xc)<nZpKb$ru3xirMt
z0ScS<4cV~0H|O<I>W#Xz6aZ!E3)!%Z9~u%nBe665(EJGWrvd!XV56AQYmMM#jg4ab
z&|EG+;cm5ZK6ID(8vuA1J+X}9?elMlZ{Q=D0`NI*F(1_S=3Izx!0V-ak@5&|3(&_4
w050?wRG*s%M^|SzjZ<B);L;71QtGO{0nw&8dP)%6WB>pF07*qoM6N<$f<n}Z+5i9m

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-c.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-c.png
deleted file mode 100644
index ae4007833ee9cfd90a9c79c5ef9101d70d7351d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002oNkl<Zc%1E&
zF$%&k6ox;oP8nLd2mwdyAh>xLkKpVDynwSu=waN%MGw%iw8H~IicSs@6<?ts_&x}f
z|D|~!NeCE*VHp2TPcwP3$ZntN`~6w99>74;e7zcy#L>%oRX1$OZd!@21ptyb;u0Nj
zF3d$BiRZvovz%T4pe&{w%Vm)HG{=wBy#eTJe<;c&&beR|PePpvxaa+UlXWH_B41^l
z2vl{0Pjf^h7(UIZ>ZX-|`Vyx8#CWm^G7-3xvsMD?BX~4?_1y;54s3T<AbV5QzX66}
b7(c-swx2?lQrWW_00000NkvXXu0mjf)Zua{

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ce.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ce.png
deleted file mode 100644
index be852017019fcacaca7c7228fc756e879f1b4d55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc%1E#
zs|o@^6hMz++ai;e$zrhyvc=#hS?pUji69sRf54xx8pJQq4-nI084(n;_{P^AQG@ri
z`<QzVcR*1TMfrC!lIBXKxP4R~kEfz}06EF>D5^bc+e#%~7C4Zmi<^04^3qX$0><R&
zbb7})Nn+;nnb&eJfiScHwA;;n#u0|rTS6=l1OWi`dgDsO53zuA?qcyF{)#}gJY>1r
z0H+HiNsKjp3O2`R^kD%2V<!v-r#OmYoP$+bl5YpHK9A0?{^k$JF3{?(f#RL&`aKgx
cQIub?0|Mqdnpz6oegFUf07*qoM6N<$f(glVAOHXW

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-chem.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-chem.png
deleted file mode 100644
index 02e52db37c0ba62827c983498c2cde2e9afbd400..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJy`C<PAr*6y6C_v{Cy4Yk1sYsp
zRMzbB^}YJ<@nrkjUt*rm3=IqnHcUv`xpOD8V(Nd-QkIK+4UOgR?Gi-Ag@hEYYJ8GW
zP*FJ$u<oyv>zdE2G$N->e#(%V8p_7jcAY1?E<&->(BRJA>e+UD2`MSA3w?ckCF}nF
za<ymw^Z&net6k|UiAb@@ZyR=(=NlVj7#p+{DCjK9ma6#vj@kKVVwlNA{*>oTYMV*|
r1t*9wsr$<<m}u;FPy^&z21bUzVuo2?L>mqPJ;LDW>gTe~DWM4fx5`;G

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-clown.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-clown.png
deleted file mode 100644
index 45e2da7aff5f787bda38544a3c9b7de637d81746..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002fNkl<Zc%1Fj
zy$XXc5C`yoO6Jnp2avid+4BT_g}#ap6t}L9PKu*Q_l|-}ov(u+6r}a6PQ4#w$j61t
zg#-{n2=VU}XR$FpeVWhnJ8M4{V|;Q>69Kc$IZfXZoTIq`88=`n#`r`up0<lUs)~ZD
zqM$DJ#wrk2Rp7u4=wlCUGfe%q8PLZbcbf_O3IJfZrZ|To0H8*S)9tc40d@tB_OWPe
zmjseT16Cn;MySgYby*_FBEYI~ZiRKPz^eED57<|*wZ%Wz(kHg-ZzzNidw2n|VNz}+
Sh=C;l0000<MNUMnLSTY7I&X~t

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-cmo.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-cmo.png
deleted file mode 100644
index e1521813e3bf0eead8cc8a7329347844f210c53d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800034Nkl<Zc%1E$
zu}%U(5QaYu-8Ez@atWn0G)Uw~ghbwf>Kg5AwD18et|w|EA(025q9?JqSU>_tfh9hG
z<;8}CgyN_mF+pY4hz0Xivoo{v|CwD-6h%??odZd8sgz5;t4GnBXdXaHB3>@nerijk
zCbl-PB91>c=8Z{9N7)%LCQT;euFv(`fadk3l{mnm^n&kSP^p~ZI1V@60D!B<r`;JC
zjRs66V*uLc4YJ43duZ&=fajf3D4eY0=svU-2jL&67W+(JUwDsw0K)JY0M~S=7E=s|
ze{2B2xKpx6!Kd782J<*CSI6QBR)U*i8$=tpYb}7>7uCh@oG6N-{1;0tU^z1iT8V@J
O0000<MNUMnLSTXfCxjdT

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-e.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-e.png
deleted file mode 100644
index 8ea96d8b262ea1d603e165c7be0719b95168156e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6P_-PAr*7pPS)l-<RIW6&$9X8
zgt*27yd2Yv*BtmFqh0Xh9)ovQHJi>#_X}%OLw#dY1(&cmHpnV)JUe;w=N_Ll$3PL+
zpXF7GCpX{RQu}4z^WzKZ7@8+M{QUD#WR$el$4w6Ip;yZv2byr@stR{35<Hh{z&49*
z+ila-N+Dix&Yt7KJ&h*53=(|$hVQv2I>d*tM!eo|&GYnnmiz_ErzdT1?`GMfpCQ$e
z{C&3cidD0&W>pGXGJJ|x*w^SUxTW!L-FH=9*T5<AMQndI7zwPtTMzOigQu&X%Q~lo
FCICzRWQ+g+

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-eye.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-eye.png
deleted file mode 100644
index 209e6ae0a2fae317b522852c6d77fde2a1bf5a7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002=Nkl<Zc%1E%
zF^+>U5Jmq+kqDM04nU9Oj>fm}H8>hK;1-cA*W2d+)~-wyPYSYGp^!vFc9kOY8qAD6
z^BMdBK@bGt-TB~bwzi>r`ThQrRgWdW+J+8?Z&X#an2#}{t~Fc4mb3Y%xl(EtPbr;q
zM@~7u0ATvkzVBx-=iJT7{2A6ZWQ-y2J>{HfR}{1>3d%W?_nwR~^yrQ(!Ja_dwoqkx
zc~@nLG>+Ud7dG4jA%t1OG>!-%tQNp_0RRlcFv~gT0O0>!08CEky6!3#W8{_su;Ld0
zlkJw)YhX>Ft~GwW{sjQg8t12eN{Ao`!pk@Th00VYrfKXC00000NkvXXu0mjfGtq*f

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-h.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-h.png
deleted file mode 100644
index 8ec45a49081b0cbedb13eeca22a8add0ce538528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 279
zcmV+y0qFjTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002qNkl<Zc%1E$
zy$%6E5P(0TyGFK>t<mTtat(<WQRoyN!VBmm?hQPGN~sV}fc|pTMYAFyp%6cXpPRdg
z!hGG%?9P0dSx^*3QU0Br<Z`1?J-y2>mupcyfP$pC@3%i)J4q!H3tWlg?bEn1MQN#Y
z0>%_+O=q|BrrRNk!c@&u36x3}fUw^KpfU;|gG65X!1KIBv9Ad@=Mu$|B3ePSK4-T-
z0$@i0aQOq)Oeos|i^Z1(0E}JX1^2Vh0Ow#I*W}$vu>yd{iD#HTAe_K(d;qF1vWILY
dilQjL;tV6%Hs1<$*R=ou002ovPDHLkV1nR$bngHF

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-hos.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-hos.png
deleted file mode 100644
index 9daffbecaac4fe309c767fb26c829184f6ca1350..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002$Nkl<Zc%1E!
zze>YU6o)@0+g-x#67DQr+=SAl1;NROaBy?z=HOGf3Hk<o1aat8I+Q#?%pN)gmm`G=
zaY`_tt@oD3!Sjv3^Y7z;q9}^;-#PMW9t`@`wtAYrdhG*<e2x!?=eyb}Ux{A})Rg7h
zx4E^k@2W5XYh%XGvsO00ya+lTB#<NyfMRk3fQXO)t5wmBfH4LD_wdwYwM-`hB0_$B
z)rj<N?+}r01V(2I-q#;Qlf0EXJLSYhESCos0I)8@ytFfsjCFbHe;qgu8T$J1J-!ck
pe&GIb1N48WZuT=#6h-+fJ^_k4IS}{d*_{9Y002ovPDHLkV1fo@fI9#H

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-j.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-j.png
deleted file mode 100644
index b66e333d13337d870809fab4d1565b7aa16c7370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc%1E%
zF$%&!5JjKC14uwYtW^*!C9StfvlkE>I}czQI}hOjENp_kkl5Iy2^iu9qJ@eeqRxt1
zIImflot^*ry9<h<D9XQ6k~H^vt;3`J)hZUv11L+xJ+J?)?I1PrvVjX(mfx+rZbdrE
z&VcJy7<V=lX#{{%Ycp6kt;7Kw>4ExaN|8ncCLu5hMH<naOsx%w6Bus6oL2x$0y}Gc
zc>=eXpm8;0fj9v(^Km+D_VWgCdIM(Wf6qXc<@n1gP(2l5fZX~QynO}lB1#|(7ay{r
cD2nn!jz!xvTifddIsgCw07*qoM6N<$g40`VTL1t6

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-lib.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-lib.png
deleted file mode 100644
index 6ba64526da37935aab9b397bec3a26bcd46d3266..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-JULvAr*6y6C_v{Cy4Yk1sYsp
zRMzbB^}YJ<@nrkjUt*rm3=IqnHcUwRd1`^no~%QX&;F}l6?Cy?V7vGB-q`?!$1O@`
z4^P^$DTap!^(vibJnft<*|q+Ou|)Rj14q@2t{J7&TR2W*o^j%mtE<B_=9V3iE1xk;
zTHMeG1iA%W%*|U&oDyEg{<2Cq+bYk)BYtB06eV_-b$Q419Mkj^EP20pb|fr4$?765
m)#BwSp|IRU2I5dgRtB+~>RsNGO&x*WVDNPHb6Mw<&;$T&Bv|zT

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-m.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-m.png
deleted file mode 100644
index 1420c062fb425ebd43ac491838a23e21d87f46f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ+nz3tAr*6y6C_v{Cy4Yk1sYsp
zRMzbB^}YJ<@nrkjUt*rm3=IqnHcUv`xpOD8V(Nd-QkIK+4UOgR?Gi-Ag@hEYYJ8GW
zP*FLcps2|Doc+3qfzMe_<<muMK%f?6>f(0HI3oJCaY1phvB;X-1Q0ke&#1eO&!Y5|
z#Nk%%bO{hhJ6>vhLdwYC&5QTT<};r;vqpl4$LGPD%eB8xZkyBC*kiJx=BHDI)Q$c1
z=FC8FxLf@Ei{}j>H=N~s@{DQH;)YudO9U(`KQZ*qG30VPs3F11%)!ty)8NF}{v}~R
PZ!&ng`njxgN@xNA7}94}

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-mi.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-mi.png
deleted file mode 100644
index 04b1dc1ec7f65832a30b1c9e48f7291fed1ef304..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002mNkl<Zc%1E%
zK?=e!5JkV@ssws~><ig-lUvL+dbHl4w<v_J-S+^4(w&WqS|nJtQxpW}K_L7|CO?x5
zpeTx>{5w0zV(*LiD&Dq7Q9h9Y?~B;?XXJUl7-wc!Ys4lFlEw4kS(YXGFbucYMUqZ#
z0GMuC*L9*1(bLL&4DXBRoQolZIF4g7LI}}07vKGnCHB${Wm&G$zGk57x>ed*M1O#p
zK}2YpCeeuq0AP&yt^r``gsQ3@G-ehb4s3V=U~0Ri`4&VKu-4$->n8xfT=gyGR}@A0
Z39c6dPI!yQ1ttIh002ovPDHLkV1iwHb&mi5

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
deleted file mode 100644
index 0f9eaea6658742a2010f402a8f6182b9ad40da28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|H
z)5S5QVoq|RM1sMqhCucntAs0zi}@s?_zX-#fA{<U`|>in$E29y#3#?mVof*KT)nDM
zv_CrfU`brupZXwK$0CtAHkFeeo}a9~qK)C`nX_jlPcW)jGo)PnzIrQ9-(-~ofBshL
zOIV!TGDnBKX8v=wjemq%_><nBFHU~obIVnp{eUk2zVinb@Gp5Saxh6<Z$hg5%$plt
z+O_QCNL?S8q98uuO@pwwm|?`4&SZ<?Lc<yPi{!b*7I!l{+<ebqz&_{9DK<-1ow6@3
zW{2lze&pdZGTKtkpv&ONcj6Dvng4$rj$O)JA>^=e>iqcz6PP>77%Y$KgvvT-!@PPx
bmVqJRlvm5r@biMe5MuCj^>bP0l+XkKE1`hp

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-q.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-q.png
deleted file mode 100644
index 2f55aecdd52f2f2d1a9cb13d5a3caa9ee66e3725..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 259
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQ=Tr4Ar*6y6C_v{Cy4Yk1sYsp
zRMzbB^}YJ<@nrkjUt*rm3=IqnHcUwRxl1K?PgawJ#J|a}I2Oq=Fn^b`Nt*F9Lef<y
z_M2Ywq$Zh_ZWEt36blLREED442?|aF>N7C7<JXgFaXk0bf+GbzI_w4$7kg%%;%Q5_
zl;k;IWF!&tTwm>UQkRT_ufs&<1VzVkcAL{D8<sOl`06QG3QFybU`%Y`IB--YZcRdh
zg0c7n8Kw<79e$I!JM>IArZyQk_+?sfxgFGyU}ffF@bff`Tq%&I2J{t!r>mdKI;Vst
E0C-AO!2kdN

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-rd.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-rd.png
deleted file mode 100644
index 15966051e1620f126ce8217d762478f31ad8fb52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 312
zcmV-80muG{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800030Nkl<Zc%1E$
zF>3-r5JsO8Q(9PwU?IXbf{k1&SX;*4CY@j(#3o>wBG-smrMLA*EXNfJBBl|sR}c;Y
z7chlzc#s5k#j|i;HOx26JeCDP5Cq}gNtp~gjynFAd)}wfJ|h9gQAgMP03g%r#j<cP
z0HE7#8%v~3h5@wJ9LgTG>6Y4b%c1O{wKiR2FHl|dX}Ecq19ND&d8&(kastuur!~B;
zBZ<TWfYV`s*;$>G!275JlM=qF<EuJMN~fMB4<^H#<ulpGZ~SI4>iNwg+18NFa(sOO
zfLvk4{$&;K1@N`2SP5ADfgt$3w!!EH-i9Hd{z${iOaws?Zp9BPB1gOATK_=+0000<
KMNUMnLSTY94u<jo

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-s.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-s.png
deleted file mode 100644
index ca192b4f95a404dcdb84862212d9ced4b1c4e800..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 277
zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002oNkl<Zc%1E%
zJBk895I~<|)`<)>$OHxkh6b`?>KzQc!Ui74z{4n*in4*B2N(t#nlY$Y1C>o=*Dm}7
z)=QeIuC96%G#G|q7@tlprFbyt9{;-EZ1ze002(R7hr`i-Wye&By9KVqSl!HLSu?ej
zP9V#g^tU@)2mpxp{CxFP!&L&UR*nlxis|=nPK2^7UL)X~L%b)S&4Kd<n2c4!RRSUc
zlQD-&oX_SIBCiuD%Yy!P2Y?F!@m{@tl|YOYi%$C-T+djke?eXK>VYI}V7*>FNy9J<
b<BgmE^Z`2mwl2Wl00000NkvXXu0mjf&TMix

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-tear.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-tear.png
deleted file mode 100644
index 783762ea10f48c4c57c095ec828bb9045b71d1f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800033Nkl<Zc%1E%
zu}TCn6h)8jRKq|%;9+ZFG2MQE){9N*ZEXA|>uDBYzQRUWtLawjkosYmDx$?YqoODo
z*|jhSLc&eRJCHocWHOn|f9D|O@O*y!{N4U~eV=q6z+p;p=K>+jK8(d`Q-?6ax$vXl
zR}?9SjWLvE3BdXF-Lfz=Q5iFMO0AzJ0N}mn^2RL-Lv!|U3(#G8k1-~>I3zs5K-;ze
z7XTuHhz!|&1Vn_wa0<|rM`N}(0q5Mfj=Gh2pY2pYRk7B7%B{7i>h1+#+X+#rqe5XI
zD)rP42ot&hV6`~uhSux*zMEV<RY0WTt=As`s48CP>Ng&lOeXVpya3OkPSuTQ=d1t#
N002ovPDHLkV1kP#jOqXY

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/cart-tox.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-tox.png
deleted file mode 100644
index 23f4f49f4564a77f8112a577e3c4fac099170312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002;Nkl<Zc%1E&
zp^5@g6ox-VgKuCkPu=2hjaqyGv)Wgf7Z|oI_yQA*f?9nCEy7$hs9>>JChQwbSiud#
zphY~FWelD#T{!2S|ATuupeTx>ygLO+v+sMCNA>mkD4Hh{@O|$RMH2wZVR%>j9S#8q
zg1%UyBxwe))^bjg`ytk1jFFCV6EMb*9=>QrRR9*j4;9C7fTHw5I&NRX_rM-nQI&Mu
z&QBl<@0{TKlu6_!09=Csb~k57#D5^(PHD`0Y<4pM>K|R=?KB^Oau~8q671&yhyhr|
x1J0v9&05V#!0ieC5z!)grq5*?DvF}Klt0CfL#vX^=t=+p002ovPDHLkV1k%0do%z5

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
deleted file mode 100644
index 22b10b52801735bc0b045fc77ecc2e491ffe208c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DCq0y
z;uumf=j}O1E(QS+*T7S8BEJnc9I)RYe=1AETHxo(YWMtaea5F489vx6JU40T&)y!_
p>#@<Fad-Q5#^sDa6JWqW)__rEDQCsau9_DhF;7=Nmvv4FO#u3LE9(FN

diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index b79f46d08d..887a04ffe4 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -1,95 +1,29 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav, cart-med made by ArchRBX (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "cart"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github), cart-sec made by dieselmohawk (discord), cart-nav, cart-med made by ArchRBX (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "cart-a"
-    },
-    {
-      "name": "cart-b"
-    },
-    {
-      "name": "cart-c"
-    },
-    {
-      "name": "cart-ce"
-    },
-    {
-      "name": "cart-chem"
-    },
-    {
-      "name": "cart-clown"
-    },
-    {
-      "name": "cart-cmo"
-    },
-    {
-      "name": "cart-e"
-    },
-    {
-      "name": "cart-eye"
-    },
-    {
-      "name": "cart-h"
-    },
-    {
-      "name": "cart-hos"
-    },
-    {
-      "name": "cart-j"
-    },
-    {
-      "name": "cart-lib"
-    },
-    {
-      "name": "cart-log"
-    },
-    {
-      "name": "cart-m"
-    },
-    {
-      "name": "cart-med"
-    },
-    {
-      "name": "cart-mi"
-    },
-    {
-      "name": "cart-nav"
-    },
-    {
-      "name": "cart-ord"
-    },
-    {
-      "name": "cart-q"
-    },
-    {
-      "name": "cart-rd"
-    },
-    {
-      "name": "cart-s"
-    },
-    {
-      "name": "cart-sec"
-    },
-    {
-      "name": "cart-tear"
-    },
-    {
-      "name": "cart-tox"
-    },
-    {
-      "name": "cart-y"
-    },
-    {
-      "name": "insert_overlay"
-    }
-  ]
+    "states": [
+        {
+            "name": "cart"
+        },
+        {
+            "name": "cart-log"
+        },
+        {
+            "name": "cart-med"
+        },
+        {
+            "name": "cart-nav"
+        },
+        {
+            "name": "cart-sec"
+        },
+        {
+            "name": "cart-y"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
index 785bc392a8..549450f58e 100644
--- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
@@ -1,68 +1,12 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). xenoborg by Samuka-C (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). xenoborg by Samuka-C (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
     "states": [
-        {
-            "name": "pinonalert",
-            "directions": 8,
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ],
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonalertdirect",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinonalertnull",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
         {
             "name": "pinonclose",
             "delays": [
@@ -81,33 +25,6 @@
                 ]
             ]
         },
-        {
-            "name": "pinondirectlarge",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirectsmall",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
-        {
-            "name": "pinondirectxtrlarge",
-            "delays": [
-                [
-                    0.2,
-                    0.2
-                ]
-            ]
-        },
         {
             "name": "pinonfar",
             "delays": [
@@ -138,18 +55,9 @@
         {
             "name": "pinpointer"
         },
-        {
-            "name": "pinpointer-crew"
-        },
-        {
-            "name": "pinpointer-crewprox"
-        },
         {
             "name": "pinpointer-syndicate"
         },
-        {
-            "name": "pinpointer_thief"
-        },
         {
             "name": "pinpointer-way"
         },
diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalert.png
deleted file mode 100644
index 28c34227a3e99862061c27ab055d37840b5a1392..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 555
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zpL)7DhE&XX
zd-r1QAp-%1fZ)=uw4QedH{4yE++zAdJX9o7bYt)OU3<Q_wj8i5p7XhQI>=0*iD&fO
z?KiA@{dfKM>8X}~=DOcG{e1rG_*37#uiroRe`Acd=F&UY*5Ci0e(Zn5_d?mFivPAR
z3@=x@?R$UUywuqxx39Z<Hn44#uSpZSQupDSO2zw~6QVfhtPEpPzBX6(f8E`AKSCQO
zXRl)T-81{I|Bdy+v7C!~I<~K5>al5#a+!Z{rinb`;&)EbuJ>D+!R~<&F2?c?7UX>7
z&*bZUcc$~5PnUt#v&6dxBh8*j&P;l1#grxe@s&`F^u$e~flcXs9V=xW-Hu#Xqs^H2
zIy__ghvP+a@2T$TH_x*2Sb5}rQUvP>1D%JFGm~T|G0Zf35}Dp3iDcD}_%rMl8qt4d
zIs5xD&4~$T>UrV!R`BB7-BT6+EmTfgWcGL?r|~4k=rwmgGs-EMrR+|-(lMih%cSW3
zZtVjzZ!a-Ea&Iof#oAXFzcWl+BrJera>rF$`Gos2hMyl^TzW~yaJPN^w_l6D$7e^h
z^K8uKeLX?(+q<6(%KFb%ta$gtC-$PVyqxUU{5dx_&)2>7eI9?h1#@*u$NioKlP5#X
a?EK3x=L3IW#e(n8Kq8*5elF{r5}E+)W%G>y

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertdirect.png
deleted file mode 100644
index 90399cabd2a78ce8515b88d7128ad6c984a21de9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a%w$Y978f1
z-(Eh;+n~VHa4~64Q{O{5p4W1Hf!8l+t53S5cI?Am?S=ILf<VO#+FJLx)4uhb3%x3P
z`SHZ$8T(H>J+;48``6A346Dpm-ukqvaM#-@x6cLiykz{+TW{F1@8b!9h{l`Uk@^PO
qui4*CRN9xZXZpsf)9XQoHJI)-(3BBU%Kdf?#PxLbb6Mw<&;$UdHBK=A

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinonalertnull.png
deleted file mode 100644
index 7e959c01553eaa32ca8991d78e3011188882ec63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a^`uuIEG|2
zzP)mn^N50g+eQ7;VS=YU<i%#&1+`@!t`)j7!C_9}#0}qV_+I=m&|(DY_~9P>x^YU-
zv?Z3u*8kYIZqgC~r_XbBKW%zq6(9I&=C-w(|4#=U+4ytyjrB6K_jlb*lyaDRW!8>%
zOSkV2?oV@8o*ni)*O>RgnhAo=D~qGrA5}4>xAr`^$#I>{X6MI4TN!Qb6#FmEHvn4H
b@cb9UMR$F%(Er!I0J#jFu6{1-oD!M<EVN%~

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectlarge.png
deleted file mode 100644
index d7e86873b77ee8631c59ae40a1c0adb3627d101a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a&kRg978f1
z-(KF$+hD-c@{oDs(YN-qo;R4WIwgotJo$fW=cgUPN{m325f{IeI=am9|Gdrqz2)aW
zdy6D*Z;HK{w5x<M`NKKYC0skW?`&<kB>tm0gi-Kg)|%!o+!D;?y!xK*sfEuU0QECm
ZD`R9nDxUmCndusc>*?y}vd$@?2>=YALC^pI

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectsmall.png
deleted file mode 100644
index bef7821c7cca1b3a7d4b8a5a4fd16e6c3e96ecfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a>6}b978f1
z-(EV%dBA|jIdFRk_gni}&oaz3SlE3o)?Zg}mk4JBs`Ds$%a*f0{{5tF>3;v}w@d$(
z;eOGgI(12LF58j#1D82(+g(rb_``ZcAE=hWVHxW@X71!8+rJ8fxSp<lF6*2UngAqP
BGur?F

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinondirectxtrlarge.png
deleted file mode 100644
index edbb1dfbcbe6c40ff20f72e8289e05e39566be44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a?(6q978f1
z-(KCw+hD-sa*=uC(YN-u&N7;EOn7vR>(6!7iNd#Al^KC5e=JTlQ8@XpEU)^<xpUvQ
zXDMy-f30$Lb=2Ca3$j1@R~u`XKJd<PC}+Cs#k)hgVl&^tPx=Pg2Z0(H6g=5Gt%VQQ
SS0&E_aXnrAT-G@yGywqPq&=Ac

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crew.png
deleted file mode 100644
index 26b5c3b3dc6d9d35bc35bdf5d14d1c7a76328d7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 275
zcmV+u0qp*XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#%}GQ-R9J=Wl|c%^Fc3w*;$7S)!Ij`e0tJy2Pb3X`3Gd)W%ssqCT%~ABl1XVT
z;=Em(5C4%)6M$iuU!&66D<OQPwVzEw2{Bsvq9E%bO*-LhaR*I68V}Q?BV88&uyv4%
z_N+((0b56x-1|e2l}&6{1_}VUpAO0O&GG#CLYkz+vQ&V|Wk<_RCa_;SLTW;R?X^3W
zUlzDMX*r&O*=L~m9O(V$5!x9T^&rX|$30yBGf*!h5BUHjZCl%Nr?Nd|x8X2KIv9re
ZLtX{*FSr>g*KYs-002ovPDHLkV1oXSZLk0U

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer-crewprox.png
deleted file mode 100644
index 4424d1aba7ec42b876202cb20f464a30a508c50a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e?46sLn2y}
z6C_v{Cy4Nv3djq8zJKJzi~1U$GyfTjTRJBSUe!rgaeQ0PR%!i5OHNMdCf_3&h5YaH
z51O&9pOk(%IPgc%%*~P#eEN-+T+3~BTr3&b`1B9v{p>8|;fcSeq@y3pURuGkE<o`z
zBM%SH^04m-9k!J<{O6`k40W11W&7dR9BM(b4jdklEQSU^aD-J|Xz9FHd<~7Qj7M1Y
z&dMB!*i)Y%d*H*Xa|f&vOn3!mvw7&TU-)dPb32hCLTW*p<Ciz5979eUryD=eT{Qo{
zT87%jsTcouPp>!V@Y<xT!#}Gx{`lwnJUrVsbKY`}%Jq;_INBFzz~y$3gM~p<!S4Ej
TSxFm!0m0zu>gTe~DWM4fph|YD

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png b/Resources/Textures/Objects/Devices/pinpointer.rsi/pinpointer_thief.png
deleted file mode 100644
index 5e62b9ef8d22b5948746e6f0d156e33b338370ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 434
zcmV;j0ZsmiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$Y)M2xR9J=WmcdGdP!xuLLzrE}UHA+-JwdMAMf3o!gJHmjh!#PwAjCk6h;Zd9
zqMa+}2^uA&y)F(zyCASdbHz&UJq`o2@!KeR?mhqg<(wlhGBUDf3;;-yguUQyv8Z2H
zD;!U!xR}ihUA*Uc%J&EC%o}7<PI3+=CnyMln)B>0VHj#fY6S#AP!kbc*VTpoB27~%
zQYoSlpgNHd0##L^C<<0`Ap~2f*-mcTHma&pZk%PAazn>)*vZj$z_x9~alF&b2MLfT
zKe|2X44hoP?>srW%JA#s6YKf1xypMkM1=dt2X_3wDliWxjSGEl=*Zr3c5JT$Z5M_(
zAcVlp)ipa_=>WEHfr#+*@{IG-vta@(%K`wb=gZz;Zha5=1O|S}tLX!I&R?v8h-BYT
zcEV;F%9g8QNIOo`6aY|`B~L&fzVFu<*j^<>q!qv#$J-?5qMe4D6KF?o7f}=$x*w8}
ck&(Ug4Z&`c4zQ6)c>n+a07*qoM6N<$f^*rrrvLx|

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_open_overlay.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_open_overlay.png
deleted file mode 100644
index 5f94aa4b2e112c5c814864ea0bd39e75e4ab2e3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5>FS$kcv5PCkJvJFyL^OeRHX*
z;oFV7(*shXw56LTeqVa!n7{-Mph5=u;tKvVHe259-CZmw*=sD6u{P7Ptmj42Uwx%_
zIT;D5F5)-qX2nl3dLYU9tDGleO4-ETUmsaE9THVuslCF*T3S&n?%-Sj28KU<+#6ol
Uh!#B)k^>p*>FVdQ&MBb@0DEOVWB>pF

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_torn_overlay.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/envelope_torn_overlay.png
deleted file mode 100644
index be1118f292f2de7d55efec0ad5133967ae102c71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJc25__kcv5PFP-LXHV|leXfNdY
zKzqu=Q+rs~XctQ^6t!qn5_z1UIXz|HWcf?yP8fA`bez~<eMK+GYxVA6FUEv<Y7FyE
z7iHVGHO!n?TsPZvi_|fR{;e|^AG|w$Q{vFmTJOyVR@Z*8T%o>WwS)GLZ2bV~nA`U?
ri+*xuJI=q=&G2{r2OAHUC(m;hme`oRSm~<<bP|K7tDnm{r-UW|MTSm0

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
index 1441efe2f9..3349acf96a 100644
--- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
@@ -22,15 +22,9 @@
         {
             "name": "envelope_open"
         },
-        {
-            "name": "envelope_open_overlay"
-        },
         {
             "name": "envelope_torn"
         },
-        {
-            "name": "envelope_torn_overlay"
-        },
         {
             "name": "envelope-inhand-right",
             "directions": 4
@@ -39,35 +33,6 @@
             "name": "envelope-inhand-left",
             "directions": 4
         },
-        {
-            "name": "nano_paper"
-        },
-        {
-            "name": "nano_paper_words",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
-        },
-        {
-            "name": "newspaper"
-        },
-        {
-            "name": "np_dispenser"
-        },
-        {
-            "name": "np_dispenser_empty"
-        },
         {
             "name": "pamphlet"
         },
@@ -80,15 +45,9 @@
         {
             "name": "paper_bin1"
         },
-        {
-            "name": "paper_plane"
-        },
         {
             "name": "paper_words"
         },
-        {
-            "name": "paper_words-blood"
-        },
         {
             "name": "paper_receipt"
         },
@@ -110,9 +69,6 @@
         {
             "name": "scrap"
         },
-        {
-            "name": "scrap_bloodied"
-        },
         {
             "name": "paper_stamp-cap"
         },
diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper.png
deleted file mode 100644
index 7733d6e0e51da59aa9502127d8f558d93520bc53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJT2B|pkcv5PuN>q&puod=;r^wG
zM$N(&zH9|j>IH1&o2K8IovXyE`KR1>LOv5?M~B$$HNA$%zFnJKY_{KA)FHI}>y%3&
z9fvRTFl@b+sN2H8a8@|!J6lDN7h^(n`15%OPJFHIII)+n+h5(FnNgyF@lLse%Qe;y
fG7?IQ?prXv>XF)F^WN|T&>;+-u6{1-oD!M<xGh5@

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper_words.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/nano_paper_words.png
deleted file mode 100644
index 0a0af5da99d079f7c7c7338a2e4e8b1035c4a3f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 630
zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#ka2FfiGAx;TbZ%z1mqFz=87L+iuq
ztI`wKT$-oqY<);mfZbt^(i+(rmTsqd@0?_E;@J55!Hs|WS=|@dtmgF#x$4gZG>3t~
zK``!E-G+79pI;caA5Q%8GiIW_@4m~d8*b*j+qeI2-d=Ubx;=l)uXone)p|^t^)+tw
z-A^_L%U|wZr+U)or|*p9y3O~zy^QZyvRcgb+xuR=|M=?17wlO+J$|-&UH0W|YcC#}
zu`IJk>{;5HR>R!evkbqlp7Qy3(c8kTpXatS?7nm3`n!l#G5#}C{^hQ-_0#@;HC^c2
zz0J3DtB(hF&$OR1H)-EzE(P0PVqtd6ebnmpv;$VuJm-G!N$a&;r+3ir&#$XaE&23T
zW|#lNvN=)vz8fFd`#Aj`bMlk;v}YTbs@5~qhCg_#ue@jHlk(>YOSduo%Vw3RQkr{e
z&ZpnStCxJ5tKYDyh?}GL&xW6V;thYRi*=qHKg$jd6)0g){)Jg&p1-}r!=Ly5GF<xl
zf2n<SechXyUyN2o_vPcO{yq3tVx2cj?bN>?H-5T)W9I2yZgTz4=fbJ!b?fdk%>Q$P
zS5@(I^IC@Ik57G_;`!|PCH@C@1SUm0yS=bnGR@yT;DhCosqaGtCkH#X`ELtNv2Wnr
zSF=|x9OT*gbq!~}9iI-goZ%<3lNdHR0-f`MT|?$CL+fIBhR0_r>;D;lDt5JJI5zY0
zzdsT`cP;{oKDjj^(CQZ>*Yi69N>8ss*zRDBP{X`Fus=R<ASF#9K?Nk@>FVdQ&MBb@
E0Lv#UBme*a

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/newspaper.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/newspaper.png
deleted file mode 100644
index ba053369157cc85190dc9e99e868020c06102d12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1170
zcmV;D1a13?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D8Nkl<Zc%1E)
zT})GF9L9e&qdl}Gv}`&+Jm>TfClDl@T1(U!WD3||bVN6^3%11VVmF&E*++J_Wyz8)
z+b+%KyxPQAr&BR*@e|oHtLP{eq9UR#6R2(Hs0j2Ucy@uXCF7&Tt0g>_=e+O#|D5M}
z-{<^c9`pFWLy|>Jl0|LZ3zgbj_UoRsxohn@RHq$pYa2KE0-QhBl2*;9o}_t0LjyTh
z3r(j^vAL!O=|LfYmJW%u2}rW2EtO<m-2M^(jr$t8)zgD4Nf-qo-Eyg0AjzV(rc7md
zg&hF*p&xNLR*;*U#{svSXf(=)AG}X|bcB;<&!ud|tcxUB)Sk_ksCJZ*S5!p1*URbC
zXUNabCmf0J`fCkbzj+H$6p>|_aIhaBWfId`AjzU;Q*7j$EmT%lF`P`&xUZ4^{(ds_
zdH|A%1U>!$&I%`jL7?mUHI@~Z&~^P9Be6%R2rxB)3Aq<PrywZ`C!5a$V9d(GWHwE%
z+xhle=mlZ2xuhuL`xS+Hs|BO5VAcaUC4r@qJn41gzDB~42xgNBi`9b7W<!=F3i5I}
zaq<)Z^;<S0DGGu?!0-11U=s8xsjy(Ghi6)T(REyE!;onNAR3MGaCjJTiOBk@Du#w0
z(sbfy0(b6U6PFOUeH+0baOCI_4!GSMaJw;N8mX__z-$3E?HSnLbWHb~&#S$>Z7VrX
z=b)CW<XA17ZEmKsqjUT#%_c5*JQNj|u&lU*SRzR>kzmuNI`o2oUJzzgVa6Qz{EN>R
z9Jn_ruh-i~SJzD<_ajK61VAE@#B3Z_s;;&MYHJwi?`QY!-8fb_W^4}ASTKR@+g{QA
z5eg$11Y+?R1$ns?6fEYGk3OcTxC8*bJ_Dc6$Ajn~`o}?Zt*eVfB1w05H}!QJaIRiE
ztqm!K#e46*qe+TF>!nrzd_Er!hlkPYGXPk$Xc6KP5ddd}lXkC{+}u25S;p&a<8oUk
ztrvcsve%3XOyJ<5!(@z&k(Ffzz+$yvHvMxQL!l5CJRZ8cy9o{iDOXj3!2vE_^q{Kt
z8C6J$K)~Ot`}E7ND13a+SK94Ztd`05iA0iug2imEa}ggMAvh4knw?F#suGLG$g<{8
z?I@d)M9M#-fWKE4A05%06;1$p0=<MnApmM?swplhq224{R!<Li@Ak24*G>RBJ(s!B
z7hojzXi6K>`Wtp!YGd`r4G0E-cx)7#&BpqwD(?R^$lh=F($R61E%jSjX}3={mx>B0
zU9}QbRavv@`Tx{RdmwqU;Z@DCZY{BRj6^I(`&A!Te!oIE9AV+YXLw`B4t_dz92gI@
z+3KY|4^(Y&F*tCKU?|Ktd-h<=%%pUADRmn+A}I=;p35mUo<K^6@ZXroh8(Mf?CfkR
zD=TriTpT=fn4|6=`1<?r(o%I!God7lTIupqTrL+GV`H?OZf1Yeu{qV6(@Yrf_v!!*
kApGahv>`K(d8C5B0g(Emme%$xd;kCd07*qoM6N<$f&<<rJOBUy

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser.png
deleted file mode 100644
index 3e90379d1e3613c437d3c990964da3239a809439..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004pNkl<Zc%1E2
zJ!-=+7=10>O{Z^*Gi8gGSda?{N{*0A^b9#dFVQ1}fG!ZQvM3iwv}w#zvZ+Imv20n+
zAMN4?2I-Uh-us><0|N#O_-DL4fx|t*{ip$_l!`7CMez*&UU7$sbC|eltdw%-PNjuM
z96qJ{s||3@tFFqjgi;E{at8IiL$RCzz-3$%;G9P}7K;T|t5u+Rl>yGVV~jy-4Qnlo
zF-Ubk8jV0iAfjN+TH7-5cCWba8n|>G6ZZzJwXoKLh_GI-1O8+J_1NzP5mn;eOj(xw
z32@F`Gr|<=BC)zR(!^^Yv464aX^IjNwAQWq>2!+n_nrZ*H4Y!|n2)DbZF|^bKAvKG
z*aMqTOiGF4@rXRn!5FLRS(f2^KHqMjE}EKq2qBQ?IfM{F<Xs8$egcpAcv_`UA2%VT
zg!%e`lrpGiSr*-YR{~w#1D6Ekr)(uqKQ}iSV2lA9om_8{3L#qiytpwYxca>Yx~^A!
qJvC2>1Ap)%@`hsK0|pEj006(BD(N$r3q*?m0000<MNUMnLSTYjsKX5a

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser_empty.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/np_dispenser_empty.png
deleted file mode 100644
index 1d0823c199530836a3fd8549395ee32747e1ee36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmV-P0k-~$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003HNkl<Zc%1E&
zF>b^l5Ji8Y)S;XXZa~KoXnZSQ%FP_XTg?qjhf=w7x2bFaw(&;UY#N^Af??o)eFH$F
z(P%XOnYTw9opbl!igjIwzV9>5hYUF9?$%m}2x5!~AyoUd)*vDfQC5#J?o7P@rFd#0
z#t0(9Fbr9LHGyZuPDGpdYGfS8P4}ZFUPf3W6*;P}MoKP!!MgD5D@BP2BC@N`^L)7f
zX#y)Eg4^d;tsxU*W=tW#FvD8A)s<3MmSwm6GJ&7sy@$~n-utY6mcY{uFf*oU0yAfI
zrPON-c<*71*(H#ko0Q8lV66p2s`KThrFd!}gpghRO9N-uE1j>6YvRBQ9-`IIk$9ug
bXaK-B{+6FrjL${A00000NkvXXu0mjf2Yr$(

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_plane.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_plane.png
deleted file mode 100644
index 5e72fd4f492b3adfc6581eaeecb26a9e664cf66b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ9#0p?kcv6U2@<S}6GVEN0u8v_
z4tlWnEYXPDopiKb+uC|f(Q!W6B#yogg_AaHK%f?+!_UQkTwwZyDJe5dDvefto5Xf)
zUBt)#KR2iU-`IHSl-G`!)YPZ-yDV5_|Ns9le@^YHpv&=_pVQC(leaG6SpH{bx45Lw
pm#+`seEU{5>GEL>sLhOw4D-uU;ybflwgcV8;OXk;vd$@?2>@amOXdIo

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_words-blood.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_words-blood.png
deleted file mode 100644
index 832a49c1a92da1a3fa7ae3be32fa9278d2c86031..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003iNkl<Zc%1E(
zu}*_f6hIHgPk_YM1y+ZWRR5svT|3v&)cyT{>^6*Lc6Eo<iJHI<;3AmdH}pAF2n<bm
z#M0%R=|1ku<J@~84>TH$=FAvfHwq!-u|1yWbw00`z|(4VF#ob%_ma3&*$i+s8Xe5t
zxh_HosUmTqDzJ1cmX6hmt96_tK(}!zBZQDep34~IE(vADE(v7}^}5J&sUn~}0^c^-
zKwUKewh4~K=Is@%8>RD<1%j*u;PLZ^X%b>gW^4_kjwy=M3e=U`Cd?NES&9D_57L2V
z<uZ+ceOF`}4buU?QTfAs(aKfhIjKO9m23^8j%6D0;odV%LgknD5&*cB`@gLDJp_~4
zFaqC=89%?Le2vFk=XvY73jcZ;HR*FPX*3$mS@;Ftp^2PuuJ1Si0000<MNUMnLSTYI
CaiF9C

diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/scrap_bloodied.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/scrap_bloodied.png
deleted file mode 100644
index afe9402eb398e3f462f7226cf1564de22edbbcba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006rNkl<Zc%1E(
zv1=Mp9LGPFEN&L0;pk92O9}>DGGw?RP%>r+;!=Wv`~~(;IRAs5n=TFxU5b;NlIn1y
z%Y#D@?#PlJ$$?rrI9>;RubM_ZHP8-z;o#og@7?!vzu)h@2Yc<c*FRQlm&ul8g#ht*
z9DvDWLa|tk&A*f5WjffzOd3hELZPq_lSm|RT{i^g--W9nA_D;A^ZB(gxm=EHHXHey
zuQmbLRP}m&_YzdA)expB2RJ%824K*0@O_`Ni*vfo_U^RH%!k9Fx;mXsm`rKma5xN;
zDJ@K<w9s)JbuX{^IkFj-X=w&5%L<>X`J;Q!csySCYncsA(*PFk*C|pD9Gx7i)Xy87
zU7V}&wu-b020cfCbenBu{OI2ECjIuWSWVOLeV=x_y?qnTCWdl73n5h6B@m#VNmE<b
z(QW(XOOU_$gr;fA2%z8Z69fUCVW`-f*Ks_<z}EFh0Fg`Zv=5}d)xIjo+Gs-8w)uW~
z%DaPTdtBt5@VQP02!a5^^B4fOu9LaCCiDISquUl<z5a3la?_D85+rkVP4mtLrs?PB
z4{D<c2I@Rmc@`|~0n4&f1Ij-i^c)5~2O$JP2y9(vblbx4JYZUm+GwJ_5v30zWuQ{2
z0AQLXLWn<y&CK}A;UOPeEq+~IDi~YWF+6W=8CC++XOqk2att7yPKN-EMg!9{Rov%?
z2Tao>T`DO<eFj0Pv^~Jn+Rcw8jFg0wT6YHQwbx$%jeY|N?I&*J{$_Xp0000<MNUMn
GLSTZNb{=E^

diff --git a/Resources/Textures/Objects/Misc/module.rsi/ash_plating.png b/Resources/Textures/Objects/Misc/module.rsi/ash_plating.png
deleted file mode 100644
index a3d27f28cbc7f138e3fdd175ff402b7a97968061..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800075Nkl<Zc%1E)
z%W4!s6o$W%k;ZD0j+cqp0}>c!A+za)3KAG*C%X0pd<7rGSMUW~EAAR02*yQkW>pMi
zGZm8Yk{+oJ4S{lDs_l;5J>>;-G5@aWoT~GmzfM&hSYwTUjE<}0y-nW?JdatPv%l1x
zRb$tEyRN~X-n_x6e}(D%l!51&@zzG;7%;9RoSb^Sp4rJWY=!^>&*S-nCC}b%R_11T
z&VeUbEEa!<K(E&`lgXskcJSsEI}ab%+Tu8NBH?rd^ZC4<fG4=zU~@$)0U?CZT36<@
z)<`J<czypikKQK$42MH}->>)yAxxHKttvDcg%BnTL(()Q48vkxN?DBWrl0u`TmwKU
z#c((*{FG7zL4Z<<HWIala_}gM*xTDHY&MA2nybf$eA&KLWNwuK*xlVFNs^T$S_uH8
zX-W_T6?rWIt3aL2uCr=15ooP}It51E@B7>-t|82h4*{5-nOX(f;8X*DqQI&eXjCA}
zvW`;90F7DL2dEBOYqZv_!2vEc8LR@n@Bfsc#lZ7w=k1y>3=u+@TBmdT@-476Q1=u!
z)xdv!3mT8W29KhMG)+-Tp_HoFFV=wdDX&`vr(00|jN&*hGAqA?O@6=i5|&B$zF&D_
z`~5y~90Txjbe$*DPXJ6Nlgg(hrF6OlE5A!2go&c4)+VK_kSilel9j>1@jJfwBU<d_
zS)<JrPF;%-!i>5d=Z<K4W}LDIM+HXR4&|Qk?a5chTN}vbHsh^RIDv9c_~Pgz`z{;1
r5;$)#&EVum*E`Ge*0E#!HP+x8CEKSB?*WWz00000NkvXXu0mjf0tGOy

diff --git a/Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png b/Resources/Textures/Objects/Misc/module.rsi/beaker_holder.png
deleted file mode 100644
index 31c06ea0b4cf1589d45680cb5d5f5cca686a6bf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002`Nkl<Zc%1E&
zF>1pw6ox;Q&Tj~K(=j@D=<FdU=n0(q069xYPSCBpPhe;dk-=LagEm7z9TYW6DCH%z
zUHU!{mi>NNzkUgUVHk$--*Fm|h(v(!6kr5AG~0&0?_F8Xgb-B!y^3{9q$M&Zib&a>
zFAZG2f5)9xxPY{JQWAAt=h6!3O6@fX+-pSfoe1DIClg0zxpV6_s0_Hxsb9TS?EEfG
z@)-8{``W`|OwZ+uAR<v?Lgn(S1e!y`FbuOowlBy0YyuBBTH<H?9@w5u+TD8c^@HXq
z1w2%*71K23N(Zb;1KRl22F~sQfH7^spWXw8VHn15@d3#}Vwl#X<9q-B002ovPDHLk
FV1ixQg?|75

diff --git a/Resources/Textures/Objects/Misc/module.rsi/blank_mod.png b/Resources/Textures/Objects/Misc/module.rsi/blank_mod.png
deleted file mode 100644
index 83443e34ceb5b1b963986b2936f1fc1fada832d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<f}SppArY;~
z2@<S}6GVEN0u2r{OblZ?eLDM3`$l=YJ&l*;#GKexvPAxOe^!4vA??AgkK(OujO(Q9
zAHKPte&49W)5~a2)jyf_KP_Z8=w5kX&&<s1+@)oFr(j0v3zJQc6B@qi#8p3R;GEv#
zEh*o8H!1m%&q9U=JdL)o^CcuC&KVi3_+)5cknl@P9%%IRhvpNrI{6syc2DA2;~g*f
zmLrMrqGCbhe@o`(eG*q?4IX4NENA{!Qk!HU((Q3-gHD^z;^dMIX@9+%_zp<2#;w*j
zFfwpB)yUs(A}KLHHtk2N+y5z-T34sHcNrTPI6T?6H_f8rg~j3P{p&fcn$#Rz9DeNY
mX!uZnNXz}81}FrUFf$Z5rzLRB$TbCq6oaR$pUXO@geCxvJBT&_

diff --git a/Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png b/Resources/Textures/Objects/Misc/module.rsi/bluespacearray.png
deleted file mode 100644
index 768d4352447b0a42dad35a181501ee03307121ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004xNkl<Zc%1E4
zyK2KQ6g@7TFU{aBTR$Nwc+Qxui?)I%5op);1Nsex;4BSvX|uNU8v?bbj-^}3VhF}_
z;dYQkR5=eBtflyX(8Gs&j_;L(fDRoxG=vZ_>+wLQyldT?s4Zd|IK(@I6IbHvHEQBg
z)=k*F*0AgElQiXhS#X6@284+D<?i!na95s*z(pJYuEIH<@)!W{eRcyWfh<#;ECbGq
z2iUyDVtzEfGqe$%dYPn5L@bk(G1!*E%V`iIW=;oen$QMpag*nQqkBLHdwW#*CL+#e
z!{GULq~>2EWV2yFM1Od#XF`aWwTL#7NYvK6mcSOnxNg9E3C!S0-;LJ_bP1|9A);QD
zfnGIdZzTY>^)<vy1588{d!M+#=_Vv1F3VD1D$_l*DFBpZ88k6*>O#^%i((A`h@uDp
zHuwP$VFLim<q}1)w#~MT>ewX`4Bf`655rK68={$0OCbCRkzeFMAHb?wd~X)h`8@zY
y2^oEUnXAFd`tHjBOC?h4?~S=n106d2OZ);swEJjym?CEY0000<MNUMnLSTZa{m173

diff --git a/Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png b/Resources/Textures/Objects/Misc/module.rsi/boris_recharging.png
deleted file mode 100644
index ed0be6ff3b7d77395ef2d19a90440fe17319efa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0007NNkl<Zc%1E*
zv1{8v6o)_8?d}$|7!7I17DB<<N+y95x^#%?>cOB?{R27#>Ne?8x|BevvA~1r>WuB?
zF<okrEcNU`5Q4xJrm+bvsKZ%uRIqinBRgRI;P6>`y6@@TyL%@{lqgZ61!({6p?4Gc
zw-)Wl%1YbZTxtf4<F9-Mtb71&$2D+1pZ6Tc!EqdH+fK#BnU^0K0I!7ykTS>I*Tuci
zZyER-wi^rvQ@Fo4e&iBJnW9y#Dpjir_6TgG4PMp^swS8lqyMPkF`jL2&%6Q3@LMKW
zGxDP|K=&Ql6&+i&lnF)}G))6d13&|s%_g1>TYIB1eqUTjzwj*l&K!K{48Vq*1-WxT
z6^=cwQ~+2j6j&=10CDYVy1ss8&z$~I{L+xWQz)=A<d>%8M+U&tN3&q%MDrb+^o*}}
zA5`3aAGhC+LM??ap8*VKz#2hL4FiBqqd}+90K~QbXJ8&p;@5`!qeg?HA-^^yKe9Z9
zc43>)24kd!1O8I*1M<04VQVkXb(BFFzP}V|Gw`Dw(}e?m<oy(cF(qgi{d`9_@Z#iz
zT^Y`j`0^Q0CWwCbeHYudS^u;iHnu_ep`fZNilSU^2E@dVEQ7)NJBQXc(Lcz30boCS
zi0it6?ML3w>-A*cO-ga|r>X)QIY>Pf{k!+>aQyu%KikLLf1r@bWP)ef?KS}QdL7f8
zuw6?iZoYH|keg^0=u*1`z&UdO&~<&1d8Fdz%bx_xkUbSAO85Bzt_zPIJ|UCI@T>br
z7+pPro<Xr#l=FIt{Mf$IR8<Ym-^=(KTsA*ZqC|-jB}#Pj^$&YOp%P7ZwKM<#002ov
JPDHLkV1im8J?H=c

diff --git a/Resources/Textures/Objects/Misc/module.rsi/card_mini.png b/Resources/Textures/Objects/Misc/module.rsi/card_mini.png
deleted file mode 100644
index 61775eac29eb8ec2d90d1b3715ba84eaac8e92ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmV<K01^L*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002BNkl<Zc%1E&
zy$u2}42541btcFHxMhd5Y>_ciWCB_!vct96fi0MUHWWlrKqru`gDddY*m{wjmtR0p
z6h&DXBPsIU*EzkE!tS?`7$728Ye7U$xdgs}fZ5f599zu5JFff^zJWGLjIm2&{(S@P
z5mHKB>bd)cfyR0}(2gMI+@&$+vXvC=ZbyVYU?!j*0CNFOgE<cTkLdNOjgvY6XI@Xy
o9jIZ54ydWcAnB$kit_K=0qPGZG?JIF<^TWy07*qoM6N<$f(R91!vFvP

diff --git a/Resources/Textures/Objects/Misc/module.rsi/card_mod.png b/Resources/Textures/Objects/Misc/module.rsi/card_mod.png
deleted file mode 100644
index 5b095130b3057be171c756810f180011d0eca7b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003xNkl<Zc%1E&
zu};G<5Qe`XCU%R(GcQp33LZL<SLl$geHfO8hv=4}uh61O9nzKI7PwbHGJ~N>BkDv*
zfdPL~l$?D&U+#Vz5{X3Ozmts_+&Sk}6;(w<zTN9;%mjvT9h>w!JU~_g0@$8t()zZ*
z3q0-jJlM+%qX}eXWRuqwOctzw<IOUR-JQGE)Z7!#JK6$Yga?2MC|l8P7XTEKV9w`r
zMC9}q5rz;KVG&vYoVP&0Yz+XKE6cA6bg1i^&1QqO_Gcn&SHNsds6f|e68(i<q6uVW
zqXV5P%$hmP70s3GIoPAL;OrCtyAs~2irHh6$;!4w*kMQuhHIb%V+@+>X~?V_+pIq|
zG1Z_I0r&3cyNHHYps%9cvo<h+QE|@s!{Okos`8h7e&s4IilW~skw_%|iVrxHk$vc>
RYXATM002ovPDHLkV1i-vrKSJ?

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
deleted file mode 100644
index 5633f0f486c85c061130b3d6aef6abfb82d56282..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCil&0(?ST9USycP1S(B$I}B3mKz^Gc5Ka>HR)3~x^!#;3OZOHJq@I|N`m}?
z|HA;orZYO{fufuR9+AZi419+`m{C;2s{tq&>FMGaV&VVxf+Jsp0*}i@%_~{&>l3?M
zTUf6wh^{ODz`^puTe?D<!KGqRNVu2mf-@E>oJQqIvK}nAq@Nu)7tLs~K8PXb`kC+A
p5>Jd7zcsHgW_xV*;UCjg>7Ek`H+$}G`3JOw!PC{xWt~$(69DE5Tay3)

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cart_connector.png b/Resources/Textures/Objects/Misc/module.rsi/cart_connector.png
deleted file mode 100644
index 85b5730ed90f903866937657c7bd0599c3ad14f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 233
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4W2HJAr*7pPTI)JWXR(x&+$@i
z2h&O6nCVTb5-pB5n5?EH@Rpl5F4Z=2(J1P;aP*R?`cKooHS6C$u@+!)6kw@#aycb7
zYnt<VgQX!w=VEUa$^>53dmsFsb>Fe*%X1m7h<sV|-#2pg+F7cl`{m|vZgFnEe!#?c
zL&Ho(r5CP=A0uV=ZkB(4zj9vsnVvbuY0tJY&CzCf;Pv;ZQ}5o`Mh5@+%dH!W);FJ8
hyYhY=(7p}sc4q1NXKgO!Hv!$w;OXk;vd$@?2>|XWT@wHR

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cell_con.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con.png
deleted file mode 100644
index 0e34a852dec77c33b259fed6e1e01b16f5ec4f0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<Zc%1E&
zy=}uV5QRSlS%Ilkcm>7D3My3DfM?(U8AnT`^Ai5y3Mtgx27-ZeK{}CP0ilTmDRLih
z#RCuT$VY-;7=~f|cd8$A@+d(2(IO&<2*WUZ>;I7JuX|MYXc`pDqjaeNUB=!JLiWBN
za~rFEB08Y{l5Xc<2Ngn_Jvx$~fCqh>4D4rmmUm94Fadd$t2J3iT^;!41bh-T=mNH@
zZPY`m0?OV%4^Pe^r|$DDxOa!tF^Q&W5RqGx8OjpyDfY?9FV_HY41vu!X8GnP@RIpw
jwCM942^fZ97=O+gg<wxc&v9-|00000NkvXXu0mjf3T1XC

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_con_micro.png
deleted file mode 100644
index a63b08c13620726aa0299b34989cf74a4d3f7312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmV;{04e{8P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001;Nkl<Zc%1Fh
zF$%&k6vpv?KtaT%Lbq<-!Fza#cCUk*;1L|{ZJgsVvUSPUr4R=r)Xmq$!SA=cyo4n0
z!2=Nyk$>mRH)_&H9)M~R0lM$sU0D834-y-2EnN0j09Lz^)BQ;4OYqPiddrix0$i6D
zxzl31WEjR*?oI#BD<IXmkTb+}B*uIY?47^Oo`D<CO!q^M6{Z;w5fS;hCr>ya!UT90
Q!2kdN07*qoM6N<$g2!uG^8f$<

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cell_micro.png b/Resources/Textures/Objects/Misc/module.rsi/cell_micro.png
deleted file mode 100644
index 8d418f625a6cebe6758bd00d74e9965eea125059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4o?@ykcv5P&u!#A6u{H+@W0{<
z-z6r2QW}XYW(f^zgr~4J#3r<CVC-Rhry0k!q(sDxW7h9glS?=8Dk&*_O4kfJH-T~2
z-NHFLf6w^dZnlL#K}b{GBlGvE&q;3emc@I&>P%Bj6Wc3W&(QE|v30($^3zqPW(rqa
re#rOwDx2}+!uq=J+Jb@;<E0q#UW@;HDW*LY=q3hFS3j3^P6<r_4S-2z

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cell_mini.png b/Resources/Textures/Objects/Misc/module.rsi/cell_mini.png
deleted file mode 100644
index 5ab1069ab2853a1e7d6660bd579b856b529db01c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBAr*7pUfL*l$bhHy;e8pC
zkhV*~0fsEon=~^l)i~xcTry&Heb(6K?fjV6N0ezv=Yl7-Q_riPp5&*Xr1a_i9L*}{
zyne%w^RK4}F|;RVo=(?PXqm$}t5sP~JMFWl{<Er`v%4kud2^(m$Eh;}Tu*1{O3MBD
z`Rs{5kFNFpnf(3UoV*V#Mk#&|!tUPHpSyiu+@ZTB->me$M}HRT>gcdxSQ4lBp>|32
RBA{CtJYD@<);T3K0RYozSF8X4

diff --git a/Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_lambda.png
deleted file mode 100644
index d73b43c392f075f3846c1cb2ce9482d054b8d7bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6i*k&kcv5PFP-LXP!MQ&IA3Yo
zq_>>ei!`Jgm99-@6Xw?v(*JyyV|^l1M@PpW9o{#+LWPzamz4azvz?LYz;1@@YzC3d
z?v8Cz3$7(UxO<eLvZx`L`S<I)J$H0x-8&#&@8II%Vx~1$ip}nJLo3ie22WQ%mvv4F
FO#qdWIJ^J=

diff --git a/Resources/Textures/Objects/Misc/module.rsi/charger_pda.png b/Resources/Textures/Objects/Misc/module.rsi/charger_pda.png
deleted file mode 100644
index c4e974fda33d2d3a400fe753274a4550f32d20ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJUQZXtkcv5PFE8XhY#`A3&_0x%
zV{2x@u7;(HJ~Ze(WIgS?xgj%>okMTuq!mFgW3Nv5F1Wb*d&*4(B_*MRgo{0st2ezn
zoxR58xvWm=FP*sSN9R7?)flAay>fZn{3TcFr~dS2Y^cn*b4>j6g*}1{bM`iWKhB!*
yd*@DWnSX45w5Dy2{371+B<HxUxZuS2O6EdqrL_y!e$fItjKR~@&t;ucLK6TY=~CJN

diff --git a/Resources/Textures/Objects/Misc/module.rsi/charger_wire.png b/Resources/Textures/Objects/Misc/module.rsi/charger_wire.png
deleted file mode 100644
index 1bf6596dcb69cb5869b1ed5a17264e13934fcc0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$j7da6R9J=Wl)p;?aTLHmWi>QJpa{~SL&ix(f;0sV(LZpJG&R&v6hu%UM9|O>
z;m}slQbV)_Zb48+HZ+7|AhcXV9e4`n;9$r#*j*ZaI~$~-?+1?iz8}2z<-PZPAdyHU
zl0T-SU4i|6#k9`P&skxfE~h|)(-S5@S#i;utvdcK-ZKTfJ|8(<|1o~2$Z!!0n-{UL
zog83$HqQO(Ic3F#rq+^ZYR$ekw!!s5()Mi?VQDH4QL{1{WN7E<OLzE4&&seZ52ReY
zOjeuPyU%iV1%7IQumV?!66v{&Eidk-?Z5z<3OQXzQ)$q@UfzmA{_X-(@jjxb5rBr?
zdVM|s0?FDrkZja{_jf`#gjb0Ykbz(yWyQsbUx7E{bEv#%Dg@7TG}TKWi9Kxoe2Dp(
zWf*S=XKrn-HEly%DgZDv60$$T$cxgnUV&cRkaDg-cf^fh<S}mUgh}ghTtwC$u&94#
z*88uQEsCiu`$xyDFD;NS7TUJ(gn0Vhrl;R+I(tea63Kt(1BSS!&>e)T6aWAK07*qo
IM6N<$g41fwW&i*H

diff --git a/Resources/Textures/Objects/Misc/module.rsi/clock_mod.png b/Resources/Textures/Objects/Misc/module.rsi/clock_mod.png
deleted file mode 100644
index 48a83e5c4eba8e8cd435bfdcee5f5b14626b3acb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000A5Nkl<Zc%1Fs
zEpV$q6b0bZH%}muD_5>ui9}W+k(J2G$jHb@WMw2W5{X12kt>lno}gsf%qt|2<PPci
zR0lda5O$ZJ>>U6iA|fIpB3iF(r@O>@UEre&e00p8_V<#13Vd`{dvLCWQXa~>MbY5p
zJiI6z%DP1yDQM&2cyL`>wl6<@?xmhNe{$m@)gQ_5RiP>y80#ZHy3=|ScnAW8qHw5+
z7Ow4=$B}|-8Z<Sq<V$$={Lvl|DRkj$e>9cV04fBrfi@oMs!!TxK$^EO=#M-AXyakG
ztLN_Xugd>3w$imYg=c92*EGn|0?KM=<6)ZtN*O3+P@!)jRoS4fT5L8NR(nt$kXWzF
zcKYfu`O<uAL(%*s+04$L?3#g(E)4r_HYf^*H20yDfiW6+enjXwxE81J?`sP<A1|*l
zmTzqctu?ajLnJ>8V_0jj-*0E<j}Ad!!}~7yxf}rCkmePftB}51=%9rwYkcf$sM13m
z^)12;gW?R+`8moGg82vJ`Lg`cmQftTE=vnkMgJkL1(esXGeQ5yuyNZ>jqOgul{JnB
z2V?!y24rqt3;YfFqZ{^93vgw9>W097T7dFy@&){c{Lvw(Xz+r(?Ev@L?LL>Eodc5n
z_&H#%sr=y_knG3L0r$!u&H>59Ibh6W57=z<=_+6lB>`Mn<89YMDFXm-u0pIE0D!Un
za3gZMd3lW$qD_5OOT08+DTT7k#qy&lLYnSo<&SRA`E_t{=&yraS%13@1^@&1<8|=d
ztB~K2&pTn^{EIg1nr9(-{_R=FqMc{{mDcz)@|p69h=_=Yh=_=Yh=_>j-lTsKT4O%z
z1BCNAD?&J*^#Q{9H>nTEvV67k^QHHHQGGxhCkTQ7@9%G`ou9uX{}%ht+0nxJtPc>*
zXAcn0UsNA3jDg9-7&zA>=I1ZTzs3IFq&^@`Q$$g?%K7=y`_K9S;e6f+3+J;wU<LUX
zTjSHnXUZocA|fIpA|fIpA|j%Dlm10WI)4t<2MFV=2w|)b5O$OL0O|Sp_j-T8BP^;9
zke;9ai1!EF8)rugV|{=y_5fjv>I0<b=imGN0grH#`T*(q`S*H%z$36eKp5|Yg|R;1
mnMgm4l+Gt2A|fIpy2L-l2SBY$wKKf{0000<MNUMnLSTY{%DOlJ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_adv.png
deleted file mode 100644
index f294bee6306ede9dd4e8f6ff4cfb7459dfba36b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`C<PArY;~
z2@<S}6GVEN0u8uMFm#9I{rUgl=j#6_Om?OjPFl5a!3weEslvZzd7AaB@PcIP-#w9J
z%XW|E*}3>Pzp=#3*#<{ie@{+P6V~i{`&LJD(()UO?EJFJJ?15`EByX&ZR+cS9^ZKp
z2b{W+Qsh^?%y=|aU5uwfPk}pNvkctg2Mi38?cMghV{)GbbQpuDtDnm{r-UW|%|%WF

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_adv.png
deleted file mode 100644
index d8db3fd1ac2cd2c66871e35ba145e847910c4064..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$fk{L`R9J=Wl)p;?VHn51Wr)0kxM~i885btHigbrJHw85WO*OUNa#OR5e~1oE
z(G<pA93rT26m(caOG{8KacFSZpm(0;`>IDv^nRB2h36;V=Y1c5!{KoLJ1aE9=6-Pi
z0JabU01(UZ?kxO%#Bu-tPZtKY&KfJ3zo7qK&MA<@0yMqhovK-x8RIrVgQ-BOp9BEB
zzrEr`9ws{MNz`Puhz0=2nsG1gBk>hnfwpn&-NSMQ<(z^}vxQ=5_lK`>bBl6LfofJJ
z;$jJbRf63>_$)IqQ%NkK(`-@wC9wdQQ*m=fu*x!K%{Ws1B-ZQ01~k3FOy=6B<5(;;
z0>1*?`v=dqwX+RitiZ30ASMgmOSUnofLqj$Yxl>^gZT@lcL1>*>}|-@WS7r%*g^>1
z^ECA1Hcrz~5X%Yv3uY~!T12Dn0W$K*A6c-4=t2rG8<^D$u^gzVfK*4xtK)^UsO(E|
xb&wx?_D%*t&PDPwzoAR`?lI8G;cz&Af^R;*+6m!ZeJ%h1002ovPDHLkV1ixW%RvAD

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png b/Resources/Textures/Objects/Misc/module.rsi/cpuboard_super.png
deleted file mode 100644
index 5d1d7e09628c2bd5bb79be9af7772cc5e8f3a148..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px$(Md!>RA_<imQ70nQ51&XQe4a;+G;Tn6&PYl=t6Q7g#LigCJKUD1+Cn)YT-(P
z{zD51gm5FYDFnZ8Awt%o0fSa<l4=uD;9!esCO>aFehk%lHuo~;oco?RoI7U#f*=Tj
zAPC}rGS$nl6kKlrK+S3Z0C1wD?pZYZaiRnOc!=kE>gcUM%{r`Euw6Xj2qAxXfrum2
zcg&znLf^<T+Dm2tz{~R!Dgn8g+masukf`%WBr5=T^;y)A>WF)_NIxc_r#`a)#oV>J
zHwA3!-t86OM)lj#E1;0gbd8&}SeXgvt<Nlg>A==<ry`CJ5_KMKRB^T<sD8Wm89c5A
z5iz=OR61>q6Sa2$OTQ*;sD51LO0z!m8(=S)vG_5Mxul$c-{)Z-rr6u#v@!|(fv!L*
zod>}8^q1}9y8`3T?`sSy?Zk-^g3AH8y+Vh7A)7(Gob2!ih986D)Ms`;uQ5`{%6DF2
z;Wpl4zd5%ey;H=#bw*7>3zN`i7NFbDN7Rr4CrUV8bHVTPAeGJ|tW^HX$GIh<Hss4s
zN}pMPZpkQXICcWWWLvkk8#TJ=Uv4@ZZ|{2zE$eU4XO2My(_LB9Ix6(mCkTQd2!i;N
Zd;+W*qy`mar_TTY002ovPDHLkV1iH1?wtSt

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png b/Resources/Textures/Objects/Misc/module.rsi/cyborg_upgrade.png
deleted file mode 100644
index 64634a65cb633318aa3012c25635e104a916dfb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A3a?hLn2y}
z6C_v{Cy4Yk1sWV^m>9-(`gHc6_Kos(dm1mxsYO{fG&VLm`UFi{AT`UXLBikxU&2Av
zjk;GJ*fTRTJKu}X6Zx1gb%rO#{NJJr1_w$X>(BZ7`%UyInFm3~j(_kDpZYNRa_)|Y
z2B$A%rW`-W@H%qQo8z*q)w}ErWx85tEUFHilp#NntHA2O(w_c<c^eIZhB6;c{rj9}
z|Kg(^W+IkaC(0O#I25G4x*ld<Td%T$EnVtERBhu#kfT&jNX0EkC}yd$YB*W@_s6V<
z4;DV=iMQXUcI#jWs}j?p|E?@8|AoUWx!ewFNU$o)GBBKD@wxhIZTTXg=NUX*{an^L
HB{Ts5$bWsd

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png
deleted file mode 100644
index c9e713c3f350177c5c99f6be9137c88d66c53774..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`211o(uw9(erNykqaayC4N+8{H&9>PmwAg8%>j&)}f7@(Ym9S>O>_%)r2R
z7=#&*=dVZs3MP2EIEF;HzrAM7bwEMD_2SPr_2(Z>G?}Q#oTd2io*Prul~WOVYzzw+
z&M}`+{&RRsL4V>&<9njQaiY>Z@pn0=HNN8#W@OM{U|?lfP{&@<pM5cJ!Ow#lw`!U?
e85l$yp0R!o&@Xg9ZvO~q7lWs(pUXO@geCw8?@?X=

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png
deleted file mode 100644
index bca27c5edb40303cc27e0e57f2da895d086fb590..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`032l#}zGI%jCq%kBVB{6g`tXZ>0QBjfM2m?bUP@3Vk)53K?inAohFZe$c
zFa-No2!R9(JR*x382Ao@Fyrz36)8Z$!=5gVArbCxr#bQ+R^VYNT&VfKzR=K9Mn)`v
zbNQ*ob0SP`oH|(cQBlo+adXgvjyTChk6oHSJ2}idWUaENoo&u~u@tK&t8k`;iULth
z8)~<GX`QC9#N=+k&;BN>{hY7F_1c)+pR;QD>08{F*C-Bcys*OIfas6E>W2R;f*!<d
zRWOMXDBv!hae$?V)91jS=?Pop6Sxj$>`4yeHu}tz7<NJa{fyZQ%<ma$YfHRkmk4b%
t2tSx%e_(}J%TBRp292CE+M6WyuaqeNShH=)U!ZpwJYD@<);T3K0RUD5gE0UA

diff --git a/Resources/Textures/Objects/Misc/module.rsi/depositbox.png b/Resources/Textures/Objects/Misc/module.rsi/depositbox.png
deleted file mode 100644
index 702a498d4b755534276d11cf1b154df99acdc4d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004FNkl<Zc%1E(
zu}Z^G6ox;=LZRRk0$mDy06~0#63OHc3+*CqzLlVZn}UND1S_@?ad0XHAD~+&sW(F*
z$-T5rDIJ>R-kQz)O9J`N`M+~+;6kZVrAn3h@7mEZIgYb5Y3lpFR$qWUop9H6wZq>(
zhT7g-0LO8boo)w!tLw{+9^0zpoq7P=-rZ2E?H2>E9^QNGVO#Z$z9ig#>vMi~!9(x<
z?*Pf#0}%kwYPC`u1R`KG{=_{#VLqQ5g{K05*;%%|F4O6hYPDJ%K-=qTH5d#AtM@Pr
zivyU=W=tlN%;ILVx$;UWsZ=V&;lc=DH|>MYG>K>3`xAT{0i<p~O37lOKaEn#C^#2D
zDMb`TnZ;7d)l&$8Wm&}m0J#9`Q=4on7a%!D-M?BXg>BnBzdSJ>eQDnVsQ`)MIM!~o
zO?W1N5Q0Xdky$K+0N{1l-zpqZuH(a_1EcGA+wfAQ0Db}UBb9^HD+`hU0000<MNUMn
GLSTaZ$hEit

diff --git a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png
deleted file mode 100644
index 1632fc20d67974a3b4f0d6f5e6cfc2d4658e8089..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 296
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`<pO*{T$L5oBf=t<FJ5-`_{sGT|JB#mGbT<+JNnnn*&V1vB{1m>km4!{
z@(cbC0}Pwa=$r?Nau#?*7BevL9RguSQ4OyKpkS@1i(`m~_uKO)`5F{>TrUQ#JoW$o
z2A_#9uO7)LIb52YQ|wU0Kl=cSQ$CYRN>WRx&3eYP%^Ok=^RU{ik9WP)#KHEUhT)Il
zbO-zV2GhTfS21SXV=`ODT=seEXFdsWuOAH{a{e8K<xG~m3;x!8TCQf(zPfxC(7<};
abFvDhPO_Umq&@;Vgu&C*&t;ucLK6UrC2djw

diff --git a/Resources/Textures/Objects/Misc/module.rsi/mcontroller.png b/Resources/Textures/Objects/Misc/module.rsi/mcontroller.png
deleted file mode 100644
index 43d5087eb03c85bda20ae2d6be94f3945b92e2b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003#Nkl<Zc%1E&
zu};G<5QaY^l%abnA!Tr%p|ExElz{=kBXsEwFMxOh=18b7fW#JwP8qrt#NMSIJk@)r
zN?|ahF)F4g0}}GLIOp8mf9LoDkw_#GiTp95Q}l!y0Mpvbc8|HvvDRX(#Tc_!>o}CZ
zesKb#0E$M`6Rd|I45*EA8%wuTy$XQ0lM6EY@U2F$08zAzbG+`-MG6ZLSky+LltM}g
zfYur+AOXrd$XbD4I0_X|PoTbO2^M>NhHjNoGM%rO&R0z#uJGHC#Nj7k&#d>(UO8L5
zf(j++d;*gXBZFE(d09H!;N1nSHRI8M@o3;a!GVOQ;PaLP6p*HA(>Xx;w6oPxd7)LW
zBH#Wz1;GNmDKH^VybB7>Ki}p&&t_cr``oYBzaK+!+VMY;y9OSUq*IzmBog`GyaNXI
VXsUUbTX6sY002ovPDHLkV1kJDq)z|<

diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
index 7893fc357a..6152f5bf4d 100644
--- a/Resources/Textures/Objects/Misc/module.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json
@@ -1,370 +1,201 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104, cpu_wizard by ScarKy0, datadisk_t2_marks, datadisk_t3_marks, datadisk_t2_border and datadisk_t3_border by aliser",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "abductor_mod"
-    },
-    {
-      "name": "airalarm_electronics"
-    },
-    {
-      "name": "ash_plating"
-    },
-    {
-      "name": "beaker_holder"
-    },
-    {
-      "name": "blank_mod"
-    },
-    {
-      "name": "bluespacearray"
-    },
-    {
-      "name": "boris"
-    },
-    {
-      "name": "boris_recharging",
-      "delays": [
-        [
-          1.0,
-          1.0
-        ]
-      ]
-    },
-    {
-      "name": "card_mini"
-    },
-    {
-      "name": "card_mod"
-    },
-    {
-      "name": "cargodisk"
-    },
-    {
-      "name": "cart_connector"
-    },
-    {
-      "name": "cddrive"
-    },
-    {
-      "name": "cell"
-    },
-    {
-      "name": "cell_con"
-    },
-    {
-      "name": "cell_con_micro"
-    },
-    {
-      "name": "cell_micro"
-    },
-    {
-      "name": "cell_mini"
-    },
-    {
-      "name": "charger_APC"
-    },
-    {
-      "name": "charger_lambda"
-    },
-    {
-      "name": "charger_pda"
-    },
-    {
-      "name": "charger_wire"
-    },
-    {
-      "name": "clock_mod",
-      "delays": [
-        [
-          0.6,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "command"
-    },
-    {
-      "name": "cpu"
-    },
-    {
-      "name": "cpu_adv"
-    },
-    {
-      "name": "cpu_command"
-    },
-    {
-      "name": "cpu_engineering"
-    },
-    {
-      "name": "cpu_medical"
-    },
-    {
-      "name": "cpu_science"
-    },
-    {
-      "name": "cpu_security"
-    },
-    {
-      "name": "cpu_service"
-    },
-    {
-      "name": "cpu_super",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "cpu_supply"
-    },
-    {
-      "name": "cpu_syndicate"
-    },
-    {
-      "name": "cpu_wizard"
-    },
-    {
-      "name": "cpu_centcomm"
-    },
-    {
-      "name": "cpuboard"
-    },
-    {
-      "name": "cpuboard_adv"
-    },
-    {
-      "name": "cpuboard_super",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "cyborg_upgrade"
-    },
-    {
-      "name": "cyborg_upgrade1"
-    },
-    {
-      "name": "cyborg_upgrade2"
-    },
-    {
-      "name": "cyborg_upgrade3"
-    },
-    {
-      "name": "cyborg_upgrade4"
-    },
-    {
-      "name": "cyborg_upgrade5"
-    },
-    {
-      "name": "datadisk_base"
-    },
-    {
-      "name": "datadisk_gene",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk_encrypted",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk_hydro",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk_label"
-    },
-    {
-      "name": "datadisk_t2_marks"
-    },
-    {
-      "name": "datadisk_t3_marks"
-    },
-    {
-      "name": "datadisk_t2_border"
-    },
-    {
-      "name": "datadisk_t3_border"
-    },
-    {
-      "name": "depositbox"
-    },
-    {
-      "name": "door_electronics"
-    },
-    {
-      "name": "engineering"
-    },
-    {
-      "name": "flopdrive"
-    },
-    {
-      "name": "generic"
-    },
-    {
-      "name": "harddisk"
-    },
-    {
-      "name": "harddisk_micro"
-    },
-    {
-      "name": "harddisk_mini"
-    },
-    {
-      "name": "holodisk",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "id_mod"
-    },
-    {
-      "name": "mainboard"
-    },
-    {
-      "name": "mcontroller"
-    },
-    {
-      "name": "medical"
-    },
-    {
-      "name": "net_wired"
-    },
-    {
-      "name": "power_mod"
-    },
-    {
-      "name": "printer"
-    },
-    {
-      "name": "printer_mini"
-    },
-    {
-      "name": "prizevendor"
-    },
-    {
-      "name": "radio"
-    },
-    {
-      "name": "radio_micro"
-    },
-    {
-      "name": "radio_mini"
-    },
-    {
-      "name": "ram"
-    },
-    {
-      "name": "rndmajordisk"
-    },
-    {
-      "name": "science"
-    },
-    {
-      "name": "secmodschematic"
-    },
-    {
-      "name": "security"
-    },
-    {
-      "name": "selfrepair_off"
-    },
-    {
-      "name": "selfrepair_on",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "service"
-    },
-    {
-      "name": "servo"
-    },
-    {
-      "name": "ssd"
-    },
-    {
-      "name": "ssd_large"
-    },
-    {
-      "name": "ssd_micro"
-    },
-    {
-      "name": "ssd_mini"
-    },
-    {
-      "name": "std_mod"
-    },
-    {
-      "name": "supply"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104, cpu_wizard by ScarKy0, datadisk_t2_marks, datadisk_t3_marks, datadisk_t2_border and datadisk_t3_border by aliser",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "abductor_mod"
+        },
+        {
+            "name": "airalarm_electronics"
+        },
+        {
+            "name": "boris"
+        },
+        {
+            "name": "cddrive"
+        },
+        {
+            "name": "cell"
+        },
+        {
+            "name": "charger_APC"
+        },
+        {
+            "name": "command"
+        },
+        {
+            "name": "cpu"
+        },
+        {
+            "name": "cpu_command"
+        },
+        {
+            "name": "cpu_engineering"
+        },
+        {
+            "name": "cpu_medical"
+        },
+        {
+            "name": "cpu_science"
+        },
+        {
+            "name": "cpu_security"
+        },
+        {
+            "name": "cpu_service"
+        },
+        {
+            "name": "cpu_super",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "cpu_supply"
+        },
+        {
+            "name": "cpu_syndicate"
+        },
+        {
+            "name": "cpu_wizard"
+        },
+        {
+            "name": "cpu_centcomm"
+        },
+        {
+            "name": "cpuboard"
+        },
+        {
+            "name": "cyborg_upgrade1"
+        },
+        {
+            "name": "cyborg_upgrade2"
+        },
+        {
+            "name": "cyborg_upgrade3"
+        },
+        {
+            "name": "cyborg_upgrade4"
+        },
+        {
+            "name": "cyborg_upgrade5"
+        },
+        {
+            "name": "datadisk_base"
+        },
+        {
+            "name": "datadisk_encrypted",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "datadisk_label"
+        },
+        {
+            "name": "datadisk_t2_marks"
+        },
+        {
+            "name": "datadisk_t3_marks"
+        },
+        {
+            "name": "datadisk_t2_border"
+        },
+        {
+            "name": "datadisk_t3_border"
+        },
+        {
+            "name": "door_electronics"
+        },
+        {
+            "name": "engineering"
+        },
+        {
+            "name": "flopdrive"
+        },
+        {
+            "name": "generic"
+        },
+        {
+            "name": "harddisk"
+        },
+        {
+            "name": "harddisk_micro"
+        },
+        {
+            "name": "harddisk_mini"
+        },
+        {
+            "name": "id_mod"
+        },
+        {
+            "name": "mainboard"
+        },
+        {
+            "name": "medical"
+        },
+        {
+            "name": "net_wired"
+        },
+        {
+            "name": "power_mod"
+        },
+        {
+            "name": "printer"
+        },
+        {
+            "name": "radio"
+        },
+        {
+            "name": "science"
+        },
+        {
+            "name": "security"
+        },
+        {
+            "name": "service"
+        },
+        {
+            "name": "ssd"
+        },
+        {
+            "name": "std_mod"
+        },
+        {
+            "name": "supply"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/module.rsi/printer_mini.png b/Resources/Textures/Objects/Misc/module.rsi/printer_mini.png
deleted file mode 100644
index e9f49e9bc76efeb0d177a379c43a7e01429ef944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002wNkl<Zc%1Fj
zF>1pw6oBEsr5fx(kkC_fNsrJglrF_{2>1fNL9b%S(gS$N39@9#Dh~o}iFkuODpS04
zvJ(?1@0&CT=@$|LrIb=?f?d<3UDKq8ZGLr+i06Am-Qs1;<f174oVcp0WUWO+0Px;Z
z*Y(pZ0aw4<EdYz<l047p`+mwYz=SI}pH953R>QdKI<hRoT8lAe-hj4k0XQBGLxeE~
z5kW+7&JA;B35YSWF3TZeU6wfK@ZRISCxk$Zaa6$QH}LU(=IiI1&sTs2A%w9@+$QZw
jY)EO(V?H9Kl=^orT`OVZ__BFk00000NkvXXu0mjf)_Hvw

diff --git a/Resources/Textures/Objects/Misc/module.rsi/prizevendor.png b/Resources/Textures/Objects/Misc/module.rsi/prizevendor.png
deleted file mode 100644
index fa0573126ce27de9d2543cd3f8e72dc7f07c6170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003?Nkl<Zc%1E)
zK}y6h6o!9ABpJfsqH}<Of-5bq-S-sk<_aET4j_UX571LMR}c!KxUAhsBWZ9`7emWT
z>9qet3WEJtY5My9FYhIxz@$n4T}RRnHtSWz#9iM$P`O0_oAs)Cdr1f5KHWF2E-xsE
z<1x(7W~Xdg4qz;E3P5VUm@5&$2@|vo&#7czAMYY_8i1()04(MTdErG>pa9wlyG-)J
zH}l&u2Th-Xws~H78u(WLyXD_qc^^bxc--7QQFjbofv&Q5LF9$U<Lit~%K`LltTx2`
zv#hJsCafWbv|agdoCu)qWgN$q_Z~_qc)xE_&nej*1VDHSy37Hf1_OW~2t)vM3jiPt
z!-MavwaBteWG)7<)*?;Q&MHJv)QpWW;{Z74ptXk9dT+igOE~A6=Ojt!{|p+SUR7U@
ijWHtgNs}i13H<<8KbR^XNGQhu0000<MNUMnLSTZsO{Dbz

diff --git a/Resources/Textures/Objects/Misc/module.rsi/radio_micro.png b/Resources/Textures/Objects/Misc/module.rsi/radio_micro.png
deleted file mode 100644
index d4c6e60b3d360daae46ca53ef9c5bf20108c9fb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ>7Fi*Ar*6y6C_v{Cy4Yk1sZU%
zNf=C8_3*!B+y9=;6IkXM7#N&T*pbJ7N22WQE!QnOb(UB)6p9_W<hHq!2LxnJ)k~b>
z7c=(ZZ9kD;<1nkzXNlE=dMV~R$D5qi2(<AqJAVrd@@-<+<otm7I(r+x{DLNbi3f@f
wn<|%NH7sqM2{htm#1l_nW|;kM2Q?TN4yGs>HVe*?13Hnx)78&qol`;+07;cc1poj5

diff --git a/Resources/Textures/Objects/Misc/module.rsi/radio_mini.png b/Resources/Textures/Objects/Misc/module.rsi/radio_mini.png
deleted file mode 100644
index ef9a808a7fccbf7e3c47907cd96c3c0d64cd39d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc%1E&
zu?oU45Qe{qf~!J@N;Y4?&Aq!X(WRq<o8TijIOtorc6U<f>LPT=)};?1)S=Z>K`=pa
zxo^qkj^uuRjsrmu1mVvp=NB>6)7`XUT^~^%k*4WKe|KGaSEstUTD}xCY^L_Q&p-du
zNr2kfI5-Aqt;xa+faFl;+d{rBpo$wIjRVFQ2>lv+31~Y|%!)>Z&D~vyekGvoz-qJx
zpg+E{xXc0Tg3AnaTm+~IO6_<|`(W66)RKdBzy&7<?rec`SyGlZ=Q{&_d%(P@dF%l}
c5ClQE0k@Si=+SV}6#xJL07*qoM6N<$f(pcW(EtDd

diff --git a/Resources/Textures/Objects/Misc/module.rsi/ram.png b/Resources/Textures/Objects/Misc/module.rsi/ram.png
deleted file mode 100644
index 743e58a0776e97ad5577ac503f131fd67e9641e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~Nskcv5PFK*;*FyL{y$Zwr8
zL1*g1h^9W(2<7UQHby-Tm(TIVdTS=DHmi8rM=x4?Y)01G0~1TvXQtoe{<`MloKt)+
t%D>DzE4;6g@xZr7+-}v=CaGu^GEVSPRXMlJ!4qf)gQu&X%Q~loCIA2_G=u;E

diff --git a/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png
deleted file mode 100644
index 12241395d0eeb7c590c27f93923f69ec039c8f34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCijS1AIbU6D<q(G5k+TO8UR+|C%*x6crW!|Np;h*Z;@U19z6W0974iPj&}V
z+$BMN!9Xb}VDR#1`~(!{EbxddW?<ku48n}Z^H-z*1rt48978Pp-=6d4Yf#{Ey=WKh
zy8A!t>3AQF7R%+#LOVPa=iYGKBqUJa;;@f%76Xsv(d4|Ys|uT%PjNlzN)gzQY|it?
zdN$+2H4fFY{qz5Mu1a3J<MfyC6?Ua|`xm6MH@@Po|EnVP_n(jj&@u*3S3j3^P6<r_
Du6tzx

diff --git a/Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png b/Resources/Textures/Objects/Misc/module.rsi/secmodschematic.png
deleted file mode 100644
index adadde0b6dd452bdd07df110cb6ae593125f0643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003BNkl<Zc%1E&
zF;2rU7=^#0UcnxaZ{hX|9<o3=M8}?hQ!pTvEfPB$mmpcPWM%l(f&U6f?vS)ZB&Zf@
z1%p2+vSV5AJw027OeT}b{4ujjiiZ%Qs-mih$fVcRB?F|81I$x5R$HR?Fna<7a1)zk
zFn7TFY2D-o7IkkvAkGKlAyohE?$UJA8}M*!pf{}_p#o}P3)~xnE){_52MFg3u&8?{
zz`PmiS3UgVf!12|_M=;n34tF-K7z_aTz7L_cIK_MwAS)$?U%8@ZUfa#nr`|-v?h+$
zzFj)=VvYd;!e`*rL-e~lFjcXDu5=WxEK5X$q9{_W&PNC#Hcb<qbK~|hnM~%tum@`f
VSq{SK!5{zt002ovPDHLkV1nLpiS+;g

diff --git a/Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_off.png
deleted file mode 100644
index ee84c2fc04f6f3724f737c718cf99e983d5fd616..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004BNkl<Zc%1Fi
zu}cDB7{~Fi=&P@sD4f%wlh9x|N`u_(ZtYH$Q&azfLXCk^<Px+7g@fSQDnTu|wzznR
zbc=8xcsxz*r=SqLpZVea{dnK!1;a25;~zQ!o`4VF8E76dyjQ7Iq}%Pva5$8Hzb~HW
z3Ge`9_Z{A?*XuGGjbt*Jh%JaM$aFfDR;wjIZ<j+8G3T;Msj$=OP%4$MZJR=&fKrMm
zidd~ywA*cb-#-Grw<(Z{Ip;c#Ll6Y4*K2|xAfL~pwFY3b*-))k@qNDu-0!16Hi{x<
zvl(wMubf_-V_6njYciP(gX<fPA6?jC58^(7t(5v{G#Vt6NfL<!sZ@$|I*ryE%d!}c
z$1Io2I`Fw|iMVbZ#}U_c#TLYMUGY3mY(Z+Z+TTyuTHG4|NCJ1oV)3$EE|bgU2*Z%Y
zV!?bq9{>Yjx=V>|odNH_2KWN5fb=1P4Z|>uz4!%j8E}EE!}OT|0000<MNUMnLSTZ;
C<+v{Z

diff --git a/Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png b/Resources/Textures/Objects/Misc/module.rsi/selfrepair_on.png
deleted file mode 100644
index 348ea8ae9f9431ffc3a0af843ff17f37a0616c5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 517
zcmV+g0{Z=lP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005ZNkl<Zc%1Fp
zv5VSZ9LDjlXfzU0h*Qu>=wNY_4wCG*b$7bfsZ;+2h3i;2X{k%0YoWzKaP2CEcByL@
z7lTN%2!devb?SCp$=&7hD!<SC!t)T4EbjwKDW#NBN~r{%0iS>$z-Qp%OfzqE-D<UD
zG#bftI+gKwEI|+m@Bt{FQRa<C-ELQAvzaUw3vmT;1z9ea((m^LxIVSaT!OP@%d+;v
z;gCk7f$O@|YBem&B93EryB&kUfG`Z70Ke~3>M=753C{YS=MhB_hr@v=il|nr*tQM8
z@pz=&ZWD&#1@QhZWwOXj@&L+l9J5-j`1a*1&tJa4aU5*hrc^31xq8FXk3Kx?H<@~7
zl25?3EbC9N*CU_Llgs5O6bclJMQq!~aUACJIos{F3;eumAp<gR_15z|@qJ%hL44nr
zAPB@2q|@pA`zxPRW|B7mAP>B&*XysE%_fyfh5dfdX0u_vUQd7tu)I$pLo)yC68H`r
zfnUIDpm>IvN-3q3Qc5YMlu}A5r4$C;)o0Pgn7jHcx@55rNVSXU`+(HDn7$84y^HDl
zfYiH~z7H_2OBVZpRJ)wQKETK>mzZ-`Z&DYflu}A5rB20P-`v6a+o{vJ00000NkvXX
Hu0mjfXY~3#

diff --git a/Resources/Textures/Objects/Misc/module.rsi/servo.png b/Resources/Textures/Objects/Misc/module.rsi/servo.png
deleted file mode 100644
index 1107411dfdeb50ac50955099880d18059b169e76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 325
zcmV-L0lNN)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003DNkl<Zc%1Fj
zA#TGk6b9gb(=Lz_%NGc+v<rmg0+p(gDhDVU=z#``B9o9pgTSEOApw!B5Z5Rq;1$(M
zHxj#1!Q_wFdQzT$`B?#?D2k#LR8rD>_3^PrfMl~lt(5oSPphP)S}B^Vm7<WF2zC#U
zB#8^)^S##yilTUEzTa-$-WcQdm6WtU9NtzB@LP4cAWhSU+V}a4vMd)J4gl}Z1OR|>
z9C0-UU#AnUvs+kdaZ&)tvh2@%^E}5iO#pzt@6mM~nx<LY*J}jUS}?}IId`?TZQWjL
z4Qs7W%dj_~wZ<?E&|141=Nyc&kal5&5VXrd_yp~8kPza<KcXXuen9i}wE?0iivEim
XDXM*L@#0T!00000NkvXXu0mjfY|@Xr

diff --git a/Resources/Textures/Objects/Misc/module.rsi/ssd_large.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_large.png
deleted file mode 100644
index 9f2ae21f6bb2bfd28d8a52189432463fe67f02b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002#Nkl<Zc%1E&
zu?@m75Ji6wlDl+Jc>?!LfOHZWB-3O9ItF2bRGEOn-A#ambQF=Jhy-#$gf#agE8mWM
zKKs567=~dOE0Zl5oQQ;(!OVy;j;^&?G64<SuV$5ykN+b858yT(N__%SL!^eFXcu=E
z2X}E8)mNttt4|<1x2;bIVN(Ar0V&&-$n$(sYtY|<RQFWh^u>!#eE{?zOx*&t3DfTP
zrybaHSLgfj{#I+4?EyY;Hx@$Zc0SNbW}iSZ;{QF+r-Y<B59s-V9)zl@5MxA96pOyP
oqY#laO(Wj>&kvVj7{;1B0X-;EKRa0;*8l(j07*qoM6N<$g1dKh(EtDd

diff --git a/Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_micro.png
deleted file mode 100644
index bbe0eb94882e32a1461d7737894c25442c3b0b2c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJY)==*kcv5PFKuLOP!M1~u*dqs
zP8M&=wq}D4?}Wd?7L42pA4Rsc9Xb^AIbec6qk@vsr}ATVZ`60aeY~kJ^4@dZ97gSp
z7FSzhjHM5Yzlc6_O=@q=ss>Sp@Huzq>KS}zms4e6V4trJ)HYLkMSzIh>c6V2Kx-L1
MUHx3vIVCg!04hQ`_W%F@

diff --git a/Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png b/Resources/Textures/Objects/Misc/module.rsi/ssd_mini.png
deleted file mode 100644
index 24dd35ee5ac48c8ff7569a56cfc703cfd6b4b4b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJiJmTwAr*7pUf#&bY{<iUA)jMK
z@$*Mv1@+!36QobYPCFse_S)v)+mFFB94wq1xKz&8_i}M_f5~-ladG*lQ#tFVBZJ4=
zvx%SYel7WEvY&6;?1k637;a3rHM-p|o5EhmdbTI+SP<97vu9m?T>F-JL0{>CS$5WP
zj%yVx8_f&O7#(vsCmC_*^Zp;K$6tPs>js)Cx8SvM_4Y-_3xJMe@O1TaS?83{1OPKf
BQo;ZL


From 081e2582dc7ca0bb5a5b0d8ea723425e498ffc16 Mon Sep 17 00:00:00 2001
From: AndrewFenriz <78079974+AndrewFenriz@users.noreply.github.com>
Date: Sat, 3 Oct 2026 22:42:20 +0000
Subject: [PATCH 38/69] Big sprites cleanup (Part 3) (#46284)

* delete 1

* delete 2

* delete 3

* delete 4

* delete 5

* delete 6

* delete 7

* done!

* fix

* Update Resources/Textures/Objects/Devices/communication.rsi/meta.json

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>

---------

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
---
 .../Asteroid/basilisk.rsi/basilisk_alert.png  | Bin 4385 -> 0 bytes
 .../Aliens/Asteroid/basilisk.rsi/meta.json    |  60 +-
 .../Textures/Mobs/Pets/cat.rsi/cak_rest.png   | Bin 370 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/cak_sit.png    | Bin 400 -> 0 bytes
 .../Mobs/Pets/cat.rsi/cat_deadcollar.png      | Bin 119 -> 0 bytes
 .../Mobs/Pets/cat.rsi/cat_deadtag.png         | Bin 95 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/cat_rest.png   | Bin 741 -> 0 bytes
 .../Mobs/Pets/cat.rsi/cat_restcollar.png      | Bin 119 -> 0 bytes
 .../Mobs/Pets/cat.rsi/cat_resttag.png         | Bin 95 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/cat_sit.png    | Bin 655 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/catcollar.png  | Bin 162 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/cattag.png     | Bin 139 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kitten_deadcollar.png   | Bin 113 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kitten_deadtag.png      | Bin 96 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kitten_rest.png         | Bin 662 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kitten_restcollar.png   | Bin 113 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kitten_resttag.png      | Bin 96 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/kitten_sit.png | Bin 552 -> 0 bytes
 .../Mobs/Pets/cat.rsi/kittencollar.png        | Bin 153 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/kittentag.png  | Bin 151 -> 0 bytes
 .../Textures/Mobs/Pets/cat.rsi/meta.json      | 514 +++---------------
 .../Mobs/Pets/cat.rsi/spacecat_rest.png       | Bin 1266 -> 0 bytes
 .../Mobs/Pets/cat.rsi/spacecat_sit.png        | Bin 988 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/corgi_deadcollar.png  | Bin 117 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/corgi_deadtag.png     | Bin 104 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/corgi_rest.png        | Bin 816 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/corgicollar.png       | Bin 189 -> 0 bytes
 .../Textures/Mobs/Pets/corgi.rsi/corgitag.png | Bin 136 -> 0 bytes
 .../Textures/Mobs/Pets/corgi.rsi/meta.json    |  36 +-
 .../Mobs/Pets/corgi.rsi/puppy_deadcollar.png  | Bin 145 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/puppy_deadtag.png     | Bin 141 -> 0 bytes
 .../Mobs/Pets/corgi.rsi/puppycollar.png       | Bin 216 -> 0 bytes
 .../Textures/Mobs/Pets/corgi.rsi/puppytag.png | Bin 190 -> 0 bytes
 .../Mobs/Pets/fox.rsi/fox_deadcollar.png      | Bin 116 -> 0 bytes
 .../Mobs/Pets/fox.rsi/fox_deadtag.png         | Bin 123 -> 0 bytes
 .../Textures/Mobs/Pets/fox.rsi/foxcollar.png  | Bin 145 -> 0 bytes
 .../Textures/Mobs/Pets/fox.rsi/foxtag.png     | Bin 141 -> 0 bytes
 .../Textures/Mobs/Pets/fox.rsi/meta.json      | 104 ++--
 .../Devices/communication.rsi/beacon_dead.png | Bin 253 -> 0 bytes
 .../Devices/communication.rsi/meta.json       | 178 +++---
 .../communication.rsi/radio-inhand-left.png   | Bin 311 -> 0 bytes
 .../communication.rsi/radio-inhand-right.png  | Bin 263 -> 0 bytes
 .../Devices/communication.rsi/radio.png       | Bin 536 -> 0 bytes
 .../encryption_keys.rsi/borg_label.png        | Bin 149 -> 0 bytes
 .../Devices/encryption_keys.rsi/ce_label.png  | Bin 388 -> 0 bytes
 .../Devices/encryption_keys.rsi/cmo_label.png | Bin 382 -> 0 bytes
 .../encryption_keys.rsi/crypt_orange.png      | Bin 313 -> 0 bytes
 .../Devices/encryption_keys.rsi/hop_label.png | Bin 380 -> 0 bytes
 .../Devices/encryption_keys.rsi/hos_label.png | Bin 392 -> 0 bytes
 .../Devices/encryption_keys.rsi/meta.json     | 111 ++--
 .../encryption_keys.rsi/miner_label.png       | Bin 389 -> 0 bytes
 .../Devices/encryption_keys.rsi/qm_label.png  | Bin 377 -> 0 bytes
 .../Devices/encryption_keys.rsi/rd_label.png  | Bin 386 -> 0 bytes
 .../Objects/Devices/gates.rsi/meta.json       | 109 ++--
 .../Objects/Devices/gates.rsi/or_icon.png     | Bin 7600 -> 0 bytes
 .../health_analyzer.rsi/malnutrition.png      | Bin 1295 -> 0 bytes
 .../Devices/health_analyzer.rsi/meta.json     |  61 +--
 .../Objects/Devices/nuke.rsi/meta.json        | 104 ++--
 .../Objects/Devices/nuke.rsi/nuclearbombc.png | Bin 1612 -> 0 bytes
 .../output.rsi/aicard-full-unshaded.png       | Bin 777 -> 0 bytes
 .../Devices/output.rsi/aicard-full.png        | Bin 1746 -> 0 bytes
 .../Devices/output.rsi/aicard-unshaded.png    | Bin 138 -> 0 bytes
 .../Objects/Devices/output.rsi/aicard.png     | Bin 414 -> 0 bytes
 .../Objects/Devices/output.rsi/meta.json      |   1 -
 .../Objects/Devices/tablets.rsi/meta.json     |  23 +-
 .../Objects/Devices/tablets.rsi/tabletsol.png | Bin 389 -> 0 bytes
 .../Fun/Foam/foam_crossbow.rsi/foambox.png    | Bin 222 -> 0 bytes
 .../Fun/Foam/foam_crossbow.rsi/meta.json      |   3 -
 .../otherinstruments.rsi/bike_horn.png        | Bin 411 -> 0 bytes
 .../otherinstruments.rsi/drum_bongo.png       | Bin 518 -> 0 bytes
 .../otherinstruments.rsi/drum_makeshift.png   | Bin 520 -> 0 bytes
 .../otherinstruments.rsi/meta.json            |   9 -
 .../structureinstruments.rsi/meta.json        |  12 -
 .../minimoog-broken.png                       | Bin 3170 -> 0 bytes
 .../structureinstruments.rsi/piano-broken.png | Bin 4493 -> 0 bytes
 .../xylophone-broken.png                      | Bin 3703 -> 0 bytes
 .../Objects/Fun/capgun.rsi/bolt-closed.png    | Bin 99 -> 0 bytes
 .../Textures/Objects/Fun/capgun.rsi/meta.json |   3 -
 .../Fun/pai.rsi/golden-icon-pai-off.png       | Bin 590 -> 0 bytes
 .../Objects/Fun/pai.rsi/icon-pai-off.png      | Bin 4522 -> 0 bytes
 .../Objects/Fun/pai.rsi/icon-potato-off.png   | Bin 483 -> 0 bytes
 .../Textures/Objects/Fun/pai.rsi/meta.json    |   9 -
 .../Materials/Shards/piece.rsi/meta.json      |  20 -
 .../Materials/Shards/piece.rsi/piecelarge.png | Bin 243 -> 0 bytes
 .../Shards/piece.rsi/piecemedium.png          | Bin 258 -> 0 bytes
 .../Materials/Shards/piece.rsi/piecesmall.png | Bin 188 -> 0 bytes
 .../Materials/Shards/shrapnel.rsi/meta.json   |  20 -
 .../Shards/shrapnel.rsi/shrapnellarge.png     | Bin 195 -> 0 bytes
 .../Shards/shrapnel.rsi/shrapnelmedium.png    | Bin 187 -> 0 bytes
 .../Shards/shrapnel.rsi/shrapnelsmall.png     | Bin 138 -> 0 bytes
 .../Materials/Shards/splinters.rsi/meta.json  |  20 -
 .../Shards/splinters.rsi/splinterslarge.png   | Bin 216 -> 0 bytes
 .../Shards/splinters.rsi/splintersmedium.png  | Bin 149 -> 0 bytes
 .../Shards/splinters.rsi/splinterssmall.png   | Bin 140 -> 0 bytes
 .../Misc/folders.rsi/folder-sec-doc.png       | Bin 284 -> 0 bytes
 .../Objects/Misc/folders.rsi/meta.json        |   3 -
 .../Textures/Objects/Misc/pens.rsi/meta.json  | 112 ++--
 .../Objects/Misc/pens.rsi/pen_blue.png        | Bin 220 -> 0 bytes
 .../Objects/Misc/pens.rsi/pen_red.png         | Bin 257 -> 0 bytes
 .../Misc/stock_parts.rsi/adv_capacitor.png    | Bin 420 -> 0 bytes
 .../Misc/stock_parts.rsi/adv_electrolite.png  | Bin 488 -> 0 bytes
 .../Misc/stock_parts.rsi/adv_scan_module.png  | Bin 927 -> 0 bytes
 .../adv_scan_module_static.png                | Bin 428 -> 0 bytes
 .../stock_parts.rsi/advanced_matter_bin.png   | Bin 426 -> 0 bytes
 .../Misc/stock_parts.rsi/ansible_crystal.png  | Bin 163 -> 0 bytes
 .../stock_parts.rsi/bluespace_electrolite.png | Bin 508 -> 0 bytes
 .../stock_parts.rsi/bluespace_matter_bin.png  | Bin 627 -> 0 bytes
 .../Misc/stock_parts.rsi/capacitor.png        | Bin 254 -> 0 bytes
 .../Misc/stock_parts.rsi/card_reader.png      | Bin 396 -> 0 bytes
 .../Misc/stock_parts.rsi/electrolite.png      | Bin 396 -> 0 bytes
 .../Misc/stock_parts.rsi/femto_mani.png       | Bin 589 -> 0 bytes
 .../Misc/stock_parts.rsi/high_micro_laser.png | Bin 278 -> 0 bytes
 .../Misc/stock_parts.rsi/hyperwave_filter.png | Bin 395 -> 0 bytes
 .../Misc/stock_parts.rsi/matter_bin.png       | Bin 462 -> 0 bytes
 .../Objects/Misc/stock_parts.rsi/meta.json    | 258 ++-------
 .../Misc/stock_parts.rsi/micro_laser.png      | Bin 263 -> 0 bytes
 .../Misc/stock_parts.rsi/nano_mani.png        | Bin 394 -> 0 bytes
 .../Misc/stock_parts.rsi/pico_mani.png        | Bin 373 -> 0 bytes
 .../stock_parts.rsi/quadratic_capacitor.png   | Bin 729 -> 0 bytes
 .../stock_parts.rsi/quadultra_micro_laser.png | Bin 371 -> 0 bytes
 .../stock_parts.rsi/scan_module_static.png    | Bin 327 -> 0 bytes
 .../stock_parts.rsi/subspace_amplifier.png    | Bin 283 -> 0 bytes
 .../Misc/stock_parts.rsi/subspace_ansible.png | Bin 364 -> 0 bytes
 .../stock_parts.rsi/subspace_transmitter.png  | Bin 249 -> 0 bytes
 .../Misc/stock_parts.rsi/super_capacitor.png  | Bin 419 -> 0 bytes
 .../stock_parts.rsi/super_electrolite.png     | Bin 476 -> 0 bytes
 .../Misc/stock_parts.rsi/super_matter_bin.png | Bin 397 -> 0 bytes
 .../stock_parts.rsi/super_scan_module.png     | Bin 1182 -> 0 bytes
 .../Misc/stock_parts.rsi/treatment_disk.png   | Bin 214 -> 0 bytes
 .../stock_parts.rsi/triphasic_scan_module.png | Bin 631 -> 0 bytes
 .../ultra_high_micro_laser.png                | Bin 304 -> 0 bytes
 .../stock_parts.rsi/wavelength_analyzer.png   | Bin 213 -> 0 bytes
 .../Specific/Chemistry/chemg.rsi/chemg.png    | Bin 159 -> 0 bytes
 .../Chemistry/chemg.rsi/chemg_armed.png       | Bin 324 -> 0 bytes
 .../Chemistry/chemg.rsi/chemg_ass.png         | Bin 274 -> 0 bytes
 .../Chemistry/chemg.rsi/chemg_locked.png      | Bin 274 -> 0 bytes
 .../Specific/Chemistry/chemg.rsi/meta.json    |  29 -
 .../Furniture/chairs.rsi/bar-knocked.png      | Bin 844 -> 0 bytes
 .../chairs.rsi/chair-greyscale-knocked.png    | Bin 535 -> 0 bytes
 .../Furniture/chairs.rsi/chair-knocked.png    | Bin 535 -> 0 bytes
 .../Structures/Furniture/chairs.rsi/meta.json |  20 -
 .../Furniture/chairs.rsi/stool-knocked.png    | Bin 682 -> 0 bytes
 .../chairs.rsi/wooden-wings-knocked.png       | Bin 1400 -> 0 bytes
 .../containers.rsi/claypot-item.png           | Bin 375 -> 0 bytes
 .../containers.rsi/claypot-large.png          | Bin 394 -> 0 bytes
 .../Hydroponics/containers.rsi/claypot.png    | Bin 377 -> 0 bytes
 .../Hydroponics/containers.rsi/hydrocover.png | Bin 1406 -> 0 bytes
 .../Hydroponics/containers.rsi/meta.json      |  46 +-
 .../Hydroponics/overlays.rsi/lownutri.png     | Bin 137 -> 0 bytes
 .../Hydroponics/overlays.rsi/meta.json        | 159 +++---
 .../Power/power.rsi/eightdirwire.png          | Bin 389 -> 0 bytes
 .../Structures/Power/power.rsi/meta.json      |  49 +-
 .../barrels.rsi/flamingmetalbarrel.png        | Bin 961 -> 0 bytes
 .../Storage/barrels.rsi/iedweldbarrel.png     | Bin 589 -> 0 bytes
 .../Structures/Storage/barrels.rsi/meta.json  |  56 +-
 .../Storage/barrels.rsi/waterbarrel.png       | Bin 379 -> 0 bytes
 .../Storage/barrels.rsi/weldbarrel.png        | Bin 454 -> 0 bytes
 .../Storage/barrels.rsi/woodenbarrel.png      | Bin 419 -> 0 bytes
 158 files changed, 652 insertions(+), 1477 deletions(-)
 delete mode 100644 Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/basilisk_alert.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cak_rest.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cak_sit.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_deadcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_deadtag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_rest.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_restcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_resttag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cat_sit.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/catcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/cattag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadtag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_rest.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_restcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_resttag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kitten_sit.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/spacecat_rest.png
 delete mode 100644 Resources/Textures/Mobs/Pets/cat.rsi/spacecat_sit.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadtag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/corgi_rest.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/corgicollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/corgitag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadtag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/puppycollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/corgi.rsi/puppytag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/fox.rsi/fox_deadcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/fox.rsi/fox_deadtag.png
 delete mode 100644 Resources/Textures/Mobs/Pets/fox.rsi/foxcollar.png
 delete mode 100644 Resources/Textures/Mobs/Pets/fox.rsi/foxtag.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/radio.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png
 delete mode 100644 Resources/Textures/Objects/Devices/gates.rsi/or_icon.png
 delete mode 100644 Resources/Textures/Objects/Devices/health_analyzer.rsi/malnutrition.png
 delete mode 100644 Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png
 delete mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png
 delete mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-full.png
 delete mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard-unshaded.png
 delete mode 100644 Resources/Textures/Objects/Devices/output.rsi/aicard.png
 delete mode 100644 Resources/Textures/Objects/Devices/output.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png
 delete mode 100644 Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foambox.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/bike_horn.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_bongo.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_makeshift.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog-broken.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-broken.png
 delete mode 100644 Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone-broken.png
 delete mode 100644 Resources/Textures/Objects/Fun/capgun.rsi/bolt-closed.png
 delete mode 100644 Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png
 delete mode 100644 Resources/Textures/Objects/Fun/pai.rsi/icon-pai-off.png
 delete mode 100644 Resources/Textures/Objects/Fun/pai.rsi/icon-potato-off.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/piece.rsi/piecelarge.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/piece.rsi/piecemedium.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/piece.rsi/piecesmall.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnellarge.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelmedium.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelsmall.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterslarge.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/splinters.rsi/splintersmedium.png
 delete mode 100644 Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterssmall.png
 delete mode 100644 Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png
 delete mode 100644 Resources/Textures/Objects/Misc/pens.rsi/pen_blue.png
 delete mode 100644 Resources/Textures/Objects/Misc/pens.rsi/pen_red.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module_static.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module_static.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
 delete mode 100644 Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_armed.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_ass.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_locked.png
 delete mode 100644 Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json
 delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png
 delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png
 delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png
 delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png
 delete mode 100644 Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png
 delete mode 100644 Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png
 delete mode 100644 Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png
 delete mode 100644 Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png
 delete mode 100644 Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png
 delete mode 100644 Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png
 delete mode 100644 Resources/Textures/Structures/Power/power.rsi/eightdirwire.png
 delete mode 100644 Resources/Textures/Structures/Storage/barrels.rsi/flamingmetalbarrel.png
 delete mode 100644 Resources/Textures/Structures/Storage/barrels.rsi/iedweldbarrel.png
 delete mode 100644 Resources/Textures/Structures/Storage/barrels.rsi/waterbarrel.png
 delete mode 100644 Resources/Textures/Structures/Storage/barrels.rsi/weldbarrel.png
 delete mode 100644 Resources/Textures/Structures/Storage/barrels.rsi/woodenbarrel.png

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/basilisk_alert.png b/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/basilisk_alert.png
deleted file mode 100644
index 3bd4e6e1a703a10554148760df22168517567cc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4385
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
XW_ChoUvZCl<^eD<G&iWY;uQ6NOa_{d

diff --git a/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json
index 73710c98cb..a70af3e980 100644
--- a/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json
+++ b/Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json
@@ -1,48 +1,18 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/9bd459b27c73575fd5e3bf2efea13b816d0ac7c8/icons/mob/animal.dmi",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "basilisk",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/9bd459b27c73575fd5e3bf2efea13b816d0ac7c8/icons/mob/animal.dmi",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "basilisk_alert",
-      "directions": 4,
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ],
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "basilisk_dead"
-    }
-  ]
+    "states": [
+        {
+            "name": "basilisk",
+            "directions": 4
+        },
+        {
+            "name": "basilisk_dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cak_rest.png b/Resources/Textures/Mobs/Pets/cat.rsi/cak_rest.png
deleted file mode 100644
index 9d6d13f93a1ea09ece6f56809dc0544b9359e73b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmV-&0ge8NP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003wNkl<Zc%1E&
zF;2rU6o&t1GOjm!Co2O;9V&4I79>WF!N80VCt&CSdIY3ifE}hXbbZ|&iNP}2%;YF>
zY?=frG5C`*#EIYk`Pnj%$z(E_OeT~0uh4GeXt#04&M8vioHKCF@D~z9l&ldID9^5E
z*4D7L{<Q=VIrh3vibMsx#MIDsH~=ulKt!&7dG7s_6llXan=B!Oz~|*H0D#@xO%s>`
z5ji15BjKNL8x9H-^973e;>UwD1hrC-QuZVc?z7g~Nv*JF)EO_!vNJan6hc6%Csg{O
zSMz;!kE_S^Y_LFV+!)h&_w62nF{W8SQoyfhXkjIn(AC?h@T5Td0Hp&ZbX7$Iw&f`<
zXy3@UyA^I-Pr%=T*4Dtud8Y$XDO6e~rHnDa*9T(r!*BkciFY877|jTYZ`|&rX2e-k
Q1ONa407*qoM6N<$f_E&U=Kufz

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cak_sit.png b/Resources/Textures/Mobs/Pets/cat.rsi/cak_sit.png
deleted file mode 100644
index f8e99f1953fdd8ca5bfcfb75e7a02212bcc1bf5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmV;B0dM|^P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800043Nkl<Zc%1E(
zJx;_h5QSg(k+RWr@d4aWY(a^{CH5v9g%WWD8p;%006{^Kf+Fo~heRS#c+EC!C?c;+
z$dAn?RQ{w$kz(h)c{7QDKp+qZ1ZIGlYuB|$bBM=}cg{v8HDCl6r^jIC`s?9#bWb$3
z0U`nbD5U@ZQp!P%$r5PCO++A~(Kbxl0#m&~+=x*VlMkUyc~t@c-tMn^*UUBpHcF}9
zS(r6}F>!ALTx2yDS!X}Hsvi^gGQdSvCrLcGCKVrE;s9{sYG4RceO3DJJ$MHC2G13z
z1Wf!|Zy}ef$Or?!zkOf+lz^$)78mKoKNwh?_eNe;FZ=r^kvhN9YY2%5X(>=q_q3S<
z=yIJy>#fr}of44CRix`P06--g@!clJZj(d3KO+^Q5&wK`E)Tp~U@C00W`>k9G6M<#
uNfM*)r)A@P7VJ+pt5RDSzz^Z}vo_y~H=m}D9$wD?0000<MNUMnLSTYU>!OGN

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_deadcollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_deadcollar.png
deleted file mode 100644
index d065e3f898e414c4e5bb46ce1bd69ce38033ee3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJ5LwKkcv5PFCFA$FyLTu^!%S2
z(SG-a+oi@k&pA$<i*^xH2C8C6Si5R<kL-8ZdQQ<jth?5}Hl3N=`qW;b;=vD2v5UD=
Qqd;mrUHx3vIVCg!0O^S*a{vGU

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_deadtag.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_deadtag.png
deleted file mode 100644
index 30c0a77e38a240c054b0858de4110e3c63672c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzHBT4Ekcv5PPdYL(C<rhwh`gU5
rW^h5LfVV}T6Da+mdES?IS6|BY{b5xy_L$!d6k_mn^>bP0l+XkKC&U`q

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_rest.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_rest.png
deleted file mode 100644
index 5650e1d504ff6e518483d5835946f1783d3f2190..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00084Nkl<Zc%1E;
zEpOvM5Qbl$PRSZXGKn;73j-sSEIfEW!SF~xkgbC1U_n8k%K{7cX9OAs2D;2rL5%J;
zsdRfFw`tOR`J+h=%p*mL;`O}mj%OV(127E3Fbu;m48t%C!!QiPY@n2~N-5hU1`##7
z|7!Y5DXX=%Ns`z&j%x)WBAY)y*t$lXhq_6qt*?}_Ns`zm6(FUwQc7FsktHHKOR6Pt
z)5E#+zZ?rdL;!#^O}#n>7K;UZ-$yS_007@cx^fKX;avJ(j|E866j_$7$|%n(B|%DQ
zecuNF1VI1*5JEr*VY4hN9m{#BN?HAb6_BQ>m!>Iz)l;Z?em(Dfk3tB{!r9tPl~`Kq
zv+AFG5=tqXWf_DJu=d@<%gf8wy;908gP!NDGw(3Qpx^J~M^E7U!*i)BIJf>u6GUW#
zAb=2J{aaBKTV@UkZqn=Z007hJ6vh~oJqG92KWM_0$)T5!F=oruCd=h={k_#{ZCxvh
zqSWRurN7sR%Q~<+KSfahz|jo5;KmrV+im#1k6*u+ST6nmFzYpCUZ$7S-!U^DkF5{_
zd7fiD9s^iq+nI5nkHT(U7>2mLy@fFbkB^Utq6kTn!1Fu|heHq%-rn9Y7!39%;?nwi
zO^ik(OGKDXr_j3kfA{_UJ-Xd4USD7F^z?)%iqPqF)`r}*ySuypQlDWMhG7_nVHk#C
z7=~e(%kvp+`7#`BjyfYvMXI*7;yAWp7$T12tLX2TX=0*of8JF<li7qa`bR6^pNYEK
zkW$)qyA2@(h{#TUhNbUyEqNk>Yto)W|Kt&<+nxrR&j(~#R(tbh^^eX60KjB2sU`kd
z^8s~fJRji5^ZaV_0XH`{&|1S7!}9?=AF!c6pU-#J@q9o{eVz~a7=-5oaQ*)LCH4OT
X;A_732aJWE00000NkvXXu0mjf?{!$I

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_restcollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_restcollar.png
deleted file mode 100644
index d065e3f898e414c4e5bb46ce1bd69ce38033ee3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJ5LwKkcv5PFCFA$FyLTu^!%S2
z(SG-a+oi@k&pA$<i*^xH2C8C6Si5R<kL-8ZdQQ<jth?5}Hl3N=`qW;b;=vD2v5UD=
Qqd;mrUHx3vIVCg!0O^S*a{vGU

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_resttag.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_resttag.png
deleted file mode 100644
index 30c0a77e38a240c054b0858de4110e3c63672c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzHBT4Ekcv5PPdYL(C<rhwh`gU5
rW^h5LfVV}T6Da+mdES?IS6|BY{b5xy_L$!d6k_mn^>bP0l+XkKC&U`q

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cat_sit.png b/Resources/Textures/Mobs/Pets/cat.rsi/cat_sit.png
deleted file mode 100644
index 36f980d37cb1d9dfb55158da3f2b48a1ecf9d284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800073Nkl<Zc%1E(
zO=}ZD7{`CJn}&v9lil<sX}6g}O%aO_`vrRGy@CqX4^ZgQ7kcqtP|$n{4}vZ96Daur
zg-{Ws$)&B@HoHkwd?{`><6)bH+9XY2#Y_IT*_nBM|7V|PW?-O!1{!Fff&PIk%ToUh
zK0Q6Hj$W>-UX5sB!n4_|5-4IrI+kUr;*<NA?h#=dNG6li>vc5E&uxEyzbhjW7F<fH
znoZC&4bwCbLPH3FQbHXZ>~%B|Y6+6b5kIINK?p(VR*6)~U}`ecu@}NMFcLpE&Tr)b
z*nDui<DO7^KuW0$!wAMV=B@$o=53KrpAXxzLhFHcdiVYVcJ;U;9QynN3kwShpja$k
z*e9h_u~-b(bvgO<6EihRz2<a<Lmxe`va+I9S692P86F-c9*=WnB*E8jKQ4v$WuT?3
zmAUXuN~sLf1R>CLooF=5v#0Al#p~OE`}?##9B6tTD8<ao4C!>br+7Uz;k~<eR6d_)
zYjcBFuQvq1)MQ3QhN2`A34f7ND5dZ`k8-(;ZQJ1)IIP-KDisc^eo!f;GS9L;V+X3&
z91JtX!$*&MGSE{A8jS|q+uKyiyG%`Hg0t>lwF=KW#q+#iz2i7spSu~J0f0(*7c(`=
z_(U4d^Qayl;ks@BZZy77uQ>oLFE4ZQ-3iaY&d!cVjgBFNf2typ2+v;>SX^ABRSMNS
zWo&$ctGQX0mX_E%_!yo6fSTjizm>7B>*R7dfZ)O@l}ZA@wr$qd)`E+xoBDnWS})tx
p+$;d|^Yau6g>!LQ;C6F=>ksAp)y=mXoX7wG002ovPDHLkV1h_OD_Z~n

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/catcollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/catcollar.png
deleted file mode 100644
index c420a6bdbb5cd1c7a18bee52f36ce7c043461327..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=nVv3=Ar*7p-rUH0K!JzF;r)L0
z;tG?XixZY~DJZ=2()xcoqz|Z!p`kYAT1SV*(tkE5Q)Ye@`}LBSEwg@o`4z5jsxqQ-
zAQcP@eBa6pWD{>%Kj{&g#(Td<rr_DMTBAiRxrdk;avm||%+~tO6J31*q|(#X&t;uc
GLK6UE(>Q(r

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/cattag.png b/Resources/Textures/Mobs/Pets/cat.rsi/cattag.png
deleted file mode 100644
index 449b89638d71737ec2bfec1d8e6ec53a623f8eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=L7py-Ar*7p-rUIBV8G+*IQyfq
z_$j7D`QVEIfh??@yBX*G$#w^-0|Fa^sIadqE^Z3Dzv;~S<IE7jkp4{n%QM&Re!KR=
f#^>tM3=GqSz1oFlJXQSn5~RS>)z4*}Q$iB}<1j89

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadcollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadcollar.png
deleted file mode 100644
index b45fc5ccede74f4428204b0c09e31ffe7d51e462..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz3r`ovkcv5PFCOG%P~c%c@aSK*
zMf>d%-nk1GaTI;`=TKo{U}#w1W4L-^S@QASj5FO|fBO=*@8L?;z-?^Pf3FB)0h+<!
M>FVdQ&MBb@039$U6951J

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadtag.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_deadtag.png
deleted file mode 100644
index 2851bfd41eaab9500dadb6bfbad692e96e0bd976..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzbx#+^kcv5PPZ<g_C<ribNRm&K
sa0uA=!Fc)^PoQ*z{MRMr>;2v_KjdLm`eXdl5h%vs>FVdQ&MBb@06Q=m)&Kwi

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_rest.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_rest.png
deleted file mode 100644
index 3d46e4f45d062a9a699c5588c3fbda89e75806f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 662
zcmV;H0%`q;P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0007ANkl<Zc%1Fp
zPe_w-9LMqZ{5Kk-Agqk0L=+Vs+S16xMTah7P<H7M?NsPUA_ya>gQw~eNC?kHQS=vs
z7DO9?1(Jao<+ejoLlYv0BBKaavMjzGWNX6IrEJ6czE016Jp4Z2=lAgJ^8JERN-3q3
zQc5YMlu}A5rPLxdR3ZRfO*Z-O@*66V@jDl!tH~xGj5B#J;BWFvve^vaNd5G0_kB$B
z-5-q?^QhOy3gC73y{rpQ5)lD#R{e>}RsO7-iHJC>Ohn_w09@R&7Jx5hqulMAd2eg2
zjjyZL0C4-s07v)Lux-;W>e_zrzQcn1rjMS`r#TBx7xWtvOPDEo_lo0}ujMp9<D!U2
zDB$69I83|OJL3=zxeib|(a(mnVF1=ye*w_m+zdc$Ai(<ig8=OO_7>Mr1?P5Du;o-o
z)(4O-`9^b<UzBMv6z~vBnAv;YYr0|>^bLOG>gi(u^bY=HYIPkWm+Szk!&zy!W3w&;
zAfA{4z%^9C341xWUOdA%%!2+4a-Bc#TM7CNaWu9tJ{Dyx_!!G@gwgmUyQ@nmo#+Q3
zGU){1`^L>!h9iWZKcKv(5v#crfY6)HdB5F4<!4n?&~FHUqp^ihz>`{!CCsVo<s(4=
z%C=Tx8IAzZ^Rfc~M{O$rb#0vsK7>N%E2WfDN-3q3Qc5YMlu}B~X-UrqB-_)A318Cl
z0il2=)gDjE=X?N6x5G}l-8s*nb+c~Yb;(D6J`)j<rw?xwZayGguKV+u1pS6=-|sf%
wBR}JOK)OQA2P7XpANe{TkZlq0Z_Wq&2DQ>NX{vtLJOBUy07*qoM6N<$f^xJqqyPW_

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_restcollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_restcollar.png
deleted file mode 100644
index b45fc5ccede74f4428204b0c09e31ffe7d51e462..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz3r`ovkcv5PFCOG%P~c%c@aSK*
zMf>d%-nk1GaTI;`=TKo{U}#w1W4L-^S@QASj5FO|fBO=*@8L?;z-?^Pf3FB)0h+<!
M>FVdQ&MBb@039$U6951J

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_resttag.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_resttag.png
deleted file mode 100644
index 2851bfd41eaab9500dadb6bfbad692e96e0bd976..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzbx#+^kcv5PPZ<g_C<ribNRm&K
sa0uA=!Fc)^PoQ*z{MRMr>;2v_KjdLm`eXdl5h%vs>FVdQ&MBb@06Q=m)&Kwi

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kitten_sit.png b/Resources/Textures/Mobs/Pets/cat.rsi/kitten_sit.png
deleted file mode 100644
index bcaf7b46b1b646c6138087c92ea090ab18be8871..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005+Nkl<Zc%1E(
zO=uHA7>1wCc5_MD7!gxxL#^5x&_mf`TT1li-=Szxj3N|l3oZ2E9x4c4M9_mhimdby
zPeMQx4*|6W@gz}61b+^-7!AZURIo*?plSR(=$2x7m_WqKKBr;6nfHCanSlWh4-XFy
z4-XHII?@)><-eN0yEQ2QF9%T$;;UDH=Ee%HdEnrr^1hk^h=@$zNmO;$7Sbi!(aon~
z9=~O?{P0};1Bi&s+`YMO&F#LYJwVj{hTpQ4uR$q5EP`y?*Z{zRV?)~C^=L;o6a9TW
zom)mOzUA`s5`N28k)}au)gLa|LsfH59D!$qB?!hY2Ira>@7zT0XF*A`rZ@2MtG+sp
zMUYqo@ddl^1-nS5X9&w1F6?RIvtA-Ll2FpDI?nY-4z$RkzrfXLo%f3sEjiF4Tl<c3
z>WTwE?(AM>H*~U8UZM5$c>;|lrfDi^D_ueSP?+-OBfxb+KYp77%qGS#7Sh~!^q8^U
z@6f)F5-6K12bjvhnZq!Aa-3Y=V5z)<wL>r#(g18fks$wIm{#CbWv8k)p!fzxr!tyr
z2GBEcjn~F*UNn!Ojb=16m*xH!p%lMeleuyLm$f0bSp5KGQ;vLia&L9McmHv+Dd*q)
q3G>B*%ohu?7Ppp7IpWq;^?m_Us<L+azoG{K0000<MNUMnLSTZRW&mse

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittencollar.png
deleted file mode 100644
index 09bf4c2526a47bcdcb03d29a14d0b97215fe5a9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|f<0XvLn`LH
zy}6O|fB_GS!~6a1&o5*Y&25NfQOYU4&dKtB)m15=x&xX@pA5gxn|wB!8^{9!hrQot
uzqxj1X@|~F{;;Pt-@*^R<!1+qTO47qystR_@;=K5kTOqKKbLh*2~7a%k2GHZ

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png b/Resources/Textures/Mobs/Pets/cat.rsi/kittentag.png
deleted file mode 100644
index b37123fb0061c562619df323fba20b3f0c97ee8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0zF+ELn`LH
zy}6OM!GOorarQ@J@l#BR@|S}HSy(m8nQeYv?*l4hXt?fndX=1M)U{X9({5JTfP@$r
rTtfOY^*7I4yZrI$52eraqd{WkS0#jIT)$xP7sT;&^>bP0l+XkKh3qgV

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/Mobs/Pets/cat.rsi/meta.json
index c7fac6f03a..b0ff5fcb09 100644
--- a/Resources/Textures/Mobs/Pets/cat.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/cat.rsi/meta.json
@@ -1,449 +1,71 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, syndicat created by Aleksh (discord)",
-  "states": [
-    {
-      "name": "cak",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, syndicat created by Aleksh (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "cak_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cak_rest",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cak_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cak-inhand-left",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cak-inhand-right",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cak-equipped-HELMET",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat2",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat2_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat2_rest",
-      "delays": [
-        [
-          0.1,
-          0.2,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "cat2_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_rest",
-      "delays": [
-        [
-          0.1,
-          0.2,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "cat_restcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_resttag",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cat_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "catcollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "cattag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_rest",
-      "delays": [
-        [
-          0.1,
-          0.2,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "kitten_restcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_resttag",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kitten_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kittencollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "kittentag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "spacecat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "spacecat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "spacecat_rest",
-      "delays": [
-        [
-          0.1,
-          0.2,
-          0.1,
-          0.2
-        ]
-      ]
-    },
-    {
-      "name": "spacecat_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "syndicat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
-    },
-    {
-      "name": "syndicat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "cak",
+            "directions": 4
+        },
+        {
+            "name": "cak_dead"
+        },
+        {
+            "name": "cak-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "cak-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "cak-equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "cat",
+            "directions": 4
+        },
+        {
+            "name": "cat2",
+            "directions": 4
+        },
+        {
+            "name": "cat2_dead"
+        },
+        {
+            "name": "cat2_rest"
+        },
+        {
+            "name": "cat2_sit"
+        },
+        {
+            "name": "cat_dead"
+        },
+        {
+            "name": "kitten",
+            "directions": 4
+        },
+        {
+            "name": "kitten_dead"
+        },
+        {
+            "name": "spacecat",
+            "directions": 4
+        },
+        {
+            "name": "spacecat_dead"
+        },
+        {
+            "name": "syndicat",
+            "directions": 4
+        },
+        {
+            "name": "syndicat_dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/spacecat_rest.png b/Resources/Textures/Mobs/Pets/cat.rsi/spacecat_rest.png
deleted file mode 100644
index 631f7937e60461ecf4944f7fe3c07b788ff0a349..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1266
zcmV<O1P%L%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000EJNkl<Zc%1E;
zZAcq;9LGO*r-{*ujj4@g8cSJc*0?COE;`uQ1FPCuX!oKHguNIH+>0Xkwqs!Do9;zd
zw>QdQ?8RW+*w(_zT&cB`b<nI2RB@?oH=h!sF=oYxddb~+d*LFf>x*_;gWLb}Di^r>
z{O<q6!S@FOfj}S-2m}IwKp+qZ1OmbT3h7Bc{MSkCht>Z*za#tLlXO0=|A`DhN<0*d
z0dVK~&rRj~UOWd-QR;Z;Ab7oA(`vPH?b@|9*Yr4kIVG>DsWI0oPRWOYF@}OM1DL&j
z;Y`#1r?&x2-nw+IX($*=_KnO(((mzly=H4`E4jJ38}66aQ=Y~waQD*bo|d^-ge|7Z
z#jm>GJyh-h7`-<#e(A@dsg)w^c01$a<18#JY`9-uZ}~f~S2cCMRo4Q{nSeFN#>eM=
zVaYJ~?1G;}{Lfik*FwNj>Yn@e?^9M*wl0(KxPEy(<&~9{=7|#@v1gBm<40<b+j4Ty
zb&VX0LQb|qc6Jv1-+q34F+LL?92_uGd)02YvwQdMHBZ97@n@yvwY9YXX09y<fZm_Z
zKhj~;*idgy1Vb2xfz#=vw6v5RJBkVXHiVW~K$0X3!(j5+DV&3LtcryH{F#oL*A50#
z&$xW~vJ{C#%#$Zi^64jC=0^In(&av%k7zUsfU9h$2{17}M&R}^ONLItR{M&$wB#wC
z^H$Q*(n2DU;Kq#`oIQIMzu(Wo!Xnlj8?q#$sVc^jhI7!4iAnMHBD@7MlMi_rRaH53
z_{|OVX8{Zk4@>Rs?WWV|WNd7V?(S|}E*EzDvM?A7(%;{Y&*#Htv*B{NP!t8L)ymx5
z9J8~tXqrYcnFL^FW(Hl?&{P%E)R83#=k{$FNsVwQ%*Y=J>YDaGFvG*c!%|mQm$}h?
zIlTZ?RZ%P6rnR+|-rioOr>7Yh7yuw1j}s1ui9{j{3=A+fHpb%OBB4--Kp?=#$OsOH
zgDY3ApePCerm3&IU^o;eG95)tB&dG*z=sukJj&|tflT<b(hK-KQN$~@+XV9RxOwv?
z9*>7WAb_f>jE;`ta5%Vk_by-p66J0;7K?>sGKt^sCmas5Yu7G<6B8tLlS^m5<fS)`
zFh4(!EX(YBwdn&uv24lP2`H<#KqmYTEJL^3Z5}&zjLFGKdU|>Q*lI7Nx_U1c`}%N~
zmopQc##dVhKxAr)(eZI&u^76pQ&LjG?XC6fD>k^(_XTZjZJauF3Q3Zv-G7*Di<RoS
z7bvgtO&_QzcCH?PO!)tC(pFVfnU$556c!fp&DW>N%C?Z7zvb^GWuhnwnx<1wP{3R~
zzP$G|4K0~qG0(;O?=@3YR75lyrK_upwzf9%^YiKK?4;+r3s@``ZuNandwcssPx(yy
z1p<LUAP@)y0)apv5C{Z<|2U#QApK&!GWt!|ACM|wJ!0}r*B_AjvCc91=IIZB<r!#h
zZszLMt7~3@o31|qGMmq5+AqU$K7aJ+Q93$0Xl$rA8yo5$xnHQUq2Ba(Jf_?2Hq-NY
zSz<Y#U(#7J3_{O@Ske+J`8;VWAd~(F!qH6R^O^Rq3_zyx`Aqxe^ddxmfanhp{Q()z
c=QrB_7c6*at4)D->;M1&07*qoM6N<$f+NszuK)l5

diff --git a/Resources/Textures/Mobs/Pets/cat.rsi/spacecat_sit.png b/Resources/Textures/Mobs/Pets/cat.rsi/spacecat_sit.png
deleted file mode 100644
index 09b93e9104f026087dcea7fb7e7a4eff78f65fc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 988
zcmV<210(#2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000A{Nkl<Zc%1E)
zPfXio7{@;?w6uf7!GJMWQV&8KqT?`JGzwj2^k9n228M}eh>77svc!`FOgs?91BSRt
zc2o|InLwk4QPu*HSwfqINIPO#XiEpI9e-ME>F?Lq!v;wijIzv=d~ffQ-}`*O@AG@!
z=ljAjj&Y1*9OD@OcPL(T!au{Qp}nySXH@n7xquzw*+2vU-}JcIP*Xb$@LKt)1BEEF
zNp3Qkgvn$Q&mx}<M3@akWMF-I<fi%kSBn9{p0Q!`Y#_2d8;FSgs&lA-kDD4rb8|DD
zot?C{wjL+~SO@Nn4P5(VGqOy9NHF@-_brzVrvMg`8_})X<Ibl<94a8ZvWmy!p`)V%
zi^W32M^`dLJURU)umEfdAWx&^+u=#lvdj-7cSvqT*Ci<x1X4$?fWzTXSgqFGURjGS
z@Ap{{*d80W)}_^GkfanEbq*R;4k}eH_MfkJ{j>3KV>=d)-yU~nG-_5oumiu}kHKKb
zh<$bSGxPY3>sJ9#C`cu@P^2Z&vP`ftNII1yFGs<h-*0xZPX%(bB@c&!#9}dgK3_)M
zJMF{>jQ#js7eb&^sYxXg$mtZP?-n8ul$Dln?j<DwNbk*?^(`=e*nrJu!{Kl!0II92
zh0$mfgM)*(>_comTtW4OTnGuJLc!_MVoFY)WGT4BFEf9mF349umw@H)5;~m@zuynQ
z*_Y3Vwzf6^CMPEuxiyN*K1B3E2qC21eM`Y5mRD9uB$J%K_`#Qe=3;GK#yrUC7v!q*
z(ChUe9$$dsl2Uqmd+F}(roX=*fRS6HSS%KdHFapUTH^6IN~MyTOXe?t9CbndE5M1T
za%Ur8ZEX!%mT7Ei!fv+<tJO+89w!!yVK5jN8hYH+EiEnd_4V=kTkoRLYB~4zd*1+O
z)dl${f&9Ivha-$)y<RWc+uM<48I#Gx#KZ)WBvDpYhR5T<=krltU(ej!95$PcL?XfG
zUt2l<&ZS{E*bj~*z+$n`*w{!Y6e5{SGBY#7@`ErnZ(Lx0ejc~mO+!Nii;Ii6-EO9)
zrVh=2Bs0?KbYfs&fQ5wxR##UE1OlYCx6zfCQ&?Dt%jH6nB)nd4R^)JmIk1ChG)f|o
z*j;;lUZRg4QB+jKjX)VEV)qGUNe<6p$HvMEv6V<tRePEHu3z!qn^#m-Rf)e!ukh)c
zdCdLs8$t-2PUj1MYwTjjo_l(FGK{INu1**$D}=GK;#sblfqwzQ8mawv1ZGeG0000<
KMNUMnLSTZ)r_pu*

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadcollar.png b/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadcollar.png
deleted file mode 100644
index 35edb287d90744b01e18b0bec968e3849c582383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4O<kcv5P&u!#oP~bV@V66T*
zwJ+zeR3fvMfX9zp{|_m6PFiw*>(g103_Xl{*Y7``DkfNJ{%ECu=dBc`kQ;n`7Cq5r
QKyw&8UHx3vIVCg!0I@wL*#H0l

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadtag.png b/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_deadtag.png
deleted file mode 100644
index dbc4b6c1e4ba3c1bb1d88e238a35d39fb7e6eae6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcv5P&l(CcDDW_BY^slx
z;reh{D?yj%<gdf-3=AJu-<c>ozmhw>x6hv8y=bvNOG5Uhij_dE44$rjF6*2UngCns
B9{T_Q

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_rest.png b/Resources/Textures/Mobs/Pets/corgi.rsi/corgi_rest.png
deleted file mode 100644
index 8fa2495489e88393ed28ce81fe057d72ca8f4c87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 816
zcmV-01JC@4P)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000dP)t-s|NsBP
zX%n+q1@f+8<Bu@Wcpowp5sOkG^78V`%*>LKl(4U?*Voq$zJ}od0004WQchC<K<3zH
z0001SdQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRL
zOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DLKC=Ju|*Eue3NdMTv_uC9|j)q?d~`ttc@!
z6~s2=QdV&Fa{-$U04G}=6-{8EumAu8I!Q!9R7i>Kl)aAAKoG|_TbhPgISQ)8u_cu2
z5_7WX;>?~bQN`NOP$DAe5f6Zkw9a)%Alp^$Xc9vaoj^kI8}L+&FaFrgStp>rspdcX
z+nw3f&Jc2M|6m=1(7_#=P`huA@6d#DpZl@~pSvmmpaKk3;1Qhb%7%q<BBAG#GkFJH
z08;^Y|4sppQWEMc-zc{LII1CyR-a@&?{<|Fv?$xIWS}>(<)X<jN|K=8XbV#?NfT2f
zaVP~$1VGXhgb<-CX;7>D3&4qETLO3i_%h%nv9zOe1I#6Wdy$ZKm<$%2NmW|rEDFG?
z118`RTm~$*`p9Hp4pSKz=m@yoI$*)b7@5*bQT=K9dEC4$Wv6*=N!Q$@@r6j^b)_#C
zkMsS>yw+r&<@<b}?J9k3=-HKS?8v?SpVbpVZ(pZ%Zw>pcz_9*O*0>cgs}DiDZreJ3
z<uY!nT~%2J*sIZ!kmc1GhleeI1+&-Q7ed~KFKl%<l-9#maInQU0XoyR5+?RctZ@_w
zdp2n)0y7Aa7T#8f+d1d}Tg6G%g|8);gz3r|w3ry+r3bYQZ+f?XybiN+3T<pSA`a^S
z6;R5$j>9;(4b)e`fimYfouw2gPns!(85q7lc<Y1KLIhlC*nY*LELeb30Rajhi+)xD
z-!b2S_uxZS)DxI89fQ9cfa!+m)z_k-YZNb60pB=0zb2N`0D(_Ve*oK;TKmbJ3-X|u
u4_dS%zXJBM4j6+xBU;`7=w`WY6#gH2OtGY{_%t{G0000<MNUMnLSTXn_inBL

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/corgicollar.png b/Resources/Textures/Mobs/Pets/corgi.rsi/corgicollar.png
deleted file mode 100644
index bed3c3731e43a2e0722d259a7b6ba57ec9e2af9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EuJopAr*7p-a5;9*no#EKy*{Y
zvlBHl58uw<{T>kI#q`tAF!yD(xOC1R&vZ*BpoWJ3MZZfJ&w8y~U;8Y1?y}2&d6qjH
zZ*T6qlle8r$~Z~p`uqL!<<I167fD_b-~p-!f&=F@mmagZ{<r)7^zyeFyPwb4bNTk)
jw4dQ3Z|*ZPFnlRuZ_sy0JdtC60;Jf})z4*}Q$iB}8j(vq

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/corgitag.png b/Resources/Textures/Mobs/Pets/corgi.rsi/corgitag.png
deleted file mode 100644
index 461d87f0076f7fc63ccb35b478224b25f9041169..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC={+=$5Ar*7p-rUH`pvc2~V1r%r
zMh51m;S94B{;lgzSzgKlRK#$g?PhdXx`uJ}X_<-p>zztL27o|b!6pU!tya%F-WsW!
cGcas;$J{R_R=qxr^#@4S)78&qol`;+0OWZn#sB~S

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
index 08a4c74f60..92d0231090 100644
--- a/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/corgi.rsi/meta.json
@@ -1,20 +1,16 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd.",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b , cerberus by Alekshhh, real mouse by TheShuEd.",
     "states": [
         {
             "name": "corgi",
             "directions": 4
         },
-        {
-            "name": "corgi_rest",
-            "directions": 4
-        },
         {
             "name": "corgi_dead"
         },
@@ -25,12 +21,6 @@
         {
             "name": "ian_dead"
         },
-        {
-            "name": "corgi_deadcollar"
-        },
-        {
-            "name": "corgi_deadtag"
-        },
         {
             "name": "ian_shaved",
             "directions": 4
@@ -38,14 +28,6 @@
         {
             "name": "ian_shaved_dead"
         },
-        {
-            "name": "corgicollar",
-            "directions": 4
-        },
-        {
-            "name": "corgitag",
-            "directions": 4
-        },
         {
             "name": "lisa",
             "directions": 4
@@ -125,12 +107,6 @@
         {
             "name": "puppy_dead"
         },
-        {
-            "name": "puppy_deadcollar"
-        },
-        {
-            "name": "puppy_deadtag"
-        },
         {
             "name": "puppy_shaved",
             "directions": 4
@@ -138,14 +114,6 @@
         {
             "name": "puppy_shaved_dead"
         },
-        {
-            "name": "puppycollar",
-            "directions": 4
-        },
-        {
-            "name": "puppytag",
-            "directions": 4
-        },
         {
             "name": "real_mouse",
             "directions": 4
diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadcollar.png b/Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadcollar.png
deleted file mode 100644
index 452dd52f85abc95c13cd2c261c37686a27a62747..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~NskO=p;*8({i6nI=OZlCik
zx^L^ownYgHsRk|C4V9Mh=R^Li`B5*}z`(?z03_yfxb*Cmu9_a@-Mi0zTau9TJLYpO
qMe>qT?-@O#`xsaR92gpl8aeIH@+y}6?4Jy@gTd3)&t;ucLK6TDS}s%o

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadtag.png b/Resources/Textures/Mobs/Pets/corgi.rsi/puppy_deadtag.png
deleted file mode 100644
index 3862cae5f64bae4d27f2b9bdb3389688ed5ef4c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5KkA!kO=qW6p4fb76-l=_gE#E
zu(&xRh=v4?KlaBy%)i)GwpGoMJ?34~pY_q-<}a`+x-DvAJR^d=7gYzF4GY7Bd+ds$
TEUTG;<}-M@`njxgN@xNAs)i|O

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/puppycollar.png b/Resources/Textures/Mobs/Pets/corgi.rsi/puppycollar.png
deleted file mode 100644
index 4683a1f9f5762e162a2da99830323570345782d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBufiR<}hF1enFxS(?F{C2y?JaMv1_cq;3)ih;<6jq;=Pu@G
zQCKx`{-R>FF1~g7HM|TA4feB6{j#-OpDMmlM^LkLR_eU|2b-7gj{0_RebKvfvn|?7
zdD(#m0ztwA!LuJ;-+B=z`t$YbA7T7o*cpMME0mI$ttXj;$weiu1F7<K^>bP0l+XkK
D=k7)`

diff --git a/Resources/Textures/Mobs/Pets/corgi.rsi/puppytag.png b/Resources/Textures/Mobs/Pets/corgi.rsi/puppytag.png
deleted file mode 100644
index 1a74928939c24fea2d5fceab62cd94bc75b350b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!C+4p$B>G+x3>;*HW&!F9_;-)U3KMwIw2lQ
z_A6f%&K*d<DHjJ+#xQ-0)Z05X_L;N4PfONM28jT{hv1oa56tF0wAd~|b+hyZ1)z|_
aq7FWJFTu*3KYzY}lz6)OxvX<aXaWFR&O3qt

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/fox_deadcollar.png b/Resources/Textures/Mobs/Pets/fox.rsi/fox_deadcollar.png
deleted file mode 100644
index 258e2b5f06d2f9f23c1625891af985a01829383e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5P&pYxmDDbcx{QUm0
z&4fCwwGs^TS|`Y|?iK>7;WKi(n>XRjq`Tsi46`cl$!_}U!ou(;g{h}s<e!$oj4MDT
N44$rjF6*2Ung9|YBs~BC

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/fox_deadtag.png b/Resources/Textures/Mobs/Pets/fox.rsi/fox_deadtag.png
deleted file mode 100644
index 46b597f4dd2d672dba2cd03dc8253b550f573aa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 123
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCr=m0kcv6U2@<S}6GVEN0u8v_
z4r)lSRvh>jYyFRZ#?$G$CI0`nKju)(zF`6Pftt0ipB?nbKJ5-t1Ju9+G<-Wdk5hiB
R#CD)*44$rjF6*2UngC0_CfNW0

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/foxcollar.png b/Resources/Textures/Mobs/Pets/fox.rsi/foxcollar.png
deleted file mode 100644
index 83a226ba7c8e5b33c94bb9c82a0fb475229138d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=5uPrNAr*7p-r6YG;K0G+@auiE
zl?HEcbG`6=$*<*?y&I-<1646FH0)f}w@NN;rtHkeZ_3ZL-^eNi3o|g3nZM>;^W~TM
opU}ofedkLB!g&8&ab#>@zBOIz`y=ZQ7eUHAUHx3vIVCg!0L`p3_W%F@

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/foxtag.png b/Resources/Textures/Mobs/Pets/fox.rsi/foxtag.png
deleted file mode 100644
index 86254d3959663bb0b2b67af5bac5f3bad1f1bedb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=A)YRdAr*7p-rUIBV8FxT(Eia_
z{1j87yfKp?$IcV6|3AHsb_Xg0g4JpHk#`rKd81qGl4tK!$_^1_(3qwixBvY9lyKR4
g`5ouNCb2f8o9E?=eBF3DT^Xdr)78&qol`;+0Kn`kV*mgE

diff --git a/Resources/Textures/Mobs/Pets/fox.rsi/meta.json b/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
index 5758a5f850..f4f95700cd 100644
--- a/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
+++ b/Resources/Textures/Mobs/Pets/fox.rsi/meta.json
@@ -1,62 +1,48 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
-  "states": [
-    {
-      "name": "fox",
-      "directions": 4
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "fox-moving",
-      "directions": 4,
-      "delays": [
-	    [
-	      0.2,
-		  0.2,
-		  0.2,
-		  0.2
-	    ],
-	    [
-	      0.2,
-		  0.2,
-		  0.2,
-		  0.2
-	    ],      
-		[
-	      0.2,
-		  0.2,
-		  0.2,
-		  0.2
-	    ],
-	    [
-	      0.2,
-		  0.2,
-		  0.2,
-		  0.2
-	    ]
-	  ]
-    },
-    {
-      "name": "fox_dead"
-    },
-    {
-      "name": "fox_deadcollar"
-    },
-    {
-      "name": "fox_deadtag"
-    },
-    {
-      "name": "foxcollar",
-      "directions": 4
-    },
-    {
-      "name": "foxtag",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "fox",
+            "directions": 4
+        },
+        {
+            "name": "fox-moving",
+            "directions": 4,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ],
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "fox_dead"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png
deleted file mode 100644
index 64e7a30d49f2bb604e4d85d41e7eb2748b1fec65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 253
zcmV<Z00RGsP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002QNkl<Zc%1E&
zJqrRc42Itm1#faaZV;qvr>ysvT$}|(|A4=$>rIE?(A}YM;F7U!xA;M#f(m)oyltN(
zP{1$@<KJ1Xi~LoAx~|_67=22_1YV`k9`N2j+<Dh^>ifpp$B764Fr8fPMY2{xCBV!8
zfVOS1n9s1=tcKcle;Dc-#J1l1%*<$-1_02fc#}Dv&M3=LwF=P$oO79o5JEr*;c1qL
zz|1+uD3TDbAf<$=szf;r;!!#0#6O<2d&4jc<0rTRFnc}Xf&cF|00000NkvXXu0mjf
DF-dVk

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index 784e509c1d..7aa33b0489 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,99 +1,85 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "beacon",
-      "delays": [
-        [
-          1.8,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "beacon_dead"
-    },
-    {
-      "name": "signaller"
-    },
-    {
-      "name": "signaller-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "signaller-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "radio"
-    },
-    {
-      "name": "radio-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "radio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie"
-    },
-    {
-      "name": "walkietalkie-on"
-    },
-    {
-      "name": "walkietalkie-off"
-    },
-    {
-      "name": "walkietalkie-active"
-    },
-    {
-      "name": "walkietalkie-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "off-walkietalkie-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "off-walkietalkie-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "old-radio"
-    },
-    {
-      "name": "old-radio-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "old-radio-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "old-radio-syndicat"
-    },
-    {
-      "name": "old-radio-urist"
-    },
-    {
-      "name": "old-radio-nukeop"
-    },
-    {
-      "name": "old-radio-ancestor"
-    },
-    {
-      "name": "old-radio-borg-assault"
-    }
-  ]
+    "states": [
+        {
+            "name": "beacon",
+            "delays": [
+                [
+                    1.8,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "signaller"
+        },
+        {
+            "name": "signaller-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "signaller-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "walkietalkie"
+        },
+        {
+            "name": "walkietalkie-on"
+        },
+        {
+            "name": "walkietalkie-off"
+        },
+        {
+            "name": "walkietalkie-active"
+        },
+        {
+            "name": "walkietalkie-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "walkietalkie-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "off-walkietalkie-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "off-walkietalkie-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "old-radio"
+        },
+        {
+            "name": "old-radio-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "old-radio-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "old-radio-syndicat"
+        },
+        {
+            "name": "old-radio-urist"
+        },
+        {
+            "name": "old-radio-nukeop"
+        },
+        {
+            "name": "old-radio-ancestor"
+        },
+        {
+            "name": "old-radio-borg-assault"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png
deleted file mode 100644
index ddd9d320f9dea2333626c80bd1963fb726f77038..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=|2$nBLn`LHy=BP7WGLWp@#HJP
zH@P~j+izWB&PdG7R{hA(#QssGiksVCscFMhgH7`iRFh9^_<wL)q|r<j14%}p5ey2x
zJ%MYTR;=2)FJ$V|S=)27En~zEep3IO{55vc%Wadg|N2Soe*da%f*I>&o)>ESYTiB#
z(${JKy4bQm<ja!Rzbz_@ciAvoef;3#_kWHL^M@TPbHY|XQvYkdId<t}wHYz3JGVJ(
zT>0vg*oTY{VEcepvK`x^^~Zar)z(?rsUKVeuQP6V;a(ui&|SxJJ-xxzzUeiO#ya_h
z@0*t$UA#=<tMZQhtU<p8W7rq$sB5_sePEM3$ed;+CHb8J4}M48{i_A?hNr8a%Q~lo
FCIF4ggU<i}

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png
deleted file mode 100644
index fc5fdee22a317165e292d6dafffaf9aa41bf236d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==R92;Ln`LHy=BOC$Ux-S$LqJ0
zckJGAd*x#G70sJhPhMjF!qKLoTl_+F$p@}DhZZL_!$*3PwoREd{eM26%AT5(lj=Z2
z7#RMf_Y~f8n^G2;vsU)Kitx#rZFlb&mD}%MI&tzY#tPL3lh&u)l}p+9T13KjAE!Y0
z?nf5gpLusYTYn_v{6~Ld#`iw?r-S5rcQO2!E#4XZ?s5mjRFKJw#H-R1K9uLbn9I1n
z?tp%j74u$Uhja(e^abC)X1?U%Ii)|B(TW+UkYjR34a33Rw%d2QxAlW`db;|#taD0e
F0s#MxX(a#v

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png
deleted file mode 100644
index eb57264b858e705554298b886911a667fa507548..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmV+z0_XjSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$(n&-?R9J=WR=rOGF&uqYhzcwOS#DyGgaL5i%Y@zK28oM_D}$qn6N`(6zraD`
zVjPW&VPSDq5(z;J#KZ_L4wZmNBoZZrI^gl)SFQyyQQp#P@7MQxef{0Fz!+ov1vs5f
zCOVf4LxA7!7oIy50Y;;7^a6Tquh;9s0`wx2ToJ;2ML&wBOJ;USKnt)2Bvwu`iI<Dp
zfxxzoEkwNlfR$4pmUg?()_}xaj9iLc5yEWC1Xo+FzVT{~!R(UYSZ%+{@3l1Za&3Xp
zCUp|p$sA-^hAhiSlQi<VGXOxV$-_865vs{4rSNz>qBML0Dyi-ktI5??6gsVe3|^+c
z*CSzj#6yOmd|gMQ(Ez0slu|rRlrT9h;rR}zoU;wByqX=z&Q$yQ7K;T2g8{W#O)JHx
z5c&@Qz~XTf2h9vj0H!V~D6VY+;4ebW0%i*Z$sQ)m5hS?TZ;vHS#r8uGu)f6+&Lwe$
zTYTNm`)Gb0)|ZnHF+b+Odnk$m_pQ6rKTPci@eFhth7_f*t)v+D76=RQxZQ}w;|M7V
zV)3{rjkthxHrq+AIxtcJUpY|C@g0cV0!oQ?f?so>_dHNnK1dC4-(c)v!oIUv<W@As
a|HdoZyQceyyn-zN0000<MNUMnLSTYg9O-%h

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/borg_label.png
deleted file mode 100644
index 2b56e167730682294aca3f6c0465c838176a3bfb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}{+=$5ArY-_
zFBtMQ81Oh>>|nl~ezNm$2<NVg3%Hj27t0TO#KFMu&m+il)v8@jy{=!hJW`gDcH`X@
v8}ohh)|PA)-|@_Beni5*s^366_dI2(jdSNawTx*y&}arvS3j3^P6<r_j&(LZ

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/ce_label.png
deleted file mode 100644
index 3ff9d8be0f7f5a8edcbb22d317fde9937d2566aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGze$;N*CV+(q^76jv*18NeL3Hixmx|m|%p6vx8Ob%X*1_{454$cmFVL7Pwh7;YNcM
z!xM=j8K6Ff|NkE*ynY5`Sc6PRPEcU>Sg!xKpU)vFMZ$HSSjuTfvBL(H%O)=5e#S84
psKG3r#co@B+74uJz=#9w3=F;pQq5=fNxTLb=;`X`vd$@?2>_TPQoaBH

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/cmo_label.png
deleted file mode 100644
index fcdee41c3c53d701a8bc9128cfd4ebb38cc6770b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGzg~~ui{St(#D=Hjv*18NeL3Hixmx|m|%p6vx8Ob%X)z}Mv3`(b&Zi0349HaJ${pg
z!3O^SANB925>UGZNPBXE0`s5aj3*4bY;-TZ^#0#$z;ocolbLR9dNW#?pD`HSv00UB
i!s6zf03{0A7#Pm4ED}5x*slyUgTd3)&t;ucLK6U_GE4;k

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png
deleted file mode 100644
index 638d7509a0a48b886f00a923ca131d9c21415528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}pFLe1Ln2y}
z6C_v{Cy4YkF|zfjtoS=W{b+0W!6nJ}JxnK?u<v=XRbhq4q8}`t&o)hXz`zCsZL81k
zdo;EFV)j9Wz?w()ntcjle}KG?^BWr(_3uTm;Z7E2?ci&)(bi)tTpiC-85YB{@7Se?
zt2uVRMb?SUl3Ve-!Snb&!(H<qtDZ`q+*hk?^<!p7=#2EEU+@1o?!V}2&|StYOpEyx
zcFH6qI4t?bSbV_v^UR2&OZ}EzzQ+hupS)q}j-JrGvm5hy{!KF}V_0Hm(Gq(}DkwZh
z<)F<Zp@&z~<0aSG{XV6T_qF?>4!boQ?__zf2bq9DVw4sfrxtcn5a@jdPgg&ebxsLQ
E03ptPOaK4?

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/hop_label.png
deleted file mode 100644
index 9fc60cb3dc57c90f728331a83f45b723802e5510..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGzce~96wzNr1d>r977^FlM*CY7b_Y_F~JBCX9ug=m-PZ|j1u$n>KwPp+!S=a1o9Wd
z|Nm<D%G-eqE0EUY1O;Y~<@$g7`5cl`BwXi-O-Mb_*YNSAaW7Boi+$}MPa0%}oX+6r
gX*&QVcxr&o`*Nvt@8gIgsvz?`UHx3vIVCg!0M3L@K>z>%

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/hos_label.png
deleted file mode 100644
index c8f7f68ee4e1608730f74b25d860ae9597bfd9a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGzjP07Pf=DXYJ|Y7!tvmlpw*nSkXX=2}X!GJ6P4etQTOocp_)lPu4We8=?VBDsJZN
z2Xx%{7$-<r@&Pq7{QtlEgRvu!VFfZKIYEK>&vC{R23<C~2EUhHp8k(LQ9|LoiBXAS
rG}mSs6}Ps)#Zhj~2_`Hs;(;>*L!)wKre;|bH^@9sS3j3^P6<r_8<b1J

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
index 62e47be4ba..7e16547120 100644
--- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json
@@ -1,41 +1,74 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {"name": "crypt_gray"},
-    {"name": "crypt_rusted"},
-    {"name": "crypt_gold"},
-    {"name": "crypt_orange"},
-    {"name": "crypt_silver"},
-    {"name": "crypt_red"},
-    {"name": "crypt_blue"},
-    {"name": "common_label"},
-    {"name": "cap_label"},
-    {"name": "cargo_label"},
-    {"name": "ce_label"},
-    {"name": "cmo_label"},
-    {"name": "com_label"},
-    {"name": "eng_label"},
-    {"name": "hop_label"},
-    {"name": "hos_label"},
-    {"name": "medsci_label"},
-    {"name": "med_label"},
-    {"name": "miner_label"},
-    {"name": "nano_label"},
-    {"name": "pirate_label"},
-    {"name": "qm_label"},
-    {"name": "rd_label"},
-    {"name": "robotics_label"},
-    {"name": "sci_label"},
-    {"name": "sec_label"},
-    {"name": "service_label"},
-    {"name": "synd_label"},
-    {"name": "borg_label"},
-    {"name": "ai_label"}
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by DSC@300074782328750080 for Space Station 14, crypt states modified by Flareguy for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "crypt_gray"
+        },
+        {
+            "name": "crypt_rusted"
+        },
+        {
+            "name": "crypt_gold"
+        },
+        {
+            "name": "crypt_silver"
+        },
+        {
+            "name": "crypt_red"
+        },
+        {
+            "name": "crypt_blue"
+        },
+        {
+            "name": "common_label"
+        },
+        {
+            "name": "cap_label"
+        },
+        {
+            "name": "cargo_label"
+        },
+        {
+            "name": "com_label"
+        },
+        {
+            "name": "eng_label"
+        },
+        {
+            "name": "medsci_label"
+        },
+        {
+            "name": "med_label"
+        },
+        {
+            "name": "nano_label"
+        },
+        {
+            "name": "pirate_label"
+        },
+        {
+            "name": "robotics_label"
+        },
+        {
+            "name": "sci_label"
+        },
+        {
+            "name": "sec_label"
+        },
+        {
+            "name": "service_label"
+        },
+        {
+            "name": "synd_label"
+        },
+        {
+            "name": "ai_label"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/miner_label.png
deleted file mode 100644
index f997527fd450ae8935aaa7edceccfc39fbbbf8d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGze!~$vArhX>(5($B+olqy!1p#fk<}OfW*kIU#xW>G~9gN6iLz|1fP9aBG$^PT*^Z
z<Xd!-6XZXJ|Nohf{q+JetU*R3CnzxI<P`tpKcvubM(wc1r!5Pj`5sSBmy+Byp_Y%E
oQNXt?aB-BIbAkyAjCkP8zz{hhbAQuKEq#!Ip00i_>zopr0F=B<GXMYp

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/qm_label.png
deleted file mode 100644
index b2d9a59d1d2a67f6160027f0c89498c957b62a7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGzcd-ANc(qNb7mJIEF-UCM8I)E><*<VuBGO&JI?!FY9w=<kdAs{*&iQ_@fB&F9XB>
z|F71Yt_3nIKsu8X6qr4h>;LWNot!9A8Ral-G4lk8%4HK5a?gJM@)d*89h+6DCM<5w
d2~eV-je)_kC5AJ<%_$6Iny0Iu%Q~loCID&pOPBxv

diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/rd_label.png
deleted file mode 100644
index ef2819077c538bf37dbd46e0a8f2aefe810c3739..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 386
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P;
zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x
z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V
zGze#25mHJA(x#p+jv*18NeL3Hixmx|m|%p6vx8Ob%X$HZizjk+{baqFl+u3TD&q;U
z!#AE-0JSmv{~xXO$R5bB0vV8;pup_0T>mdWlY-Pt-?qRfnU32eZYn;R>DH!~60f}Z
nq(N55=?spZwgXUtrv~WAAo1ixzP-vfK<0V6`njxgN@xNA{83NG

diff --git a/Resources/Textures/Objects/Devices/gates.rsi/meta.json b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
index eb5ae78a62..0a09c42c58 100644
--- a/Resources/Textures/Objects/Devices/gates.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/gates.rsi/meta.json
@@ -1,59 +1,56 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14. 2025, added random_gate.png by borsh.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "or.png originally created by Kevin Zheng, 2022. All are modified by deltanedas (github) for SS14, 2024. Sprites logic_a logic_b logic_o were made by 0tito (github) for SS14. 2025, added random_gate.png by borsh.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "logic"
-    },
-    {
-       "name":  "logic_o"
-    },
-    {
-       "name":  "logic_b"
-    },
-    {
-      "name":  "logic_a"
-    },
-    {
-      "name": "or"
-    },
-    {
-      "name": "and"
-    },
-    {
-      "name": "xor"
-    },
-    {
-      "name": "nor"
-    },
-    {
-      "name": "nand"
-    },
-    {
-      "name": "xnor"
-    },
-    {
-      "name": "edge_detector"
-    },
-    {
-      "name": "or_icon"
-    },
-    {
-      "name": "power_sensor"
-    },
-    {
-      "name": "memory_cell"
-    },
-    {
-      "name": "random_gate"
-    }
-  ]
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "logic"
+        },
+        {
+            "name": "logic_o"
+        },
+        {
+            "name": "logic_b"
+        },
+        {
+            "name": "logic_a"
+        },
+        {
+            "name": "or"
+        },
+        {
+            "name": "and"
+        },
+        {
+            "name": "xor"
+        },
+        {
+            "name": "nor"
+        },
+        {
+            "name": "nand"
+        },
+        {
+            "name": "xnor"
+        },
+        {
+            "name": "edge_detector"
+        },
+        {
+            "name": "power_sensor"
+        },
+        {
+            "name": "memory_cell"
+        },
+        {
+            "name": "random_gate"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/gates.rsi/or_icon.png b/Resources/Textures/Objects/Devices/gates.rsi/or_icon.png
deleted file mode 100644
index b81b390cacbf6221d5a7f3199f54a5f68d17193e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7600
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
R@P8dHJtZ@_ZrZ}i{{aoi>RkW;

diff --git a/Resources/Textures/Objects/Devices/health_analyzer.rsi/malnutrition.png b/Resources/Textures/Objects/Devices/health_analyzer.rsi/malnutrition.png
deleted file mode 100644
index edcfb6119b6429da582dea33e864e66d388dda78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1295
zcmV+q1@QWbP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px($w@>(R9J=WmR)R9Wf;eQ1=4j}%ewB9HEIamV8O;631vf82pO2nfq*oI#CV}Z
z5-+$h#>5yHW*2@&FN_)zB8d^BLl&6Xg$$)dw&e_Smd!-l)j*-!!EWm|dit?$<9Jba
zvVM#VZ%oYoH|M-hp7;6x-~V%-_JtL!U<Lm%bpLi^TT7jq8GGl)fk&>lX7NH4Mb+VO
z=rW(Vh>yRxj{K%3;@#aSQ`4~34xrwi&~ds~$|)pQy*0TKmqJ@ho%+hN1(Y3rfp~W}
z@$PN_jOHSg{vlkB*$0_|nkgb24y$grJFDiZ#fz${s+`Zo<VJImMr>+6m{riUcLy~k
zGrZOyXe|nd!>Zr!&v~d-Iine9YpGLRj#)|$JclwhO@31o0FkZ^l&R^(Eg<sKuK-yh
zY&KiY+G#B)C@3Ht4yy~QGm~$9buRUC{s%1<nVe3&JRt5AQ`<J~G}3cg*7BC+KxWdy
z`u2oQD-6I^JCVt0B9qgY_U-`SuGOmLDA6Rpb%k>hK2!ieEEdD>_Y;f7v{>_Y8@`D=
zIz^REQPpgQl;xeGN`FUCBj3_&VK6v@-ZZP_Evp3!qo>p97#$sDVPq~|@8$Vt8tCdt
zInpW404bZjZbc&o7!1xZcv|LuUYvZrL94y&kI><8=u}l@@w|TW{u~#t_p+~X6E$V?
z_$KmFj$D|<H<3q=H<BU_&Tv03&i%YN#YO{r8pd*xK2$&^rreck>nRhvpRDDA=Ni-M
zYMQs(Xxv;%boMSaW%Cr3sMOkuC@N7YHX0~48kkfPT<$Hy_l;SFWwsy_vMj4{V3%;5
ztI`06oQ+)YTq8I(MpdyHp{fjNbPS=Yj2poa0Ey%r0L4ZF@#Gw)-G2Z}w_r&DvMj67
zXcT~}(g3X|Beb5n!RB%cw(5=S+JB8uFu{HRZc`sjaHgY_e0{3qo`x~Lzic8JjdJJC
zoh1*M)&g0URaur*Ns@?0qbQ0(_xuNlM=ca>*h=fk2>TA-#6Rri!}m(5-r2|#Tb?Eq
zOz_!vX5z^?;>kH)Jva`);E@s(MZsdRAW0ITPzYI;)tmwrPJHRoC0s5SSFT(Epg#UO
zFK>AY-_KWRJ!PWv{CaHF8`)%C$4dup(0{RqGaaRDs3_H1@X^;s0P4=BMp;o5%FD|U
z1c7KYnkFL6fx^N<1VO;<b|VOa79W2@<d<zn5RY2;eA^8EVK0A<$Ou(se9>Oa=5h;v
z{XI@1Imh6U5<+ipz&G$%mfeyhQCL`*7Sq0g;o)KIc6-h~wX~h()4*HQl$tqoE`ssn
zdVUWC__qHRmFpkpCUEy=5tZxBI7`j=#-|ufm^jgXKCO-*2p9|ohK7c;SlVBv$Kz2A
z1_L7_BUr6g^m=_-fp=Z|061J<0DvzzPvw`p=?er{{iYXy$=EyqC)zu;eH9fI^!4=-
z3Wcbxt;OkdYP?w&2T>H&1p(F7)md%?0s&1(E}RhuvtnMa7g?6ETCF_Ng=A=G2)$lU
zGMUt3cDp?%$>Kc#YuBzNkw}nCCUH8Qx{i(xRg$Ev{44>IB;j(oXm4-l*s)_-4tYGD
zv@z1_^%xAP-~4;`?xoqg7@<&TNzqvlMKS9xu!8?B{sCp(GlJiT{uclM002ovPDHLk
FV1gU{Uh4n=

diff --git a/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json b/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json
index c9ae04fd79..223a5a63d0 100644
--- a/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/health_analyzer.rsi/meta.json
@@ -1,35 +1,32 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "airloss, brute, toxin and burn edited from /tg/station https://github.com/tgstation/tgstation/tree/master genetic edited from https://iconscout.com/free-icon/dna-2130814 with license CC BY 4.0. malnutrition from https://github.com/space-wizards/space-station-14/tree/73d7837fabb31a7691a1db47ff64903cbec5dd32/Resources/Textures/Interface/Alerts/hunger.rsi, metaphysical created by SlamBamActionman at https://github.com/space-wizards/space-station-14/pull/32755",
-  "states": [
-    {
-      "name": "airloss"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "airloss, brute, toxin and burn edited from /tg/station https://github.com/tgstation/tgstation/tree/master genetic edited from https://iconscout.com/free-icon/dna-2130814 with license CC BY 4.0. metaphysical created by SlamBamActionman at https://github.com/space-wizards/space-station-14/pull/32755",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "genetic"
-    },
-    {
-      "name": "brute"
-    },
-    {
-      "name": "toxin"
-    },
-    {
-      "name": "burn"
-    },
-    {
-      "name": "unknown"
-    },
-    {
-      "name": "malnutrition"
-    },
-    {
-      "name": "metaphysical"
-    }
-  ]
+    "states": [
+        {
+            "name": "airloss"
+        },
+        {
+            "name": "genetic"
+        },
+        {
+            "name": "brute"
+        },
+        {
+            "name": "toxin"
+        },
+        {
+            "name": "burn"
+        },
+        {
+            "name": "unknown"
+        },
+        {
+            "name": "metaphysical"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
index 5ba8a2d753..718610b736 100644
--- a/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/nuke.rsi/meta.json
@@ -1,60 +1,50 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "nuclearbomb_deployed"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/blob/835fd60545178a19064f5df9981dac6e1b220775/icons/obj/stationobjs.dmi, nukefestive by Alekshhh (Github), nuclearbomb_gay by PJB3005",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "nuclearbomb_deployed_unlit"
-    },
-    {
-      "name": "nuclearbomb_gay"
-    },
-    {
-      "name": "nukefestive",
-      "delays": [
-        [
-          0.25,
-          0.25
-        ]
-      ]
-    },
-    {
-      "name": "nuclearbomb_timing",
-      "delays": [
-        [
-          0.5,
-          0.5
-        ]
-      ]
-    },
-    {
-      "name": "nuclearbomb_exploding",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "nuclearbomb_base"
-    },
-    {
-      "name": "nuclearbombc",
-      "delays": [
-        [
-          1,
-          0.3,
-          0.3
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "nuclearbomb_deployed"
+        },
+        {
+            "name": "nuclearbomb_deployed_unlit"
+        },
+        {
+            "name": "nuclearbomb_gay"
+        },
+        {
+            "name": "nukefestive",
+            "delays": [
+                [
+                    0.25,
+                    0.25
+                ]
+            ]
+        },
+        {
+            "name": "nuclearbomb_timing",
+            "delays": [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "nuclearbomb_exploding",
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "nuclearbomb_base"
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png b/Resources/Textures/Objects/Devices/nuke.rsi/nuclearbombc.png
deleted file mode 100644
index ebeb77e2d29e0b4cfdce6708f2a3fcfdd3fee634..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1612
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
KMNUMnLSTX@H2rh{

diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full-unshaded.png
deleted file mode 100644
index 51a309d579ec0babdbdb117920c416e178e37599..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 777
zcmYk2dq`6O6vk(g4nv2%j4Ul*DZWTh!`IbqxvA+wd?bbTPz;7!*mS1LYZ6o-Dnw>Z
z(HLfA?UK5N6W@~9%<Eh<ahoFP)WLPM>!x>ZyWQy@dElJGIh^zH<9l^8i{b8e-i<^e
zxu-Gd*+lOmvX1OR)P@K5y-B2F^J(;yoT_$2BQH}YpFTdH)*O*dJ-am_<TamMpqsa+
z0|z}y?*#`07Wgy<C(Q{Tlb-nnZel-vHIcX>gbWdr`zBktjW<{^8itBWe&P~yV<e<r
z=6>146sa(nyVDz9T|4mJ2v5$fSYW`#yhm<q^$lm+x$JF0sK#epw84<Kj#}a`B~Ve1
zDodZYsXLbV2*ZT@F^u0#RuHl?po;N`w?{}utreO4i#hh+zJKX-xGARC&SosLIr1oA
zX&wXOws|9nV%kZhW60a^4CEqfys!{@(ar^@BKr@3D2LPsbzo+Rm7igko5GEJCFNFn
z2v93lk95CP$*=+zIc@^SsZ+f+#IWC8x$nOLqlRdlS!u&dk)GZ_+-S+ehV-rtL7=)!
zy6GB_Bem5j)`}u-SEwoHGVSYqxhltE6u&A%h%21;RBEN|D$igv^iW_x69vXPPQaqZ
zHs2#y4@I4Z@<f{b!zrbIwMBPDrfKUmJ#VF%Q3PRX1>H9wv*!?&zGcvg*%qut)xX9S
z>t1$sLdZ9NC58Es!%wye<Ry?y>(tNxDhSH3bNFM~7SL#Ta~aGBsJb0AQ^lC|r2;F9
z7;S4q*z(Spzw4apJ>1FJu^s_Q7JjzzB;xf?+LrNEBRJr^y$Tz)xUG;7_-@6`%UDwA
zn4maCCz%G|(Os)V%1s1SR))T(rdBp=C!=>@mfVVBMyN)kN9%!jFO#4q##qEr`+=%;
z`VREOb#{TJN_TjLdMvWNX7U{VX-%F9`q!WzZfjC#DA%fi4y)3nr6fVa;U_TX|K{QP
lKXoFrat0r{5DgqqcUW9ur=%6PVI|Wsr(MsYi>Y_({{hD)pQQi*

diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-full.png
deleted file mode 100644
index 03908b5284f4fd89c2ea79adc1227a271591a21b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1746
zcmcJOeKb^Q7{JGOqpjhvO$n3Hu9UJzM`epE5lT&47D<L^r&5NbCNg(U?WVLiyG&Se
zla|UF$!GZ(m12^qjnb&*(oDmonZYp3$Gx*NEoW>0*#GvP^WOJ8?|I+zJkRg>z2|pq
z_n&8OV~)XK<^=}$?$phfb%Qa-RQLZmX5V5A#<U>NcVjTENK)iLb@X3&mK}`X9XiY-
z+=sX9ddB!IH+P|(;_j{>^D9Os+k%;k@CCWKLdGWUy5TFUuVwi%PiLg|nh1E8c2~8)
zQZDTSM;^dTt4S<w&YJ3K?`|dP;$TK!ufr+|Oo7UJ`#tC)?ipYOsCGSEINZG=Nj)0o
zQb~t8Ik=c#K>Pci*y);akQa`Mm`=_&<KX6HQrH!Zn-q@$04SfE(0Aa-z$>z=Uu#M<
zm%$o%(y#R^)u?5UX>|>_Y|;0tcJi|#FY1>HnZKjV2>pOGO_?-pj<+h!BNDXk*)6H?
z5!`7Y6_jTW)ScR3U-70#92|SR3Z-Rg6?xUKy_jA1d&cR>Y12tGKq(MX=?32xJ`(>C
z(c0o7!%-ip1%IltQcWkKCG50u#BI6k1<Onk>M3-UO>x+%xMjD-upyzM<8Esy{8(uf
z{;^b@4iA!Dx_PZ(Wn(!&5Pj0vwm8Fu>)VP}oSGzwh<$kC(dZXu6j5M7e+QySSGIY{
zHhNG7q9hFzUhJx)Uf*bUv!@yv^zjZ(72k;ORd89+`hX9w`+<z4!I-^Z@!)l~%+k4>
z;Td1Bc{B&uj)qv>%upLQT2tEg3MkZvJfr8;M?7mGO<}r^km_#W$vNzKlv<QY=@z62
zf-rf5nPVghdN%B;n}MN{Lrye)1fMjV@0!_c6B!FwMQv~+-J{j+H}@^Z2yr=Vxv@3R
zl7BLSS|5b5lrQbA&c-hBK`oT)N#5#_hECO5hxD`{j9PIf;I;vu7SWFNM#t%p<~{ZR
z_zv&v&wlX6%$gK5usWgI<xI$woz&|ZZJ(i<LvUiJ7)FwF0lDM}cwrvdmK-p;di2x|
z(>gWb0`grHl)vBjV?XN5Y_l~^CDVq*ht{-PD!io+8}4Wm*S1$HyoERj;FIsaJaJFm
zY?%S1vZY#+P%XMOY4P|M?NB9K`C)hrU%ipFsZHCA=(U{v{O2N!=^T~VtR3nl0ZY)U
zbd|xF(_|0s9B>_?dusv_Rh*BTq`XI^&r@}yano@59v8ohgvYm1{m|G*R>y~-BqSc~
zpL7%t^{8UfwCksg%7)8pVBvEnOd4Xzx@00a4^9?7BfY%gFlnI@`}*?J*5D5|A;)rV
zD{WY=Zx!<M=bF)2w<aZitH3qfJnJe%8o{5JBcU>bq?yoQg=dsq2cJ|vnZrgCU`^%M
zm$$A$j)enC<lPQk2ihW3;#&H+x~pXTL@|SSa-!!TB7`?s6Tu;D{#M}93lbgl2-Ye1
zxDMJr;sh4y+L9lq-$&OeU$x+9&b&$emF%3qtDZ1=OL|{Uu+T=U4Q5&C=Bx$(#xr{m
z+zEUn`MmE(VZT02y^WGE#g=P#3&52(T72RXL=lcQ)etu>`qz~s6LLF0Gz4MP8^tT{
z%F2`a<`O4*Zre9N@nrf`T<7mlRRy3=*S7egUBYn{kACL_)Frm6fw(G3ZXG_3jn;a6
zDIS_TlFcN;mPjsTrj$L~+Ln9#Q+x$>IM7Y3@7|2uqG$TtVDfyXUT03J9)?y_qL=s+
zgcVLvtdDR7!cg75T93Aa10TZW$IQg}To^(<;S)#$2TBMQvphaOIAazW+!j!#3jn&a
z&vC*VHluS8MtU!4tvz#4Qkm*<mi_*v$O&Apdl%s$p+qNY*GTXidSgxl*UZ$*$S(-b
z=^*r>$=hDV#-|vBhL#ZzL-ay`38ZVf@n7*W%chZIYc$F>O;bH2m8MN0{tu|2u*vQx
z#nPMPJau9TvY?^#sptg47j(kIx&k-7FR#(^>+Jj4E5PJSnw0-rw*2V-rnqD=YWB3V
UyS=uT6R77J=(pXM<r8)KFKs=l5dZ)H

diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard-unshaded.png b/Resources/Textures/Objects/Devices/output.rsi/aicard-unshaded.png
deleted file mode 100644
index 6191a01ec4eb7cf6d356094a1068d824c8aa24ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQh}Z>jv*Cu-d=FzZ7>jFJ=nyn
zvQXUf#{s8@n>goMn*W_`4pf|dD@}gh@juJ2|5aVObN_z-pW@6{7){ae)~D<Y3=!9u
YuU=-6+U553GSF}aPgg&ebxsLQ03h!!IRF3v

diff --git a/Resources/Textures/Objects/Devices/output.rsi/aicard.png b/Resources/Textures/Objects/Devices/output.rsi/aicard.png
deleted file mode 100644
index 57f604efb0eab5eab2f4bc17290c669a485c3056..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004HNkl<Zc%1E+
zp-%%b6o-E!{1=#Wh$VAFV=$b?OiiC%z)T|$1Xqp1pr>Y-p1Xj+HA|+@=plM{%My0)
zwSC<s+xwZfbl3Zu_Pa~3fJUP^<@Chv)W6&8{qO5tjw8(XAJ{(7WbA5bo2Jdn1A4aw
zu(EQKAk07ahEK*jkS2B8AZvav7r$P&?}ATHK$}`buAc6J%gn7nXcF_!NchdQ)2ptf
zb+Zg?>u9*GrFHe&I(SSDz;Ayp+mxd+8Umj`uJ8OK>>Y3bKK%$(@S-T#Y-0@Ywq#$=
z;m;oV{Cvvi(-Tm=RPqZp9|qW6ftXbM+1j%olg~E5djP@)crQTb1`IOb`PDVV>;Xaz
zVDi%$P^%Za0SYyM$xmy*oZpAy2N}TNr#B!ru?7%P1IR1XfJ_Yl)BrW$<P9*!@JCSh
z6Eq;7rs21r2LS(ne{-s&0SWo^HZ|fzM&ul@YraOK(P)l1e>+74@UVnV&j0`b07*qo
IM6N<$f`|IS_5c6?

diff --git a/Resources/Textures/Objects/Devices/output.rsi/meta.json b/Resources/Textures/Objects/Devices/output.rsi/meta.json
deleted file mode 100644
index 17be0b3225..0000000000
--- a/Resources/Textures/Objects/Devices/output.rsi/meta.json
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/blob/1feffb747a33434a9d28450fc52ade75253aeba5/icons/obj/aicards.dmi", "states": [{"name": "aicard", "directions": 1, "delays": [[0.4, 0.4]]}, {"name": "aicard-full", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-full-unshaded", "directions": 1, "delays": [[0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4]]}, {"name": "aicard-unshaded", "directions": 1, "delays": [[0.4, 0.4]]}]}
diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
index 224ccf739c..816108558c 100644
--- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json
@@ -10,17 +10,14 @@
         {
             "name": "tablet"
         },
-        {
-            "name": "tabletsol"
-        },
         {
             "name": "generic",
-        "delays": [
-            [
-            0.3,
-            0.3
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
             ]
-        ]
         },
         {
             "name": "inhand-left",
@@ -32,12 +29,12 @@
         },
         {
             "name": "syndie",
-        "delays": [
-            [
-            0.3,
-            0.3
+            "delays": [
+                [
+                    0.3,
+                    0.3
+                ]
             ]
-        ]
         },
         {
             "name": "inhand-left-syndie",
diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png
deleted file mode 100644
index 8a33640538207a3ff83103032411093d8df5f217..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmV;00eb$4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$KS@MER9J=WmOoE~Fc^n_XAB91frw)lCogG8SQz{chA-e3aBy_fXfV1tIyk!M
z;Mm;6<W3+gm^ipG8-^xL?gpG7oc74^M;YLm;HB;F;f16HCML$ttnQ)fx_R}UF*Yk|
zjIr9eT?KLga2%(P3;;k71ky~IK<;^7r?89DdmP?g;p6fKcaP^~Jq$xI#@2Foe@-sm
zI?FP|aSYCRV}ZqDjy=5M=y(oYe}iq?FbqRF_Lo3`5CWWYBuUa(pbDiFLWqq5JDpbV
zfk|Lo0%@8KD<I=v1qdO-3dk7OKQQ<wkab|=UH|}!qJUD`DOA_>@|qBWD2lcdP*oL{
zWwi=@@Se-<`0V<mtT*a_VHnUft(8C((=-79%jI&r4pdGqtvT3V;p_7qPcJL@zF#}G
j_DJ?e^m3M*nCOjf1FTt?E8#ry00000NkvXXu0mjfCR?Uf

diff --git a/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foambox.png b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/foambox.png
deleted file mode 100644
index 495aca3cbc02baf0e6ec8bc51f071b8151ed21a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*FxW8|_X|l>v&m&L
z%ScF==;<+}{WqTZU&c@>Jw5&ZOymD&jQ{^PUe&&<9jJ@3B*-tA!Qt7BG$1F*)5S4F
zBRDxhLPLRrohiX?@&-d5i6&MF*@sNW5>$KiGQ1>Wc>;YCO9YMhTA7kpG-OJNupDN&
zbX!qCZ^BL?riV;7mn%*XYMf&&z#*0(;8@Jgym%w$nWg8LG8mOk7-TRoY)`WH<c-{a
Q9%vhbr>mdKI;Vst0DJF2rvLx|

diff --git a/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json
index 39cd256acf..4d5730b0ff 100644
--- a/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Foam/foam_crossbow.rsi/meta.json
@@ -10,9 +10,6 @@
         {
             "name": "icon"
         },
-        {
-            "name": "foambox"
-        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/bike_horn.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/bike_horn.png
deleted file mode 100644
index ea9fa956f2ffb7ddafc0b73de57a4d5b7ac19360..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004ENkl<Zc%1E%
z!Ab&A6ox-XS1nvbwP+Kxa?z{`1*L@`Lbz(<BlJ)`f-MBWjSLus#+62b+4ulvk&B=}
zxD40ZA{upaCT4cg{opY7FmvwzbIu$v7z~F0P9{xJx7*bKmSs`dy&zvocMpJ-wBYrQ
z4e`;3gX1_lt$|qQlgUIE3WeaCcDt<sDtnh4oPX6ij-#{LECAJNHE}0$aW8$}$MZaG
z+ja(Exm*GS;sCW;Eh8UE-GSH<oaAhL-)B4?YXGGbN-3WDD?uTIb{9k3#c-qc0rYxA
zX~ecn2%(Gl5~Ftk!1{STS4wdt%M9i%0FIkYW}&+dfwL`ou^muK1y7|E_isar`O=Sk
zI-N3@x2Wtl0dRrmP`D8qu?D1++`jZV-6<ob+?wBbE8%YwE-(v4l!4e0^m@HucJ+Ea
z(I0*ln)`Kx)~{Ot&}cLguUC{{B08N;>h&@h3<krW;S>4hr#8u^PU!#u002ovPDHLk
FV1n^^vC;ql

diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_bongo.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_bongo.png
deleted file mode 100644
index b78bb308d81eff05f5322886f118ba049a95026c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005aNkl<Zc%1E%
zKWG$D5Qo1Dfi1)oDq5Jh9FnaL<>4Pv*ajP`L%4oX<gl^}99k%WbXIbRvVB0VvXN^o
zf*J;8s|^y?oQ0wm5sR(P;+W^#+uP$j0v7JC*~jp{ncvKtg-VqwRjTyAt2Q2Ze&@<i
z&&GH*E|S^vt*38~jI)8eS5FU(@mXtLVmVkZbv#J=?DTdKNqO?-Yi(Xm<BM863<JD+
zV`>tB<zSt)rtNZWPE9NT7~@Zc%XAdnq8>yt3^4=8@gxnBKG}Y3-`3@(F+h&X84yVc
z!vK*CiF$-#kTc>Yh@u2ze2npkqGXJV@#>A4I8_ZsI{>h`-R0w}$9VOIU6}TxCf)lz
zbkQ_<r`5JeHn+RBSQ(e?$DF@@&vLp0xxYZ)=jO%+gQRb}aKA6Mwh&1RWBwb?{R<Yx
zlZd2rT5WcEyLNoqS*O)TBrPo8yj*SqIt62V{0pOt>4!g^x-qvCcXG3EZubQPYU0|B
z(ITBXdBVoOegDC)&p#)Q(KT`G?C}Bz@cLz3C_d4ECOmWT9IGo!Hnw+g$d~t@3dP4w
zlyQ@oQUj`ow=WM@SC-g2I0WFqvv*VPD+8e1EKH?JmHw%I1L=-0@_Ziz)&Kwi07*qo
IM6N<$f)sA?v;Y7A

diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_makeshift.png b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/drum_makeshift.png
deleted file mode 100644
index 7eb0a3e6a84fc94953cc86db03ae7d4def61bb2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005cNkl<Zc%1E(
zv1`;&9LGPE!VO}FD(B!y=+I1u@=%W(T(fmL4%~xM%KZZY(LoWibt*+H*@YvMOUdeR
zRLfg3rIh0^E=3(G4w>R`_s-Zex%X~0pCvrrFTd|Mzx>|&K}}6fP0jz#n&}HiyN~j+
zy{B(K8RuI!747yO(6XI{m^6tvf_a>-naZF+r<n_3m5P>;CK03X6e%YhoLp3DlvZHS
zY38nL)7WYoi37B3hi(sqXaM9@Ca#rj2w@qCu9~N^2c*mp#H6#eZY9zrA{)m@nJtYi
zH6Y~#*R_!{Lk1zPYgZaclL&xp91{cyLRbjVAPAC5152Cm&HF>nkN0V8wdaks_qw+b
zd-x(mHLNoE{K?+ZCR}O&rvI_;d8A21%Xa?i^5Q8``$OMH$_c>gr$8ZuHBILG0Q5bF
zY#h_~Ji0T%^W%N69Y*0P@W+@kv2q1e75>%9#fl7P=8EXt0ibyk0$jgygIhN@=j);G
zW8JeDh0~|v+xH**`ubBht==pcbej3&o%VcPG*T2+eEbk=eLZMa;Naw9?e_i4eEaUk
zg4k8gzFcaHgW)uM_3U8|pp0A<26*}Ivr$gt@mVxd#8kMZM)4c-IKb6~0+sgw0000<
KMNUMnLSTZ?clzuA

diff --git a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
index 39794b528f..0c399d2f75 100644
--- a/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/otherinstruments.rsi/meta.json
@@ -7,9 +7,6 @@
         "y": 32
     },
     "states": [
-        {
-            "name": "bike_horn"
-        },
         {
             "name": "birdtoy"
         },
@@ -19,12 +16,6 @@
         {
             "name": "drum"
         },
-        {
-            "name": "drum_bongo"
-        },
-        {
-            "name": "drum_makeshift"
-        },
         {
             "name": "helicopter"
         },
diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json
index 02501f5138..e5b0a2db23 100644
--- a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/meta.json
@@ -15,10 +15,6 @@
             "name": "church-organ",
             "directions": 4
         },
-        {
-            "name": "minimoog-broken",
-            "directions": 4
-        },
         {
             "name": "piano",
             "directions": 4
@@ -27,18 +23,10 @@
             "name": "piano-upright",
             "directions": 4
         },
-        {
-            "name": "piano-broken",
-            "directions": 4
-        },
         {
             "name": "xylophone",
             "directions": 4
         },
-        {
-            "name": "xylophone-broken",
-            "directions": 4
-        },
         {
             "name": "harp"
         },
diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/minimoog-broken.png
deleted file mode 100644
index b2de7d185ede48811b589ccf829a2a7f144d0d7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3170
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
IM6N<$f;dg`3jhEB

diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/piano-broken.png
deleted file mode 100644
index b28e2fcd52a23fcddd239ade9980069d25fc23a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4493
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

diff --git a/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone-broken.png b/Resources/Textures/Objects/Fun/Instruments/structureinstruments.rsi/xylophone-broken.png
deleted file mode 100644
index 1c26e577bc0a5c379af7f33b5b8919de908876bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3703
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
V7y3c{m8$>%002ovPDHLkV1f@sGyMPn

diff --git a/Resources/Textures/Objects/Fun/capgun.rsi/bolt-closed.png b/Resources/Textures/Objects/Fun/capgun.rsi/bolt-closed.png
deleted file mode 100644
index d6265807f207d351fa83a65e96063848a532eba7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzEl(H6kcif|7aau|6nK~q`piAD
x-=p9_|I767L$M4GmcIQdn<2x%5Ha-$(+hLP)bdA@`+&L_JYD@<);T3K0Ra4;9=QMj

diff --git a/Resources/Textures/Objects/Fun/capgun.rsi/meta.json b/Resources/Textures/Objects/Fun/capgun.rsi/meta.json
index 1028d11019..379c20cdc9 100644
--- a/Resources/Textures/Objects/Fun/capgun.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/capgun.rsi/meta.json
@@ -16,9 +16,6 @@
         {
             "name": "bolt-open"
         },
-        {
-            "name": "bolt-closed"
-        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png b/Resources/Textures/Objects/Fun/pai.rsi/golden-icon-pai-off.png
deleted file mode 100644
index c267627a2180ccb0ae02ed02ba9b562c137acac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2uVaiR9J=WmOp3{Q5?rVO&eoEXc4uoy{bry!K7juvq%>M>6)oR$Pfcvx_1)k
zR62HXkRTnz#amrEWKm}!R;&m9xuL{Ui-V-dMPrla(A+g?BloV2pm3k%clUl@e!uVi
z-tl<g;o*Y0nShv^35a~kFY+nBu-2{T_BB}sWJFfsbnX&YuD=JM_H7E#L^#+ayBGyD
zk<Lv3x(ElG++T0>$<%ff<x_r<&P@=HjC9TGy2<#pG9O<h?0EV@9d&h6%7o(t!oeoP
z{kx1tess-`Mtp>a8(dWO<C6zfr?T<}hC&ShzPvrj{954;ss%fSwjOfl_5d$?Wx!&7
zt-#PofJA%{fbzx;iTEJpjhzl%l>)FLTUOoxaH!$I=10NjB&eGGM=ES>-LVa{(~B=Y
zmH{`&PVTQ6ki|3be;BA3yRM45(Mumh%Qsh8dUjVzS23jf%NrP*R9KccV#g*GD#ljt
z4OqpCYK(>Ko38ny8e_Kag`1Mj|G@X!o<!G8ifW8#G)hs89cm0PeQw=Vb14G=+h6y7
zs!XzkrfFo7rH*_iSwh!M&WxY6^_Fobq_@B@YADL7*7y}3-+K<NBX{;zqC@8fse4;K
z<rkN)?qA71efUgvams#IS2vlyao(QPyVu)1ditw3cfxiPX5Ginx{tt#CIF#UJcw*_
c508I>-yxT(n4w869{>OV07*qoM6N<$f_>B#9RL6T

diff --git a/Resources/Textures/Objects/Fun/pai.rsi/icon-pai-off.png b/Resources/Textures/Objects/Fun/pai.rsi/icon-pai-off.png
deleted file mode 100644
index 1ac767e8864d762de524486d0df30ba389694b78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4522
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

diff --git a/Resources/Textures/Objects/Fun/pai.rsi/icon-potato-off.png b/Resources/Textures/Objects/Fun/pai.rsi/icon-potato-off.png
deleted file mode 100644
index 806d02d6f3d43be3a12c9ba6f97bb64bbc48a83e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 483
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik*1AIbUZKjy$<futGir3Wjt=o8X%JkI<$)&QgYGPs<$!SFw=h@a)75h3n
zO_|VJm{VY7Wwmc|(3~aH-yO^<$;o=TD`{7y=>OZ38X6k5bo+It8O{o2m{)1PuF<AH
z!(dsx%lZ}<pgoZfpBMuv#gZVu;Qs^w!~BC66oHC43p^r=85sBufiR<}hF1en@Q$a8
zV~B<S+rFE8hZF={8}&|wxVi_fl>YyJYFtWAq35p`-R(<^cYeRH;1SDy;VD5;+iVz&
zZZ=$s>QM|iHp9{L>2iU^GsUzN?(Uwz6MWS-I(+BxR`)sV9-ddvJ?p(HlDxg*n9=mr
zDmT*Xve!mmzF^<_RE;y`^|qC|#m|d)TyCthT3+6#>+$#2^FL2{`x*~B`p-X<S6^`C
zNKHzOv;Ieo1x=16PcF|qSugzJlH&sHxrc9v=YJ^i{@cm)H94N+V)d8CCVn9sjg||G
t4{NS#b~<4H;Dpr&rJBe3DQYbe?;E1>?(NzuR1fqggQu&X%Q~loCIEIS*`)vg

diff --git a/Resources/Textures/Objects/Fun/pai.rsi/meta.json b/Resources/Textures/Objects/Fun/pai.rsi/meta.json
index abbce3d24d..3f633fe87a 100644
--- a/Resources/Textures/Objects/Fun/pai.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/pai.rsi/meta.json
@@ -7,9 +7,6 @@
         "y": 32
     },
     "states": [
-        {
-            "name": "icon-pai-off"
-        },
         {
             "name": "pai-base"
         },
@@ -61,9 +58,6 @@
                 ]
             ]
         },
-        {
-            "name": "icon-potato-off"
-        },
         {
             "name": "potato-off-overlay"
         },
@@ -73,9 +67,6 @@
         {
             "name": "potato-searching-overlay"
         },
-        {
-            "name": "golden-icon-pai-off"
-        },
         {
             "name": "golden-pai-base"
         },
diff --git a/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json
deleted file mode 100644
index 38af5d3aab..0000000000
--- a/Resources/Textures/Objects/Materials/Shards/piece.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "piecelarge"
-    },
-    {
-      "name": "piecemedium"
-    },
-    {
-      "name": "piecesmall"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecelarge.png b/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecelarge.png
deleted file mode 100644
index 74950bdabd3f99ec6509e1700011e3691c6fa024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 243
zcmV<P01W?$P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002GNkl<Zc%1Fj
z!3l&g5QX92?LkO6X~13tFE){CY`|km8AuWFlw}c(GY8qre5Zgz-ZK%wIp^G;4Vs}+
zN^R?$^X=R;O{)D&1xhJ3=ghwE0K^!->$4c6xy<9xwrv%-4ZX6iD*)p-KJNd~Y<LbA
z5k%y2Rz#TRxqDT=9vd#pQbmLi!foi45CQ-xrEZ4m1b|n<O$Dqp;i>{DrJ=pi8(upB
tE%lG1eT+SpyEhkTC3?>-!Ol77ngbi>Mq$1!iZB2G002ovPDHLkV1nAmWC;KO

diff --git a/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecemedium.png b/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecemedium.png
deleted file mode 100644
index 9d20740776d9f4baad5d2948c7d525c9ecdae39f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJlb$Y)Ar*7pPT9!YY#`tozbM4#
z0cXZuChiU0s#4Puq*SuJqN4m0P6}yTOkFI{c_8v-(fUnK^Z(Z`pX?YY;`*~ZPjz}y
zkLLQl->;PRexH|nJL7iPmt`I{eaTEKR&{00Dod}uzgdU7L8C>(p~ukjxxq1+tXazh
zTPr-6ES~$Bezx(R_oOcLMrkZl+|_mg4#hVnuXiyS@Em@6uFGmdZ~wPzQ4=jWtO|~8
z-}xi5!B{x+YrqHoCy^ETdkvSJ*rRbET|i@X4A31XZ5UrvIjw2;T=O32DF#nhKbLh*
G2~7YXfoa_U

diff --git a/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecesmall.png b/Resources/Textures/Objects/Materials/Shards/piece.rsi/piecesmall.png
deleted file mode 100644
index d206eca8230e3d73cff53de73f3a187686cd2169..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJW=|K#kcv5PFCFAOY{0{M;r<0t
zo_enHY9D0g9edzt)9UDKv0UcToGD_n4%e$EE5B6c>FDVAbMtlH!rkj1+Z=N^C#ku#
zV1N0R1zWfEE!_LvdqqY^K~i~q8r!59#q;iYEV?H3YNspn3`vHVw)>)d4nivRMlwGh
n2~P{U_B^)auac5d{|07BdDW1py>qL8&SCI$^>bP0l+XkKLVHQ>

diff --git a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json
deleted file mode 100644
index 3562bf0203..0000000000
--- a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "shrapnellarge"
-    },
-    {
-      "name": "shrapnelmedium"
-    },
-    {
-      "name": "shrapnelsmall"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnellarge.png b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnellarge.png
deleted file mode 100644
index ce064b642fd57a52fb330e24899050f246ee0029..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJE>9Q7kcv5PuQ+lYQQ%>{V1Kvz
z*#kTC6JPf<R50w;nsUkL;>j%{|88eLy3QdWxOd{ruPgRWo9Vjs+KONQ*g{O-TseGB
zseccfxZum*B8!B6_Lxl!Vq(~GZ9=hJl>D(XyE<A_3`|*<isX3O9Q)1j-^_NN_Kw=1
vzN5CjetR3Wqa8!vPTc?0|Ez%EMRV<A@9n)B6gS)kx{ATm)z4*}Q$iB}pgB;v

diff --git a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelmedium.png b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelmedium.png
deleted file mode 100644
index 156c3ad3db9500253c0b7dd6c5554aa676d7f508..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJCQlc~kcv5PuN>q&puod=VN3Cj
zdBrU6>znt_<F;_D%6jR!B_mhyy&9X4YG+6Bxmr;M<;=~WbGCYinhH)7XgVUXdSmd)
zSK9kGF6r2-zGI4!Ree0;>AAi?D;bW7{d)5B^zvm}8#H}AE=8%Q{U}q;w0!=0PEb{T
mGt-8plRwQiEIqe#H?wTCMZy$Ap|?QSFnGH9xvX<aXaWFT7D^NV

diff --git a/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelsmall.png b/Resources/Textures/Objects/Materials/Shards/shrapnel.rsi/shrapnelsmall.png
deleted file mode 100644
index ad9244f88ff35d576c3d15bbccb3654ef5563b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJKu;IPkcv5PuN>q(V8G#gaYgs$
z2J-}4u>_{7Q?^|bCfxcjwt;`fRtAQ6rImN~x_QsInZx*}eaX(`*K=+a3(E<{{!C~6
mwoNrOZCh*n!;1_K+r`&#%LcNayW$BnoWax8&t;ucLK6V!pfSAw

diff --git a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json
deleted file mode 100644
index 724495e4bf..0000000000
--- a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/b5b4edd4e46efc2ee2d3c1ce5aff82d80ddc461e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "splinterslarge"
-    },
-    {
-      "name": "splintersmedium"
-    },
-    {
-      "name": "splinterssmall"
-    }
-  ]
-}
diff --git a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterslarge.png b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterslarge.png
deleted file mode 100644
index f58e4915d07ad69040bb7e09f5da6509fd246a99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ`JOJ0Ar*7pPC3ZStjNPMUF7g>
z*8uLT0gPJ%TJGny?NNFv_|o9U^57>w7tf7VWOfvgxD++}mbw1wg0y)I0okFRGdSNQ
zsX4f;oYFLBb5`sBNCg%-#SNbY`&njGzLSv`W=xxx%+qng^WRM-rKWq;yJ8<)zQ?rn
z!1pivZ)Mvr@_L|E!#>^G!G-g{q$fq({of8eVv2isnrU7PSH(8|CI*IkqF)nvqD}|=
Q2RfC()78&qol`;+0Di<&;s5{u

diff --git a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splintersmedium.png b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splintersmedium.png
deleted file mode 100644
index bfb7cef071949b954838bfed9452b361003cfd75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kcv5PuWaN6O0YPTDzT-i
zv?VC7dDHoD@x}eOPOwkB*1>V&u5;+){g1RAp51W}H8(zTb?2l1`>glA?@~OiH)G9O
x*N~g6C)83HcAUCju!lLC(Pc?EyW*l`wHMYV1~vI+2Y~i4c)I$ztaD0e0sw?%H^Tq`

diff --git a/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterssmall.png b/Resources/Textures/Objects/Materials/Shards/splinters.rsi/splinterssmall.png
deleted file mode 100644
index eed868a49fd3bdd54e45d5d68391fd326c658cf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU{4pvkcv5PF9-4-aNuZuc)BNf
z0pEspMv)E6Id`=7oc>hLc5BH7F@^{JDpPk~&)_t+UVJ2jvBv4ropW=;>-KW?cdYxf
pmuZrg@$Ey~ZDxOd%y8i?TaSy<k^eT$*+AnNJYD@<);T3K0RXo_HJktd

diff --git a/Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png b/Resources/Textures/Objects/Misc/folders.rsi/folder-sec-doc.png
deleted file mode 100644
index fbaf0ac187e1e96334b965fa1b4895f8554828c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 284
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*F0SuLn2y}
z6C_v{Cy4YkF|zd>(fIW6$shkUjmPW$CRKd@t{?c!$iTp0gTQKoSMTE=$s9OvAYuK2
z5C0!Dv%6R}bw;pX;0n0PXz9`>WTc?Q)%W+;(E^^%^)jZsuK(U`(y^$1cz-{S?UgbH
zD~D|pf*htWueouf!>h%z{=d-?V`JkNlO8avTGps}=8Vc~#gmN2OP3hj01^*o$T$>n
zEQp@+?~NpvZ!!B4`)aps`70kW%ursznh_-a;?yZ4foKuor5+tKXJ)Vi-8UgbvbQPF
ffXnS*12e;iDC?5}W#OlQK4kE8^>bP0l+XkK)Rl1$

diff --git a/Resources/Textures/Objects/Misc/folders.rsi/meta.json b/Resources/Textures/Objects/Misc/folders.rsi/meta.json
index 57b7f992f0..9356919851 100644
--- a/Resources/Textures/Objects/Misc/folders.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/folders.rsi/meta.json
@@ -22,9 +22,6 @@
         {
             "name": "folder-overlay-paper"
         },
-        {
-            "name": "folder-sec-doc"
-        },
         {
             "name": "folder-stamp-inverse"
         },
diff --git a/Resources/Textures/Objects/Misc/pens.rsi/meta.json b/Resources/Textures/Objects/Misc/pens.rsi/meta.json
index b2e088a95c..16998eea1b 100644
--- a/Resources/Textures/Objects/Misc/pens.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/pens.rsi/meta.json
@@ -1,62 +1,56 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. pen_wizard based on overpriced_pen by Velken.",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "pen"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). Luxury pen is drawn by Ubaser. pen_wizard based on overpriced_pen by Velken.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "pen_cap"
-    },
-    {
-      "name": "pen_centcom"
-    },
-    {
-      "name": "pen_hop"
-    },
-    {
-      "name": "overpriced_pen"
-    },
-    {
-      "name": "luxury_pen"
-    },
-    {
-      "name": "pen_blue"
-    },
-    {
-      "name": "pen_red"
-    },
-	{
-	  "name": "pen_wizard"
-	},
-    {
-      "name": "pen-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pen-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "overpriced_pen-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "overpriced_pen-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "pen_centcom-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "pen_centcom-inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "pen"
+        },
+        {
+            "name": "pen_cap"
+        },
+        {
+            "name": "pen_centcom"
+        },
+        {
+            "name": "pen_hop"
+        },
+        {
+            "name": "overpriced_pen"
+        },
+        {
+            "name": "luxury_pen"
+        },
+        {
+            "name": "pen_wizard"
+        },
+        {
+            "name": "pen-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pen-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "overpriced_pen-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "overpriced_pen-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "pen_centcom-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "pen_centcom-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_blue.png b/Resources/Textures/Objects/Misc/pens.rsi/pen_blue.png
deleted file mode 100644
index bd06ca48ad57c098f71ab003734386173f37f26e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~Q?F$Tef9H(=DBAf*t
zk;M!Q+`=Ht$S`Y;1W>TX)5S3);_%xm2YC-DaIjwJUv1%Sp3qjd?A-ycGfw=yz2Uls
zhCko0`@_H`Ab7FODOCCOCZj-^tzjvx6J|c@-F^5>N+kOkpF4lG=Uwc)_=V9S#B`ID
zVX=nkkvD%XIZd%&{JMOR<Xz5_6<)Q0o0$)&o~~bRenj?wq=M3-xi*fU?R$<qJX#NQ
O2ZN`ppUXO@geCy~h)(DL

diff --git a/Resources/Textures/Objects/Misc/pens.rsi/pen_red.png b/Resources/Textures/Objects/Misc/pens.rsi/pen_red.png
deleted file mode 100644
index 31fc30dabf44e2daa474e61c80288c37c927ef84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 257
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7X~Q?F$Tef9H(=DBAf*t
zk;M!Q+`=Ht$S`Y;1W<6Hr;B4q#NoG>ck>=L;Bmd^%_w!`qR!0&#z*#U|G;spQ9DIM
zsd-1jDv7*YP9~-gQ?!n-*D16J9FqT3IdAXv^p|dhUYcLHCcYD4*H{{Gu)WM7^ynFe
ziX7?Sb7vKwyy9S3`5^e*p6j9v#?GOsNBB4%aGyxO-+z4CTo3cz&$wkCXK+r8ax1^r
zIe)d{lH;0lyX`_Ft^QV9y0F%lTAUSd;&85I%<!`K^7g>&X+Xy^c)I$ztaD0e0sy$C
BTe1KE

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
deleted file mode 100644
index 039817e37b9cb3f6c43fa5d8481ab2d2a50025d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq^m1
z)5S5QVoq|RM1sMqhCucntAs0zDb@+6zFht9_+_qjxkN}v$blrwnG1VL3K>omIWzlO
z$RA_tocxMol59hsr4a*!$-q^V!kyS>S^v<g&Bj-Tf$847Z9M1a?Qe|cDejoEgyZm$
zlO|;czP=8Z*p_F{Q^s<Hktd<skwL{zOTk+FfDSY3&ued2@GV)%tmU;v(yGeL;Kwhv
zgcG^<_Au(~FTNdg%aVa*TYhfxhcD}zJ}2&b_r5Q^;^(AenGbGk)aLotcQ4`eyO!mK
zE7r_mU7q;Kq|~AGtVw{}e|d=xN!Hib^BYcHKF6r=;n!ZB8=D?qw=<4Vx~NbX#2CrP
zaD3-7zUJdsBop=>4{<NZQ!r(p@RlJ#i=D0bOMMBq;-iuR296`E)}(dJ{KB30aFWfo
z|JElB+H=@%RCpU1_*8XF_Ah4F*kPY?<oNQP%qv*kWPyRmSkAz3v1J15X2p|Mz+h+a
MboFyt=akR{0Fb_@BLDyZ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_electrolite.png
deleted file mode 100644
index 46d0b9515c65ddae85a1e71ec31935c6b5226b5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00056Nkl<Zc%1Fj
zF-RLx9DwmJ(t-}!rRriya)I7CG&IJBaDo{Gk!I@JfP)S~mqHf_h^tcvK@qYUDt4E&
zVkoFjgm6O;p)MT~I;n+%Csb_Vb+Ci$T`oDQ|KEDt``*2K?|~3P2qF9^E-dPM+b=FG
z>cfLwT`H}GGKrx25kD_YOyzYf8fBpWF=yvLXf&IA*{=8+>woM6kW8iZ?A#ljOr=BF
z0b%!nn?Dg+JfMD8EAdz~8rmWR)%Udk6H|Ge8BNn@Hpz^pJH7}(_B~%5^UilY(DRVm
z*(KI)nZ4|52D=|{di96BmsZ;^qM-ZUC!CqoAK%TOl)^9!s?{o{X|lX?2q#YaZ{mRa
zzK(!Wiq+%_VDa^No_f9RXBgj<Qf&2FfW`K!&n@*mEkG`p)3`q|41@QVpQxow3XwkI
z@i_dxzIon8xBGAV4QeTqVx!zr-}{ywexVB^Pf<^@6e4{r#in_-lH~YT7koQv{}K4t
z-x&Wuu~BA2U+}0>^4<4-1WuetB9UNde-qbru-C`1ZM!ocf2(h=kKwuwL;IVZ?F%7<
e5JCtc?u5U^LD7{y?P!ev0000<MNUMnLSTY^iR57b

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module.png
deleted file mode 100644
index 1871b477b638f959833e77345b5d89dbd339b170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 927
zcmV;Q17Q4#P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*000AKNkl<Zc%1E=
zPe@cz6vn@CUbUE9<tSdHMI^K_5JU)CiHuliOBZf*%3RbU0;8aTq(!9$5*W1bPYb~o
ztz79sXj?%rL~X)c#FP_SIx~0FMsEw}*=)P#`OduY{6J>)-goag_de%+_nZL)K@bE%
z5CkE3C}kqtV+b-;l#7eOKf{@Xpf3RH1h~NmP!Fagl*0m`VwC`;Oe9@5n8kkZ7XZ|!
z>jtxa2BKsPNx!uZXpI@Aj6rM6*xn*!d!ZYEaOOC6t9MYl`r>3N70TJ(&xTM-mkFnV
z-CDrBpSPY1iPo6G+eIF2rA)+WzHT@l0il*I>(%E8gw+oacEHTci~)fD$CDVnb_Mx-
z9*IQ4x0T@P_dS`w*wr33ed_$J2K@Bn4+8+{{2u_o*UUBmV0Ej2H<!*GdJrl}-)^w2
zF*A2Nj-L7Zn7D8YT5IHTISfCa1b%)y{8d=g*IFO^ap-$7f9tQIJxim&>=)cvdT4tK
zGX3#5o3>Z;w@$#TwjrSREGF6#qybQvo|*yx+}UXNUE8bq+a)0L3tH=g?KeI?1g$lY
z&yWW5zxrBh+}!Adnr_DM=0)H2y_i4Aif|bic;LlttQa}=8mayd7;+Zb#z2|BV|CT%
zccGP)PNTKP=4JsqJHL_3<$&ylKVJh&^tIOL)6cNNq|Y*c7o|+ZIo-wkA{K4reG!W`
zkn~ArT-xc*hPSGbcDh--m{7FQgtu$>li)WcD?g@`F-n=3-#bAm6LF&LMk!;8pZ@Q{
zXv4l4N7w}<GY<dk=<fiQ{WjxD#^AelS)i1OC}o=DK!%Yc9{@oR1VIo4K@bE%5ClOu
zDg@mOBp=F`ffar9%F|sq15ghA30^>M&`33OB;j)aT<x`*dr1Hb#m~Sd!5XDZq}Zgu
zvICSdO()LZHQc9i6iAOC_Z*hvJhrI0yc=Ez0(>S+?hoLu&yPQv#mGR1@A_UL{Q=C7
z`U5JVKA#)X|A0!U&*z4efJ&&(=Z4fDPzm+<+>ot^px5VfL+%e4dpU=`%b(cl^Vip_
zu(y}ysn0J9i1qOlN-CrS`4$X#W5%&KqOKnl4%Gqy_JO?kwG@EMj4SjePdT$#EA$4|
zj3YfWIqUPwp+BK4;69KEvJ+YnNbm(g5ClQ6;xEXaUw^3&Z?^yd002ovPDHLkV1gxs
Bxsw0@

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module_static.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/adv_scan_module_static.png
deleted file mode 100644
index bba9fec3324035cc3b3c970a35634a56fda1fc3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$W=TXrR9J=Wl`lv`Q51*2xrb%0D!aiT2CGG|8U_l^xL{J83l<U994HoH2rCMP
z!HS^SWEq&Pf<<&erh5i;+q+Na<XZeQY&&;Og!lDx&iBr}_x&IsAmG2Fl!@5X_jO_T
zh>e6;;Bz<-vyl)9C}kq<P`dFk`~--(L+OS@A|w%Lmk8JUd5bm~tnLp~Dj`qWPb}e#
zFB_XXAl^W+STq0&+XZq<bNIebHk<9ZpGaWm{LTQl{wo02^%nrD&n-@8#yaXL+rUKJ
z9Ih>rJYHvaauuyLp69W-SAhGQj(UopVX~BigG*LQThbPG0!LFBm>*?#D*Fcl^#`=p
zU+d53Gia^BulGpc2dUJCxYiL>U7Ur=<!Pg}rdDgwY(C<79yFfB&sv01CgKdwTK$Nu
z!pL<Jjqr06*GY(SKup`0$CWZhDHE4&!YYjTj^kV4N)kp^m!?fZG`uVH^y~uyeuH=L
We~~gw57+Gg0000<MNUMnLSTYBti6%|

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
deleted file mode 100644
index 819275417bab0d14b6904c6877cf9435fb74a812..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmV;b0agBqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<STuDShRCt_YVHjXA>VQ!Pj5=V{0mH)qQ>L%}k4r8mGnA304ggv1
z?P<#}aq@f&ITaNZg8E5v!2W&Hz&<_f(*WiR^-g6lG|&XIuV24Hdk27kxVQ>~ff5&(
z{fL2bK+pk4k6-zJ{=#*JJ9qBjRX1Z=FNWCG?T0CM0L*ew5c_*uGiYe3GyGLk2Frm$
zKuS^sY!OHea*%_fhLEF)asYBFwzJ{~r-9G6?t=Mu6z>2nX8>Ci8sf{add+6ABS4me
z*x1qq$qoR42Rr5eAKChx;UUQKye_a9@1!zd7=MJT0fiI@AX~n3+fuw)kZ1=exIY9N
z<ioV`zpfT9*mAH#+|$AGAYUVg0<o48?EqK^teC=pupAALV>!_dfQ3M7OZfj@ms+rx
zWm7oA^<!7y@w|ES1~5&E<wQFG2C8eO!42P1GmU{7V0ctUqYfB#z^DU89Y6^H0JU(E
UUB$UW0RR9107*qoM6N<$f~l0R`~Uy|

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ansible_crystal.png
deleted file mode 100644
index 1d80546e182c1d6a25db282a452e76de34f725d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kcv5PuWaN!puof8psrn;
z_9@^@%K0ZE9GbarJj5=>yEa$aG6^azn(L^$%J`gq(-xM7s1?_uZ)|V8#<04sTyQ}d
z?|Nn%{`fne75mPptzb2{o_t2ECT3-1W&n31YrNy?_?n|GE+xztH>yvHnR;Xa&{hUd
LS3j3^P6<r_Zg@G8

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_electrolite.png
deleted file mode 100644
index 3e08ba2cf5725356bd9bb56fb166e8959dc69630..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0005QNkl<Zc%1E)
zze^lJ6vsa!R;m3#s`Faq4wgxRg(QWrh)EMtZV|-7BWok6gwx7gABf1=Smi%R;zbZr
zgb>1w!gY4L%?ZhctIU-z#gRQD7Mpc*6XSfkUEa>;@tw!)fWzT%I2?{FtXDVX#`@Q*
zoAT-72ie`-vC>3dewF2;`GtovRVXkqKE~H?9ilkqu<<t2TG!DJK-tr>yz)%Sp0+Xp
zw*5eVC#=bH@{e3aK2<1K3n4FmrT~7)qd3M!2zLFtDbz*KP4RtS&OcvAf2s-4S_HuN
zeF1pUsS(cZu~zA_Fka>U>jwaMo+sz)^X8)ep!WSz|DTX50ArNWTIAr#djQ()Hruz~
z@#gRzjmP^*-ErjztwoGcx&D&07SUQ{t<oL%%dZIcW@*fwBz3io(WEx*+NmeN7^S9P
z&Lr=`(?zzIJ`=W9Dc&stFtIV2gq5~|G#I0lF-kqJo(=r1RUXZMAv|47{7)-!Qk$p$
zcXU&NAQ0*zVHgTqMJbg^Lp=k6AP}~SeScl9<j<7U9o@ftoZb2X9q9FXL{T)fo0x4s
yFgWP`)`9m=`!7m|-Gptw!{Kl^91e%$f8Zy7-wtbAqhYQ90000<MNUMnLSTZzWB1(v

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
deleted file mode 100644
index ba244f3f29787b76c4d627848f663efbcc0c7d90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S$)
zr;B4q#hkaZti2BhNVLT-w5T{NrthlN)p2c|q)TDp$0miKyGLC=+FSfmelx#7J2bjb
z(E7?Np;dlbqWR7T7S0wZPTJa-b@|Jah=;%BUOas==b7)kIZJeZGAZzJGZaQJbR1@K
zkP%~ew1L4sY|{=2^ZM7`OTR@gkeFFh$#`<f%2fRce)8d^txk#>>JtsNKFU7)a~{i?
zHMuvJeP`y}z4xD(yOtQU4&&0Gl?!<%oa=XC@OD`Ib6&bb`UdgbiyP0ovDNq8|GAFI
z%xv4)=g-9@+5(I3oH|u>byLkhp-n5!m5Y85)ms*^{p!2^o&~i<e>NKja|$KT3D%Q&
zSAO?JRlwZ$S_djcd&^kg7H_yxn7o}gdBLA71+m!<3ky>7TR6nu*IViDU1YU?UG{;y
z4<}U4syXz|vcRA;Nk96;xv2Bz_mhuI6tXy6YWw_j_<~b^cCqlBzkgf%R_56m5wg1N
z;R4s@x*t40H+=5<OtzT!d&67n7iK*VeO^6_@#0HM;r{JY`MZnP1UPJr*dougzx<x*
z|A&rR_b<P1c)fY?tEu|Bj>qqRNd6b*r#1gSPosqn!;wTrj4%~wXKesUJ^aP+^2=G@
z;MdYQakUL8`)X<%mU-TtKmDBk_rh9-=7QRW+YIaYf4u+7*lZgkuQ2)iSH`bAkA5{o
zeSiM>=d)|<5hmO19L}2piRZr<G?8OXpnXpRe{_S>(qz8HnZQ)U;OXk;vd$@?2>{>-
B7$yJ!

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
deleted file mode 100644
index 305087c37b634d1fe0fa8962937605c45200cb89..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}J3L(+Ln2y}
z6C_v{Cy4Yk1sZU%Nf=C8eevSrANI`5%!mKU?(H!!)7wz*uJ2bJ@geid<;#b&H_X_<
z)V$dJW4&P^>zu5(y)_NzIsWkND0wO5H(mSh#sB}m3CjaD%OAe&|Gr?>$ESz2_wXeg
z()L!#(734TDI=M{%jo2I{=k6)AD;40`B%{1*yt#J^ibQp(=57ejGKfPP6~Td&&I~q
xR()N}_|T0V2li%npWK!Xah}^jjRlqr498RT9;+^SJ`v~#22WQ%mvv4FO#mH^W9$F`

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/card_reader.png
deleted file mode 100644
index 8ab0ba8df5d3173e4ee2016092e0f28b513e9a73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003~Nkl<Zc%1E)
zF>1pw6hNO#GTTdr4khm3&@pEyw0Fn>+8g)+y+)v`2j8HDOxcqy-QpyJ2ZPZN;l<z%
ztxZhb=Ep>|1wSw{;!FSWC0T}!4nq`A6q2|LQv#2>2T`0c0V$n;B?<C<zW~Vdyz1NU
z_b8=~jt#@`#~eM00D$LttX3-~lZhxXz;rr28Y31sOqyj`^{%xhO;bjrk#wpWt@pru
zK1XZKVzEFeh2uCxQN(@kj^%P`USK#J)>`<i((a8UNz4muHk(>o5wB00r<H)#y0HRn
zI4a=#e&KoEm;P@naCv=R0r*(kIF73$n5HSVZC7oH<2Z12!(cEF3y6>5Ax%e4DTV90
zyyUMi9-miWyWP_7_X&bP`~^H4uIm;61+x47RDS(3`ac2|SSFU?qzaT0wP$8#Z`3F^
qq6tJlBux_Q=LqXoKE9*l&+-lflZQFB?+Uj70000<MNUMnLSTX(tE}??

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/electrolite.png
deleted file mode 100644
index 55b314c5e6903572fe300f4ab3b119f4b4de4232..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003~Nkl<Zc%1Fl
zze>YU6oBzhadh<Gmd*}^a!W=*icsj(SFnTNqUcm88Ff;0l6L7+2zC&JibHAMp>b;M
zrQGFqsc;>{2k1>`D4yS*^M#We5)eWNA%u@+D{}v~-)u$h<NeKbI#0RWL{|L`pNlHh
znkxhWd%HV)O*Nw=;q~R&Yt}mU0VtM~Yn+|CVoBw40`l$yzfU5!ct-urH1R?Z<hF#Y
z`d$mDRBJ9QD@I8|SXL`vLYDod7x1_F!7wH)D+a@uRi1>b`&&L2og5!wt;HBaSSm7~
z&zVlfKBK&3+4p({thF@0PXXxn`(EKRthIEzT>x$iH>qYVeFCPFF~%6~xJPS^QVL@X
zyZZ;JZe-bhy<SIa&Bf<ss=oJEpx5gG@Ob#(J0g|q?JEG{I8HUk>+dOwA~&1O09Y&*
q0JPifmHmn3-4{X#A%qY@tiK=2TfZSeWT}7v0000<MNUMnLSTYhyR%*Z

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
deleted file mode 100644
index f7e231248e590aef16b7911e08248ceaa8661fe1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoK
zPZ!6KiaBp*ZS-aelsUfNDcd<nBU6P}@mX2{3$N+S>=1!1+qbaw>i%WCD6(Zs*tXWK
zA<ZH}?aoTMVjhxhyk;(f;qOn*O=p`o=e<<je*P2hE8p*Uznj1Ra&x?V$6+Q188L=O
z8yE!ISsN^L7>*R`C`_GYUMGJ#rLXn_N9fPkw+#sf3BB4=(|z>UY}3`M-m==KtLx7?
zmW}}Hzs$}SJ#rEEpRY?_C?xtb_C3Q!j?G+R@25Rca$#NdX~vCpN!7DNZJk`}!kL^F
zCjJ!cU}ZU!T(sxgwvWbauhxf3>WO8n-#cl6(*2DMQES;^&u_0;fB#w3xynkNho4^`
zp0z!E`-)TVH6HxSxpHEjO``hu???TX>#g~iV$~G$?$Yv1<F>trSXX_v=IT(9f5K|Q
z+jjr`^lpRI4mK4>l%)6<OtML9+qJh+|C8+dhN(}i1iDStyIftiZ+jXr!~Ae{?^OGZ
zJS~UMb{0uq{JZ6K&2ejmx_vjl&5qW%qw!xk<>~S7Q=VAYaa0v<{y*{jdnN@wZid1L
z2Fw6UWQ0gHTo&GG&u~Znz+Xlval!2TU&fSQ%=eBrx-7C>__{+(s&U>I_Kuo^Cl-WO
yPkg_}USXbj!PNYjpSRg70F`R3JB?va4Rf!${Fei_UkC%!2ZN`ppUXO@geCx_?EK&W

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/high_micro_laser.png
deleted file mode 100644
index 2bd8d3837da037939796bf6e9c74730fdc936985..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 278
zcmV+x0qOpUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002pNkl<Zc%1E(
z!Ky(~6ox<U(8R#dm4Oj&z}y3P1!Kuf@+u}Wk=e;W_m&K}FQB`XoVs072BJ8J*)luD
zaM2O%ul8UM*0=xGs<pvlu~?o=L{n6$G-R_`2lun@;q-edmx}G~AXDRt12Q$Pv^!nV
zx}uK^rs3%$P!%0LBmaLZ0QUPO0Qo{$<x-Czl}-W>kAG?v_XW7^K&SyeO0}yFj0@#(
z0{{$TSpXKfqWW<)N6&}@!TFiA!rud#-!A|Xla^Kiyy_kR7<`Y!_fMGFoMycm-alZm
cSS)YH1sm*JseF8qNdN!<07*qoM6N<$f|}cRbN~PV

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/hyperwave_filter.png
deleted file mode 100644
index 2cc610ad251dfc4bd509c42202e019b0fec34e60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003}Nkl<Zc%1E&
zy=uZx7>1velHev;ilLy3S77czkdj3*xo7hRdI7xwC$l@1E*%QJhvWt-1+&CW+{7$j
z2T6%q@^cdDk_Q4goaB4o^M2<XXlZFtz?r(zRINJ|@xC=|O24`RfGA!wpFcN}f|3EV
zJ7~;=rt*{X<cj$)V7K4Uw}vbhFG_VlA%XE^CIH)QjM*LV^&QnpqOt*_lYnu0-|aW_
zde*NAmD5qlKq_!N=zM;xwBtc%x8GoN5~6s```fE>D@q$kTaa=&u1aA7vP6Q>=}A|f
zo$o)c>gX362z{_aG&@AAD&|bx!hLa{HyMl&JIp_-o(H~vEqpxaKvHNjH-SrW&jZgx
zGGnpr(>Jn2BtT^OcdHs@JegfZ8;s74m93?86{klq-JE4w)i~KzW>*go1W1(>Y8!y_
pJ&-kWGx3`hFXG>XTUuIf#Sb(Do*`^faby4h002ovPDHLkV1h|^s)qmo

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
deleted file mode 100644
index c4603632dff5c79f7610e6bf724f687f2b1303e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$h)G02R9J=WmQ70nQ51$BC6cJHf}nOHe*J-dgA1`u1O-Jz5N>r5gt)4<wNnW~
zLcu_UGz$6+*1}DhNrYboK~@xD3#WyR1dVb>ls5A$=e*~fm-}9Z3mO_4|BSAiCXd%A
zDSZ#`?W&%qszF|Se_K$jo2(YqMudeve?Yp*W&s#97!);M^?J*Qs0ksF$Lo{sZu02$
zdH_B@-W7F2!y^DR8V$^Ln~;eC5d$)>wPye(r=}I_Pmd1(j2g#;X9^jp7E74zwzk>J
z7{@1oW(3t@Nyva+NCh}uZcJ87>!K+k*PSl6=vZ|TtgU+hIM@$&td}d5-WxbSJ!viQ
zZfq)Q-d<`gtthG@h{vMDW6`!6x!$)37MGR*I691U)bu5S-z==G0?i{oOC58W$pBz+
zI8@IPj-V5%WP-r<PFKA>F`$!R#$oH9fpjvVi-dwg*_JC6BB3DZWJ2gSFMJ1n21>x6
z<Cb)Aah+!?=cka%2``5(-vhIA^NQ~QHH$SgG&E$s0pG=fpI+{QRsaA107*qoM6N<$
Ef<rvMRsaA1

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index a7211231bb..5de4190a36 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -1,220 +1,44 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)",
-  "states": [
-    {
-      "name": "adv_capacitor"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, micro_mani by EmoGarbage404 (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "adv_electrolite",
-      "delays": [
-        [
-          0.13,
-          0.13
-        ]
-      ]
-    },
-    {
-      "name": "adv_scan_module",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "adv_scan_module_static"
-    },
-    {
-      "name": "advanced_matter_bin"
-    },
-    {
-      "name": "ansible_crystal"
-    },
-    {
-      "name": "bluespace_electrolite",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "bluespace_matter_bin",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "capacitor"
-    },
-    {
-      "name": "card_reader"
-    },
-    {
-      "name": "electrolite",
-      "delays": [
-        [
-          0.16,
-          0.16
-        ]
-      ]
-    },
-    {
-      "name": "femto_mani",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "hdd1"
-    },
-    {
-      "name": "hdd2"
-    },
-    {
-      "name": "high_micro_laser"
-    },
-    {
-      "name": "hyperwave_filter"
-    },
-    {
-      "name": "matter_bin"
-    },
-    {
-      "name": "micro_laser"
-    },
-    {
-      "name": "micro_mani"
-    },
-    {
-      "name": "nano_mani"
-    },
-    {
-      "name": "pico_mani"
-    },
-    {
-      "name": "quadratic_capacitor",
-      "delays": [
-        [
-          0.3,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "quadultra_micro_laser",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "rom1"
-    },
-    {
-      "name": "rom2"
-    },
-    {
-      "name": "romos1"
-    },
-    {
-      "name": "romos2"
-    },
-    {
-      "name": "scan_module",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "subspace_amplifier",
-      "delays": [
-        [
-          0.2,
-          0.4,
-          0.2,
-          0.4
-        ]
-      ]
-    },
-    {
-      "name": "subspace_ansible"
-    },
-    {
-      "name": "subspace_transmitter"
-    },
-    {
-      "name": "super_capacitor"
-    },
-    {
-      "name": "super_electrolite",
-      "delays": [
-        [
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "super_matter_bin"
-    },
-    {
-      "name": "super_scan_module"
-    },
-    {
-      "name": "treatment_disk"
-    },
-    {
-      "name": "triphasic_scan_module",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "ultra_high_micro_laser"
-    },
-    {
-      "name": "wavelength_analyzer"
-    },
-    {
-      "name": "scan_module_static"
-    }
-  ]
+    "states": [
+        {
+            "name": "hdd1"
+        },
+        {
+            "name": "hdd2"
+        },
+        {
+            "name": "micro_mani"
+        },
+        {
+            "name": "rom1"
+        },
+        {
+            "name": "rom2"
+        },
+        {
+            "name": "romos1"
+        },
+        {
+            "name": "romos2"
+        },
+        {
+            "name": "scan_module",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/micro_laser.png
deleted file mode 100644
index c23eea56f8556568887e45b1c071aa5493434681..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbDl1aAr*6y6C_v{Cy4YkF|zeM
z$vAa(?XUlzo*G;HKfZlE&+Kh$)K2ScIxv0x^?&t0tKR<Kx_bA&b|Zs7_GKmS>Wj`M
zDTO~?%<eA%0$ly)RIhWKl2KT$aQFZaC@3gc8}K!>9%$$9XFtZMY|XM`dd9+*1K+l#
z{IY6jY-~)dpDD%+1c&ct=A}gYZDZbdEXH}`oy}c;)_9b0Xr#YQN&o_ZzC~+fBt9&f
z@#a(Y@psJs_t*YDSMc_iZriM`nqOC$!7dLpc*DTZn&Z9Lw_#c?&}R&uu6{1-oD!M<
DE{Jj+

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
deleted file mode 100644
index 93b2d06f098388d6a153ab87f3bfb3836c5db4e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq~J+
z)5S5QVoq|RM1sMqhCucntAs0zi}@68F$OPN|F2(f+GNR79_H)~4GSC9=G6W>RND6U
z_p-nCZ!R;4Z@zo!z=Ic4TqiB|C}KDfl%k-w?vOxH73bl(A57S$PTedKw{Op32Q39l
z7Kgruiv|pvWF#9Faf{d*%*x`MFiC_lDca!oA67OtUft5R)dxK}SS=4GoOa}MS@zMg
zDTDpa&f@mO*JUC94*p$#a9Z8D*GUiNh8!z+b3?T4`uo&}pH7(E<g3^a{O|w7wdW<z
zJuu`+vE=c2u{K3VBkzB|Pw*24*6-~J%v@cP|5mS9(ICsX*pcB$wMEB=CTpgd%T6$!
zP-I|IIGxBK@<hSA|N7dL4LMxt3hV;1Oz+~t|HbdGV|C3tv~6jDeBR2LZqn=r4*02@
jUcuSs7mEm_Eldo@3p-lYD9C;X1}=lAtDnm{r-UW|TAiPZ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
deleted file mode 100644
index f3d1ff54dc93bff2eaf5ba08ed42bc1f64a49508..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 373
zcmV-*0gC>KP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SCrLy>RCt_YVHjXA>VQ!Pj5=V{0izBe+5s`O>HpEimNd^~q?-dk
zKv7Q>&c1)?Hj1N?9reMqqf-`1jv~ncAWN}12qZ2puEOy0<sAl60m&f%vJ6JUEPwXk
zF^W1+$bg~;MpMrL3W{J1vlzzTw`muHhL$=w1VENL`MH6Vz-fGrAld;SUxF;c#s{$v
z?%&FA?AR5!I5Le75OlzUo$~*WY<<o!?>z%n!$4x6p1p_j_buMW=oIVqADO1e0SfL9
z!3H?RGW?fPkOf-^qn9+z1gmk1^Fq-Bvy_nKL^%LC1Yj1%)TM)I6BkP`{fXf{IQYo{
zM2CQh^ZWlW3vV!70@G*q9*6r7$fk`0kSw6M)T77&v;w0J7<Is?14bP%;0^!)?;V+{
TP93(D00000NkvXXu0mjfBIK7k

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
deleted file mode 100644
index 11633f753de16366181a89d31aa9bfb16306b2c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 729
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|QgH
zr;B4q#hkaZY&~QgCED&YZ`>HL?qk0L3ulw|!5_jR+O94x9E_?>zAC<5OSm@*c}`6z
z7c*PL(d4M;%jGDzhA%8oP%lByLPx~;&{B@;91o4|pU_L2E}T9i^5D;TZr`P!%&a_r
z`D(590}B}jnRe!e#{~=pGJFhui)9ad`0!b%R!4-(WBKKxZ99Lewze2Nz0TF}q_lMF
z!_p6yXD4$UToP~Du;P!E$#&VM%>6|SUv$f3C32oUdgPvSmu=bKsQkvhzOp%U=e9pe
zQ10#Jy>aheW3JDysmveJ?=i|hGqA7_$ZI&la`Ne~6M8uh{e2m{v!DLm^6vh<^)e0L
z>%{(DFMV+Ibb;8CclB{?=2m?&Zyui2KlI;3JHBN`e2f3@;E&qu0hd3y$OW|t+?_My
zvQ^RV4Xs};cRMJ${7qW->iRFq3zpxc1loH)ElB66ulwJUyCh!bS_{z0@y{zww%blM
zN?M#Mo2>r$|JvI}wg81EzY+V}r)#>k?D(}$_rEojX3zMRy_a>>|2QwnkA+XIKh3Rv
zXv69AYb%q6Soex`O?%kwB`Vs~V(vCvfC!&>`Ym|g_0TS^%sv)_m)HMg7wq~kF?r_c
zfE~ZKZ8FLH%ywW>ymiCAiB$^4QQvNvE&Fqe(MHC~_ijn9ba36jegWk0Kg@Wb(1O8&
zkDcN8Lxz(56Mi$^;qN&7m!ZJ^Kx5s3$L<XirqtT`zveps{Qa%<_xMl99jyQCHBE%+
z(DTp1!k>Qby;{fcv-)-_hv9w;o3*#!vj=!KI(6jvoe_S?p2EN0spHqthm&8kpV2?^
ztn(YQ*_j_Z<rnN?e8=7Zvgbh^!w&fae;MAf-w}qoq0p|O{@8S}Yz2)O0>HG&;OXk;
Jvd$@?2>=_ROj`f|

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/quadultra_micro_laser.png
deleted file mode 100644
index cc907fa5e260d73a4fd22eb9ccd6a658a81d4ec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003xNkl<Zc%1Fl
zy-EW?6o%nfv9JpZf#?+oxq_%&Qc1+Z#vcTm+=P8f%WXvj(M}PZHl2~&K)NNBXqdo|
z&Tj1Du6AdKiHqlH4zsZH4YM<c1*Mcys&e|HNiSdHGsYKcME%jEhcUiTV_OHGud%fb
zj(omKt%$-~EpM$|jNh`1PvKn4&R>(flqAWoXIYj>rV<I6FZ*i7c$&@c@puf~ZnP5+
zGJiGHnyN~41@_Vu=iFj!ttH+C2%9h30OuS(n@~(4^F{aO_#*Z5*#`jg**gHk$E#>P
zAY{I%2i)vDQ>$+PP^)ipzkMf}Ml58$xCvfwT>|j1dn*nvBUHX<1I~y0h47Qt(^89A
zX1@3Y9KM_Z(0S^J!^;Sj|L=c=<%@2&J&guTr!W}A`wRRl`AR9Jlv1kVz5vGZr4}K?
R+4led002ovPDHLkV1n%7sx<%r

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module_static.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/scan_module_static.png
deleted file mode 100644
index 8715c96d84da28a508036c25132ec9c114efcd23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$07*naR9Hvtl(7neP!xuLpP~n8Dcb4{S{huOoP($-1##5Dr6C7#2?VETYN)BT
zCrL+jym1Uk-0le!;tFyRJoo?n?(t|C_|gW>hXPOrlmTUcWxxbPi0=&PKFbU@761k4
zfH(nKv&w|F-(>@|A-LgG#{!7sSWxlVFfj9dR8<AbvRHdb7m4e&4#(^D`S3jdtXT%l
zb*1-{E}({+Cka-UJr2_~%CbaJ6u3DK9t@)_fTKAE!Y8mC!JBOQ2N=`<{dS8es@2mS
z1Y79(4tLMPvyUU_0?_#rNN)ht@V0G>#z51AX_`v+6MGK)GI+YRENTUy3@8K2z+V}7
Z1NTaFA&9cTn*aa+07*qoM6N<$f&c)rh8O?<

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_amplifier.png
deleted file mode 100644
index 8753260bf7885d26ffb8c6eb218eca5892521ca9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`LHy=BYSY{1i&xH|k)
ztWA15w_)jdul|YiPR<RGRt(Kr`NOGlKIgLYe<C<;rU7;R=&9~2fBt{o{T8o7^;7C^
zMjf%4@#InU$?3L#^*-G#cJW=9)429${PqJvRlD!a{=9d^=kV4QbM~>GS*3R0w!ONq
zazjMl_jBf}Coa2iw<TTCEA%$gsonayj$gG`<Q)`06n??#2bV_oi%0Q5yFeg);k@&!
zKhM6P?BB+>S3clWMy6NTsTEp{Cj}-esyV06=UMrkIbvd>Yn#{tR*|2pokE`IF3@TE
d3)I=bE9d=2$jx`bjFTXPJYD@<);T3K0RX2ZdFTKD

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_ansible.png
deleted file mode 100644
index 74874a113674741c9bda0aad18cda235a47091ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 364
zcmV-y0h9iTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003qNkl<Zc%1E(
zu}Z^G6o$Ww4^Sv>wG@03mqK6Q4gn$BO~~qyrE%%d$u2^NKtbq`7bv)P^8vC6A;~7f
z9a?d_4wBF`x3n>!RPHw=hjY&V=N#@07z_r(F(QPm4vGDmcpVcb_3YHAQ6>4%FARcN
zrM_CBZ867j)oLB8)jCvaic(W{zB`Vq_VvpsITgZIK`?9R3cR7k>thdq%W+5?rF6P&
z;wUY|Z?4BBp{(cjbhM)q!dBkUqSI{y5JxHA{hX__nJ&G=)0>U1UbmXlT}`A+Ali5a
zT9(iId;q}3?K4s)G@Iv0ndI@7<-=sDt=Ca9ura2>3O+y9xxivH;N`AI-}R9)VKMp^
z@4J4U`!HD+`c_^+R-}vXV^>}6)3MLQQC>tp;!pnt27|%y@Av{dZnY-cY1SVA0000<
KMNUMnLSTZjaHtFb

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/subspace_transmitter.png
deleted file mode 100644
index d4acc06fe9d6cd29f064610278ed0ce53f0a5424..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9Ar*6y6C_v{Cy4N{3W!bn
zFkh}}MV^3R)yxy7bMzE+bRPcSx_bA&$<nMxUdVnBP<YY6FE2Ma*TS%h-G-%r$?MU4
z5o0zRmJe19lYXdQ>p3XP)O?I_%Np(o4$X`e{Y{1s+15pEZJ0P=sX=YaB?dos2i>3N
z4;(lUFd@JDjeyAU2L(EZ+xhz?)qHGvt{>z90t?j%jGNALeae-T00I`4l)x(oYPdE}
snQ&Cal3{xC2F4^ES&(acm{J%RP8r9j)L#6=1oR7or>mdKI;Vst0GU}=m;e9(

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
deleted file mode 100644
index d6d1f9d555a0a98a519049b70c227aaeb774217c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SRY^oaRCt{2)Uiv$Ko|w^FChL83PLhC2~I^QxTr-3!Pz0s-NePI
zDyTTQWe_^JXa=_yM=_2mh%TW+#UUv|SHaOG<^}Hv(F)(;rOUk~z3(9J*M!RyO*jT%
z00v+H$^iGUnc_N1-e}gI%V+*++o}YBa%XW~uElT6xd=9(TwV<3Tm&0{M_w!xm^ga<
zv9ASytZuDSoW!zNKpfj4-@DWc_!zy@!|h#;kbtZh!JHfAQy|Ll$cx1QRs!%(+T<QJ
z$F8*j&RaXQe|9a`_{ZWqFbJc3e<kSY1B79p9`A2xsj*E1iez!EQKu{Km^z&<>wauN
z>)--sJVjYKDF5Eq2S9?CBx~#bK4(S=fcG9`SMlx<oCfX*PzF2&J*&1>Ps@dvR{}ux
z7M{uVK4qc5JDs`#|31oq<;@u)Z#Z_X9bj(^t-sdV0sj>PFo1~zz5wcEiN3S}2Pyyn
N002ovPDHLkV1h-hu#o@&

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_electrolite.png
deleted file mode 100644
index bf7787d9999cfad5a04a5ffef24fd4de0b673795..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004_Nkl<Zc%1Fl
zF-RL>6u|Mnf>_+dCL$VQbh9LIUd&Wb5JJGor3e`u9F)>UoleBbN|$zNOEHVM*ttV%
zv=pQfDJVt<1;N5)&_M-<Qe$;^9S#J?yIgXJ@4w&uKHhyi4m3^EG)?o8H9IGd*0*No
zWNULna=A}|9KtWZ&dWoCnIY+nMhS<Wa&~@!T`KV-|JBpG9-<FG!Z2lQ{G}ueGmsk)
zv=2C6A~4)1zrGT@Ga3zS2!8pV1~8Zzl2p>fE|o|n&6*FvPv7<8Sk3iGC>-JEuOsri
z?PPjS2sJlwetFB(n}ez^BENlCHz1u(%loBmj;~+v`_BNA6PK*-Mc6s*=ku2X48y4E
zO{j+NY5;4m_W>vr3Vdw)#$n?K`QcTH#UcRT7m99uSKady9~}SrQANJ10X!RR;p!iB
zrMh@)ykfd_1?$NSvA!7BH_$U0c6|WPe#bk<kBrpJ2VkHV$!4>{qKLI@3G*?D$Kw+3
zrY4K<&YzDt{-RXmds<pa)A{-M+jIpNP%f9TZM$ZFVnO?wrfHg{X_}@z{Qd)K73U&G
SQak_v0000<MNUMnLSTYm&DW>^

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
deleted file mode 100644
index 54678e59150cbdd9b369d147265e3617e8a065e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SKS@MERCt_YVHjXA>VQ!Pj5=V{0mH)qF}3Ocamg)dp2<jc2f!?R
z_TVvtl!7dSlb;*Il1Xzh)Pdv(0g@cBf8R8)#dG&xWKh&o1&hJxPtV@d-T@#WF0KM3
zFQQmZ2_Wcz+SNV(?_atN4sLV+5{Ee=tD^)%e&42Dlsf=sIV^}ZwA8`0qJkpB(M|in
z@ei^HmL6aL<S=ZGCfNbVsrZ<qAw2Pc65YN<+ZY()AaWqKQ=Avr5g^M!j>DENNOk}S
zJlHA!|H#(o3=g4vkimRXf>_leTYhHmalBcOXa^{`KLi`p+QI-1f$r*9hSJu>a36yJ
zh;8lXM3Uu1I{-ZdV2)^>zXi@G$8w?_fE)tHj$MI^gDiu^^NnMdz%(hA6YT&PsIHkt
rlHpW$04>0%14bP%>VQ!P47dXTHfNF$WMu~G00000NkvXXu0mjf95<nj

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/super_scan_module.png
deleted file mode 100644
index 240ab514d764d165b0e09a42669a7f9b7b3eb28b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1182
zcmV;P1Y!G$P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*000DKNkl<Zc%1E=
zPiP!f9LGN!6py<{BjU1M55XlXHk(5rHA!JTENCHm=*<XXp=B>7^$@U!7J}FW1hI&h
z)?<;15KL(!R3#G7L2z{;mrZD_Mogg_noMddeI90JXVYw)$;|A&4E=pz88$ofzQ6bT
zy?-<FdjUZZ1VIo4L5Lv+N!=#InXXV*Th4z@YY<}I0D=d=aXxgTD+mXn0cgP>IXH^K
z;1vw(Xn*gVBU~F)$F*%r1D1Yi0M%*jh6B>a^f{n7g31n|iX%E4V4=tP4sI*dHU#K&
zK7<cIBIt!<V`B>7qf=jVV)`hiX)-%I8@Rln`WH`K<@oe)Z1n>fY<xAU0M`Hh9e~?+
z9ssa@=K=42P;I*teCrz|DX^hU-v_==E{>q)Z&>G-22h3K8Q!>hmQVXnVwxt~+uQv1
z<7KKVZkatf)KWEgFWU=8-!#p}XP3UaN?VO22u;ECTYo<dz~3^|AUS`YeDiqw-nVDz
z{Rv+F?n28;dUB|x&&fwMKa>V`uQtw4Pw#1OcAR?p92KHirWzy%r>HlV<5hph1}|;z
z0Jtrwvi#7U^gbLu!>|4D{m{uBr>|T=_2f{utdgT~05JD4-27|jq<4B^0)R_*Uuc~7
z%a^F^IQ6vz+<YGhd!J(0e_;{^r>Og_e|DUDZ3euwy#ru%p;aJ%s0-$AkTCxN(=;31
z@A~zNRyVv4nb%1yRY^Si5P&=p4FRPxq@RYlMOWW6O)hM{#50ShxxAKS`#!ulN}@JH
zs#`(&8~|&fY_RJ;I0Xxnr2N*uHbW{q4qn<%_%)(9LdBT_9_7f9<Cx~ozb#cs^t>6}
z95A=ox}34DAGnlX=G7<Hs5aSKGe{BD98h3m!63C)Ij!p7u)#w+uyYE1eQL{|e4N&}
zxw+Y~WuPzpHm!o1^|umR+`E0R<MnTl%jmrk>d9%;H%MlO!rh35dK#L`pl+?}3xYG*
zYYBoqIscmibUYAjINh+09S?%r`c&9f7(^R`-t;j`-#+#Rv7z&0R+L12vlUFco3Jab
zSfl%8P{5WiM1?qC5ClOG1VIo4K@bE%cx;II!?1As13>@d;FzbU$9IFqLD-)V0iic&
zl*-X1U+q`B{}U>}HTxLbAOy!CX>U@{(*q28``-%wKK39GZU}PTf$De{YG<rHWhuw@
zeQfCc0lM?^b?r}x3jYQ-Wtqihe?ScIXY3>CAHMSQqoz&y`MTLpdit*A-k$mSQPal!
zeBJzi0Gga%Ds!z=rcx?XcYbb_pTBYimCLxF&=$5iKVLWA!$pe>u;F*87miN2`T5_x
z&7aSo;85)|mj7tO5M=j&g-I*jd-yQQ(RcFm`}$s^`tz)-Z}))OjCYE-PQ3RA6xhIE
z)&6EJ_YS*1x6IFvnl|R=>n6}D2x787;Bi3r{s7(jVTs~lT<jkS>m-W*mI9hq8o3Or
w`bE5ZLAWtfXMVn5Bg2m%2!bF8g0OG?17)@3(3V13H2?qr07*qoM6N<$g1$RElmGw#

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/treatment_disk.png
deleted file mode 100644
index c8af1657dd9b445520381663727a1d1fcefe4ec9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLAr*6y6C_v{Cy4Yk1sZT^
zFeD~&{?{~Z?v&zN$YL;Q732K%;cKHDHdX2@iHez!e>$O3b!H<FJlt_EM#PMn`EY%Z
ztW$vEuA|X<jz?M-D@>EWKJ)a4GRY%?c2xrHJ~Jw2G)A-wybVfe&&h9&sF-Zs==k?F
z6B`Je*Se&mc9Zc1-$Aw$p3EYRi4%F<4{Ctj!eha}V3TBSw_)lo7obBKJYD@<);T3K
F0RV%XNPz$V

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/triphasic_scan_module.png
deleted file mode 100644
index d3e7d72b57de409a078622ed638518a3d732bf7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0006$Nkl<Zc%1Fq
zu}Z^090u?&A|+$jZh?-L4lbo26dZ*L<_W~X#jOw0%~gDY2o@X*nTm^rQWv2R#D@ri
z)WyWaCh@Mh__yu%gACehzPsL~7vmj3L_|bHL_|aiY+zaR^Iz6MBHL8{Ug=r{fk@*4
zAOtKMScZTlRR_uT!v>boAz25hY!mrwjU3l?<Io4s!-?z0uX&zV`DomxeC^71yT`db
zUaNh;_x(ygfNjfHngfzwGt<c!jYb`pM{j5}>hUq1j5Eud7UlmulKE9qX}=Do4hR7&
zn(zRi-<;#@;2r(ue5GtODVm%ZvpVzU^hx_YW%85fD{6mM`6B9fL5bOZv}ob(xrWiA
zl`8V+`zvKlh&n&nsEhkU0KmN6Oyx)AOb&n$u)-jSJGH3&Hn0qX0IK=w9pE^r6Gq|Q
za2Wrt)9YoHEi3P;nzx&HIlqcKq0{TFT&<?^ZO2J{sCn%V0n2tA<tuPswF1ERNKC%w
z4hE^R$ug!!VcvOKvjuQ_jn-^|SH<_3%m-H6ubXZ3E@(0tSAGk)>-j1CLrgF~4*r^O
zrJu)$We0)G0OZ3s`FtWGA|fIpA|fIpA|j$4ApSpD;X0I6et&>8$@TgFf%NE;&M%Am
z1B7vZfH3VjVB6N`OIv#q{%w7}NmZ`Tm!`EtMrVD#$q%5)_4(4YcF5?g&o{k8rmFS%
z(v<cG<SAO8Z&H=(^QCcrz^0SF)TQ&w+UQ3S(S*C{olpuN#t{(_5fKsT`2<bXTUQkR
RG2H+F002ovPDHLkV1nFtGbsQ7

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/ultra_high_micro_laser.png
deleted file mode 100644
index 3e65d639a5e4b54ffae58b1dc80a0bca025b18b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 304
zcmV-00nh%4P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002@Nkl<Zc%1E&
zKTAS!6owzgq2c1BMS}PToWv>o1`R<HG$_>6tT+bNr)aT{kb|3C*G2~~^aX-af(sY7
zy7$s{-NYJS!W_=C{5ZpT-<NX^KQIi#_-9f|(?zSDgyH9=4x=yT-b~WUC{3kGjUezh
zwG(F*8J+42NvCs@Y`>~j`Y(eiNPFw|@00Bne8&+Jcf7kBSiZmV`v_H}0E4?T7K;D?
z-(LYR_hwQ6=>{G>mvZ?CfI=b9)5laYmjeLYK0g33d>hH;a)55L^~3zSc)r^J0KMuJ
z0G9`+vN`O*S1e6n;*L}G#tFH@V;m<dn;V8<7yxVAOi=C98A0*@0000<MNUMnLSTa1
C_<}6}

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/wavelength_analyzer.png
deleted file mode 100644
index 80cd9107858ed778a834503c571e019f875ad73c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#Ar*7pUNYo5WFT_v<Niz9
zJHAM*vu!AD&v82Qs&m&7r|o>PF*XkQj};%O1hqKGIZl7SeUHGT4^KZjxVZGZ3%^u-
zcbn$ZbI;zqKJv5Kq{ga1=8f!)NIlEvmwy@<+1fI^u3G$BkKxSch%ae{49{!6ZC}bb
z>k<P)ZT+uX(bL+WYW@~DCSiW{l#D{lhL!gG0jrrq+c%UjxVpG7#4QNXD5?Dxz60n^
N22WQ%mvv4FO#q5fTC)HE

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg.png b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg.png
deleted file mode 100644
index 039f891c92df8e794eb3933a12b1c7e0eeb59419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJG*1`Dkcv5PuNv|-DDXI3%(8Ls
zzZ_f;<R<p+BDX*<vveMxRim2D|6bpye{CEL37eLdJBHpae)jHec^gy6)|of6<&tIk
zZd8doaZD<nHf7S3y{9UtOf1iTz5K1bfCB>~i_d><h6ha64pL>h)iIqw8yP%Z{an^L
HB{Ts5dn`8z

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_armed.png b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_armed.png
deleted file mode 100644
index bf8d24f254b600dff2fded3a3b3815a9a832bef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0003CNkl<Zc%1E*
zJr06E5QU${+D<#Sq2vM@`zgE-x1#g_n~?PaTwo22jgiU@3;!U}%rdS~=c|BZ`CeXj
zCjcmlq9}^;uZ%(#8DpCJwf8>g9Yc`xk3;1|1S0B$iGj4AT|m3>s;WAnVj%5jZ=XJy
z_kLuIX<{4)Y5#;PCn5mP_HQ&XN_dB#RR91aNzxY}8q$7t0oGcSW%;;I(^MqLr~K?8
zxY!=x^BH_T8zc@z+RrZF*I*xk{bml++Jdo>_OlDfvJB2SSZl>XeA3S@0JsjK<LUhJ
zJl1Eiq(68DxT1zD>d@tb*%dW*0)8EWp$k{*sbmf|OCi75zko=ZFYqghq9}^;J6r%Q
WdX}BpOS4b_0000<MNUMnLSTZxwT%M+

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_ass.png b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_ass.png
deleted file mode 100644
index fc52d7064bcb6967a5b01540248a0e1562206a57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002lNkl<Zc%1E(
zp$>yE5Qcx2$%SNlfOA-0VE&$h;CUi^9|PHh;AiKWpvjhrIi^ZRHq+|`LqAoTUhivr
zr9dK)*gKgdh=^w2cFu|B@EoMcnHkKylG#Myd&T28uB0RcZ{NRU&bf?;X322`1rX89
z%s>5I*NG*LA%g*+swxb_0BbF##~ZKb6gowmKwa0X?>xV3E6_B}(r()}Dmfsy1=<Af
zfX1q$1dK7NMJPG~pBw;A`FZJ={0GD}Q1%7NzL18;3uqBs1D@OUt|FlJ7O2=H5{X^%
Y0jhvc&6lem1^@s607*qoM6N<$f?u(AkpKVy

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_locked.png b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/chemg_locked.png
deleted file mode 100644
index 9c6bc8b16472ec2203b0d36b30c798acac5f98cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002lNkl<Zc%1E(
zu?~VT5Qcw@uYjAk5GE2{!2Jeah__<&0h*BRCQNQ;SX_*o8w`p<Wa-i1K)<PN(%yHy
zOA7=7fwdE9HW5+Vk3~dvM$bkYoSDJQBbh}6h8Z_aGm_Hae0@{FL?j}jR#T3xYj9=;
z@Xh{BtCesP0DvS(rUcYD3m9Wi*Y#(fW!WqN=O)~rZjdsDl<};<Y60Ikm*9Hbfd(a5
zT%aflSZiU7`HukbYQ+2F`LnKh2h=@~S1Ix;)o!0J;0sj=0N{MMcoFdS7kIG=1Olt1
Y1NF>F{xU|(g8%>k07*qoM6N<$f+pB;E&u=k

diff --git a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json
deleted file mode 100644
index e714e4dd5e..0000000000
--- a/Resources/Textures/Objects/Specific/Chemistry/chemg.rsi/meta.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "chemg"
-    },
-    {
-      "name": "chemg_armed",
-      "delays": [
-        [
-          0.2,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "chemg_ass"
-    },
-    {
-      "name": "chemg_locked"
-    }
-  ]
-}
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/bar-knocked.png
deleted file mode 100644
index b00aa4f6987f0424df7a4bf58b0cecab22150054..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<T{z*hZRCt{2noVdEK@`XTf+a<}exxE&+gb!g$%+VqAE$z#2nwDA
z&xIm-DD>t*DD)6df(J!}o&`@r1yK;ZS)rh%2}%U1Z7rdYTDw&ns;v8_JDW+^FLxJv
znD@KvY-aQ3%|9=1-oo1o&0ztcIV=D)hXsJ<umI2;766))i2&zvu;tiPEZ+NpEm_zf
z+TO5V`rY{aRXx4^NCEckGHhdSA3jy4eHWw6A8!Np=i0>mNwd)SZs~)4t5#3tWU(`6
zcjb3__q|Ks#Pw@^oi28e2;?_itIJmC`k?}lk<%A0q5sS&+<!1;w~FAm`4!9Z=FJ1$
zC}KXb2(<aL=FujbdBZ^E%dESmzX;NAV&cU!J4}Q?0i==M?k;?uo5Rf;1HK}tbQn9D
zoK<awMNt^7HiuWY!TQtgdf&dWgL-5B(BWe?`AR;|&M$!W5GKNZNrF;HjKfYMf`m4I
z@$z}^o;FAXZIITK&jb-m05bA?{3Wc#8SlR(_+=puj)UkQ8ATQx?CHUsk=vk%Qjva<
zk4~hbaKhXWJ%U&QkRjEWRMmR=7@NiQ+DDNHr<^okT)8Gbi?iWYVn;yvT}h~`Qo!c%
zu=9vFwwwqfCfs|9j?5##Jqel;SwT7f!=M~MNhu4+&eefIF>d658Sl7LlVBVo1)xQe
zgq8~BfO5i9K;>@7PYk=cNG0m54<k?jGD_K%emxT5$=IXFg;uSVKwH)2=|m2;+9VMw
zwKXx8IiRY{lgM;jQxv>@^HzwTs1A^hlL&I$I`0-BHWegPm`s++*puJw%`Yr{N195I
zzFTyvNh*dUv<4wJ?^g**5hzkpRf0s60V%@Nx~R%vt}S|VS-cC72t$+a|M^`Y?%yqw
zLP&MQ8D~ybFI9f<>o7Ej1%T$T0MHy30Gh)BKyz3CXbuYi&0ztcIV=D)hx-Gf9^n1}
z?hoMpfYfk*0QU!E5BCRfe*pIfcyND!GSB@1;Qjys_Xos;Ux%SNEC4iz1%T#gFTh`@
WB)gqy#i5P>0000<MNUMnLSTY3yMw9#

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png
deleted file mode 100644
index a665b528f43d69a5ebe9d3e511be1a9eb3a9a420..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E1o(uw%E`&e$jEqldM;eJ@Ybzcm6etM|NnP!anaM$)7RIRl#~Q2<b9oH
z0;G6Kg8YJkvM|6PbpPBrpg3oNM`SSr1K$x4W}K?cCk?bX#nZ(xB*Ojew1d-{6?j~g
zC0PId|36niZbd@Lxe~+J0`a5E`m0xcF<JQ6xh;W1Xg>FWCj}pqTsrQwa4XrLzqfgE
zsbHGDV%6!8peHw$&s`Mcee3+G#g5;mhuocEuQ<zc<@DC)>IWxkeeXJY@z80V6Q5Kp
zf}Rw;>}Dw{kE^I>^C)G~KR)Tf^WYUL-5kyt?>;hHq5X#Z^Y+Iv3+Ff)@P0M!P0s$O
zYQ?oWV^b{WtTilCOr5r{{XF+PUWt{<(5m*(gCq`(SCTs<ROfx4YAyJsmWO?Xwub5=
zw!roLf)}>sp83_}#hO}~xh>(Zv9ke7r=moYi}r>8+7GY%7cH*KxOe}{|LH#;YVCOW
zKjO^Kg@RxH+9#jq?_KbIpXBc9`ne0<|Cg+;%V4SffBwd2XY~u;s$YQwb{u*4yZ+ET
z`K|-+{_B5cW-0rBT-@+^yOKr5uX@+hfBytb4*S2qz}VhqN&RtwKl>Bz*E5tZo1!~^
Tp-}@c5*R#P{an^LB{Ts5KmY7>

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-knocked.png
deleted file mode 100644
index 3cce791dedb3b7947ddc9a50952f959a5e2327b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 535
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`1E1o(uw%E`&e$jI2)+2!Qql$Mr;hK5d?HqFJwMNdypUteERQWB`pgJ(`9
zkm4x`@(cct01QI+&z%E`a~60+7BevL9RXp+soH$fK#Nm6T^vIq+}}<+IIUTM$5mN^
z_3!`xa|Ps9B$S*hF^nw`Kf0{Hdes+`g@2vf5;%nBb02t8@G;4y<4y~=lKuI6n<tkF
zrr9f2oel|la%1`2MM2)T&YxQB_-%T~-5K_Zvn*FmZ+)(QaH7`tuA>(Zoz^+=NyQ@Q
zNzu!0mZI{wih4GWQYQW5lO8+|Ua`{6;hgdABeNCSZ^%Dye;l)Lj*|iJSL5E~?0>3O
zT&puS#d6MC!!pIxX$#xWbI;?ISh)<XY7ad~;?Q^{xkEyA-uJ22f?sNR*jH$4s4ij)
zT+c6fVO#E*Urk=Dsg;@A68;)H8?baLN;J7>U-+;6@XCMD;<}7`_rLs~{_~;Mj+g%<
z&iq^`_~oyC@_GK=1@HGs?yjz%yWstQ$?CccmfHX4Z+v!EzwoX46-Z#mk$1oA56zSB
zI`Hnl{%2;Evj4}$4WG9wS!DdGcRl_0Pr&4`|N9G!?QNFS9~bzuKjD5oL+P?9y7Lzr
RH2@=l!PC{xWt~$(69B8Q=(PX<

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
index 1616f665c8..4a79455cc6 100644
--- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
@@ -11,26 +11,14 @@
             "name": "bar",
             "directions": 4
         },
-        {
-            "name": "bar-knocked",
-            "directions": 4
-        },
         {
             "name": "chair",
             "directions": 4
         },
-        {
-            "name": "chair-knocked",
-            "directions": 4
-        },
         {
             "name": "chair-greyscale",
             "directions": 4
         },
-        {
-            "name": "chair-greyscale-knocked",
-            "directions": 4
-        },
         {
             "name": "comfy",
             "directions": 4
@@ -63,10 +51,6 @@
             "name": "stool",
             "directions": 4
         },
-        {
-            "name": "stool-knocked",
-            "directions": 4
-        },
         {
             "name": "wooden",
             "directions": 4
@@ -79,10 +63,6 @@
             "name": "wooden-wings",
             "directions": 4
         },
-        {
-            "name": "wooden-wings-knocked",
-            "directions": 4
-        },
         {
             "name": "ritual",
             "directions": 4
diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/stool-knocked.png
deleted file mode 100644
index bb8d71118729d70f4cb4e6f601f7d022ed5cf6ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 682
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qfx
zr;B4q#hkaZ9J7TTMUMYx^<J~fQ6s~n`=zVC=Zd4<^Bn?p_Ex^wdX)dd?DB)}6~3){
zu=2v9kPq`_x2SY<1srJ$2=H2dNiXnPt#J9~n>lxH8eKe5z5n!?oU-(Lf1c---TQE^
z!BUA~hB6bFN>({=H9PeElKWTg_32sv&SI*cc*xcL_LG=d(i>E7{rj<SVpi}f29pbO
zk47i{{ye=be?#x{U29lu=eTPGJ<Q?b-@hx2wbEwpXRG6R|DD2LK2rVFUGVvvZOlyF
zw(Tpv%IfDP_Sif)`fGAy*-wwex=rEny9#Y@K6qw*ej10#Pp?cd*QIRh>}T!h`Q&tT
zeQ3$<ZF^gzj_nI(?a-FkA!j&w_7PU~{<3QGkC9cSK6fs(Bo(rC^lUDx@blmIb(>_B
z!=$~LDgT6*FrKokFj%nNYJ-}SOi_8%*QfGaU-dp5bA49m_DfWOIkWYc<WHU^xUUar
zSo1$>D^%OeP^De7B!MZn$!#mQibq1%zj+tKZp`;g<eK+&Z9&O<`Sj~=Us*hu?Im{P
z*%SV&jGy|1x6S``H8lP~g@MTS>s}@m^-mom`0wocXD##Z=fBGr{%$**_^Nx+>BfQ^
z&-MPv@Eu=#L#1cY!SLDZ+xIRAx$3I@(&5Q&?%PLLdHG!~*o!FgXSnjY_{6a*^GiIf
zu8C?oS^7<S<7?g&N4w^PJ`RRw9So?Hnz?6P!xMIoI)@Gr*<d+I{)4;%BqBlaIZ1xP
zSH_e49ST1gC;VYJ$^Ro9s7Td?!N8q`q4);(2kzA+3)d727FYojAA_f>pUXO@geCx8
C5He-}

diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/wooden-wings-knocked.png
deleted file mode 100644
index efb9b0b915457a5f393a9fbe3a05a7e56138990c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1400
zcmV-;1&8{HP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<WDoI2^RCt{2THj9`RTTcVh00PES3nG1<cCloG{&HWRD&90Onk6O
zqffrI57k!_eew_RssBLrp?&KUrpfwXVvJUiCY0Eu23!_Upj{{w7F@OqVQI$u-DSpM
z*qz<kot<4X^Ch#~Vdma@&Ueqf_uM(B1}=w309+1_0Jt0;0dP4y0`xb1ZOux)3enX~
zAF3Eub<hZ4#S5LyIP=08d4Fy44}9|OFut9f!FwHP+?-D1%ZqQ}t6RS))k*?&IFu0|
zpR2_W%eDA$WDsBfIE7C~UY75ytgRpnXgbueQcIv7uQ&NIyYIv7gH`z=D~t){FZ7<o
z^?NC){H?nYNs4H&>PVm-l#Mc~BwQY<lLJUyemc|(@PPw;Cs40!?4&Xl(9}>bln1{1
zeO6N{y1Jo|MJmq<Y<P5_1HOO$Mzw;njSh56St;}Ndz;b{Xw63k?A3mSI!glhKwNnn
zr}F<7P}bG?+ykW_XwzMw?o^%lO>6hnJo+jqqw;LGc5l?dh=R94Rr%fYE~*uj&0p)c
zG*G4l?CtLz>!8}9lAyw<gAtad0Fh}tg=z$4GY(QoQ$Wui=at{$8gQw%Ub!)!Drvj4
z+6GCGYrx}-thQS~bNe|Au0~kQ=?hTk+F%IN33gtZwM0)e<H~SINpHuHiwODvgP~R-
z+W<BnPUqD@4@+x+y1H_knTf6EbUP=Wh@U5MS^oTdpAugBZ=22MK<V4$Ue3C=cSxdN
zJoD#tbJcBHzXN2`!3gOI_O-Rh8~y%h1ozdp-frnUj7OG1#)I2Scs`WfKX@El#>o4l
zSc}}p+o2{j*7%?&!VFYAaiE}~A%V|6dJU7`kDK<h9qg1csU(>B0K^Bv5#nFr>}4z<
zo=izs7>5stcV2A6*q;m1ouo%ag&`VVI5;U4Kik&@w07aSm)f!Q*F*W2V0kXOh~}1d
z)U0n}Wji31XT3t)XTGx#YE^n_p31r*(FWV1qU=-O56i*RC*(c*92YZ__1G6J^zu*u
z;rXY+6&|1~tm)Q&O2M6YX0g;f!Hpb;p`T|Kg*&+?4i-uD2$Eh2ZUMnY#N!8Ygw`T)
zDd=2uTvLMczrQ1Z+2tJ!o$toN)S?uqQ1IOzAq(ryin?s;?m<W@30{YN?C;-~<z%uE
zon7L>mMpI)lF|kK?a?#hFw})>#>0@XMC~x7XP&1d=**O-sLV6|rV-xJFKBvm=6v_#
zi#NM)_18r?|8K|Qc;oag!efP*y%BP{h>LApT~hb;qkSNjO_oggrd$g*q?r>OP`$2d
z`N$$z$_ekv@L44mk7)~+v@H3=`YxcCLv2GnuCouWDc?-Z*>W1S?TZiv%4~lD@OWLw
z0m};5CKtxd#e~=nAK7*kxAl`4_vuT$F=e7e=O-H`q7Qt1HaJ#B*#1rMMj4bZXWQOK
zQMeo)0dP4y0^o9Z1i<C+2!PAs5dfFNb^=PtF{ng-f~^D;6Q9@Dtwer;Z3Gk>pC>Ar
zpJ1y66ce8(Dw&^9mPOD?e4eOeeuC`;SdGt{!HN6?TL~y8K3^!xm7id{1z3&Go56|v
z1X~FxCO&TlC-M{W5>W2=ycwLxPsmF^x#RO@a3Vk97y(Yl=gr_menM6Ya56qmR5Cx|
z7y(Yl=ZQ+@CuFq%C*$*nq*p9IA?G6KRD53lze?mMWF^4K_<XK@t)kfcgn}KRa>eKE
zLb3S?1rt!N_`IDcCO^TFD_qUWtFS7g_fZrsherThj(-6$IX+ur+12#`0000<MNUMn
GLSTX|GNpO|

diff --git a/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-item.png
deleted file mode 100644
index cbc452f8c264f68150ca15b7f33106b0155d4776..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003#Nkl<Zc%1E(
zJ#NB45QU$A*d2=^GDxI|ER@n+PLP70iUXv|sZ!+tRP-rwf^@DeM1y3gP}UCEDV8O6
zgv6{wlxDxi9`EzKC(qgj91e%W@y~cR;>9d&E@`Io%&I3_yqKj;mai}B((%YD1WRbl
z-#!Zr`uf^tr;qJ=&<7ssp;d^GBg*nMKK!C%Y}o98<rYX{eg3*F@Wg3)#ODf)Q5#by
z@lS2euNoj7k1&ab9V27b4wb~fB+?_`!Ww}If&5rRt%c}}&H{D-rApl2-awTVRMp^X
ze>ko6!T=;ZkQ7j=1d+Uc0015HYG40a4FFUiDQsHuH{oBw3NW2#9+3n|0TSn5Z!-cS
zY4ssuKLHa0&@&gIzEy-idSReLSegTt{{jGbdAw`P9;oUAgddzjJio83`#BsA$2Ui8
VYXg2sEt3EM002ovPDHLkV1hr4pT7VA

diff --git a/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot-large.png
deleted file mode 100644
index 5b3936c1b3b060372b5c2cf8522be831275889d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003|Nkl<Zc%1E(
zKTm@|7{(tc!ZjTXHKB`yIPx`&Yp2eBxW>6t*Tzra(2bdBIy6BilNM`nXzuQPuLl~n
zaqxZ#;l01l!~1doI2;a#!{KoJcRaIWKFOO?3XW$5(`1eLByWmxeM)`gS;9=HK#DK@
z3eT^HzTp5WHt8Dcnt$EDU?zMyp(xjwuI%E&!SRM&;*T%-GMTO_&@2aZFpUq3(wGZ;
zCPvrFm?9rW?oCk!@+<*L;2u?{5H(Bh<~TJYA0Ul&3Gh&H1Js0-eoKGbc+31eOIVv3
z*lf1A8lCI*w$^d2Pv_h2-MaZ%&{MGp^#K!6$TWnA>;}FnTJQE&1Dqa-^`6uWKu*D5
zp$v>?g(pPB9MUv?7qb*XMC?PvGGH?yq4f=e<HXTEI=4$4u>1=E;O^$Kk@at@eZA)|
oV(8lqN;4w#aJzW=c}jnq50VUn4#!VUE&u=k07*qoM6N<$f-^F)ZvX%Q

diff --git a/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/claypot.png
deleted file mode 100644
index f6633eb3c53796c030845b68bb03ea7c909c8cfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 377
zcmV-<0fzpGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003%Nkl<Zc%1E(
zJ#NB45QU$A*d2=^GDxI|ER@n+PLP70iUXv|sZ!+tRP+=%K|0q~lm^LAp{yOSQ!GpD
z2#HyVC`I;b?D0O&d-AMpz~OK>91e%$zvJ167qhfEr<u+(tDbD}VwN^pzB;Q*$0Mr{
zETJ)9eiRt=^|kd@AKUey58Ty5s}Lbal;tbD`bEdsu-*c18z71G`SYg01E=W$pDQ#*
zZA_iS-?cfvXn=G)!Xz4YjEq@3R1yP|NRNOEYXl|)@<S1|7NQe63)lgaDsg*#1yxp1
zRfEsn{<zi)1Ca1QQb4H^MDp?h0Cdc&UHxM<08oLXuxZKPguewVz;vE@L=q$gNSuDX
z%?OC3)rW}v1WX7(&s>E1RuTH>g@F!XX%1Na3jpBh{-!Z|psM!}esB!&`0{Su@6Y)H
Xy*O(FPa^nD00000NkvXXu0mjfgB+yl

diff --git a/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png b/Resources/Textures/Structures/Hydroponics/containers.rsi/hydrocover.png
deleted file mode 100644
index 3f3a4f8ebd924c3ee2950b75fb5c5c85823d5e8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1406
zcmV-^1%djBP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000F=Nkl<Zc%1E4
zYfKbZ7(I7pXJ=o)t_s^`6}n&rs!#!eQlC^>f>x|CwpOAxnzXTv?GI?0)TV8Wsj0yx
zjZJ7srS(CjRzrjcL8&Mur68c9$it#ig@6P>vb!*ko#_vpadzDpwA%jhB%AELXYY5;
zcfW7HT;P8O(JmYjQTYI{c;)7?GspHCmHn7`86zD{)mH6qXQwUqwACLs0l=c{O<ZkR
z5v%1FuHM4`ezZWZtdr7Lqq*iN0HC+0JMTUN8}fF2A;-<{6Pr#?*T0a`?}0RCq-j=i
zyMh5gy3wU4)1UY1039<jpeJE7d@|u~cI)WyC;<RQE;iAjbCLxB@Y2K!h!W?eP4x9P
zQL;xe=(|o1e3Sbr0O-`r=Plux^L0@x)~^|!GkscUxYcAKgn$qNS(Z_EIhOnRaD|Sd
zC@TH6C1OJK3?|%a0swerg4#=w!pSpd8CjN*^Inc@WEp)@ltT{y?lDffcw<ngV|lj!
z=1rX|E{StQMCJGPbm!@m3}yxEnNC5F%P$W|r43goQ51)a3`0SdXfMw}ck6Eh6)}qk
zfb#N_^y#+PaqSI^cC<2K@rmL%FUmjsbVL_4GfpfzeaQs?kN`oFX^ORYXNFCqyF4!S
z=2ZioC#$gS<IUqczdc~BE%}ZGU{Sc_to7X4$^$+%*6yWbZV(!)_A@94qwp!28%Sf-
zev|gh(zia~*X6zA{cOkgz6PR`mdeig3klEj%pKdaQsm3oTv}QJ6FWOjaC_W3Zk!`?
z=PwYrks;bM&MReMB0l<3Vhv^xLg-lu`4RxgvJBQ_mT4nPrM|jU2$>QhUFjX9&y^k`
zd}z4L^E}*PGo-{<-V}O&+&N*Ov-vmj-0SPctR@4S5aSdJ3$_`TugG-Qo~W>%C@K0=
zn}x+<fy?EZ^m;+|+O#EatR4NO<&?pZzS3j2g_whaZSI;=hYbKgX<}0}O_T2aJJQ5T
zNBfHdfXn5A#bOC47KpDaE2%fKj8+E}fmi(w0P`}|N&xW3rK<pd*wie+UpSD6zxadr
zlx3S_ib&|YJ<0(<baJLkHPBRDLdhK$^wCZS#P;*X_J&GE$siDv;FIMgk(U}Piip(H
zrMuogLZqG!UFX><i)sJ>NX(1;SGx*{F+Q0G074Tfkcc+3hvvg$#M07AJ;GyTWlJ?c
zQ50cW7A#}}05qW`{~(j8c_7{&4x3s18>$9e=Np+1-(Lr@=P%0tz@yYW5V$KBbgNcn
z@dNE`w2y(Lj2vmo+!XN{s|AtCiBfE8mN3<HZ|*#7%>yBQ%@$0JPZjM`Lx{l{BhF4+
zey<6etBWZBu$l}2fcAz;=4xM`R~uZLX&~_j@j+%IRr6~B0AOaAl>vaZ`s030NQevo
zVZkN}03@$OKWfeW`P-u&wdwBa_%>luM$SaT@ge|VQT8U`&Zt}es5STJLxYUWvUflC
z5njA<^SElDxw@DdI@iEl8yJ==kCckFWkpO#u$g~cbD;U$1y4ocb~4o3z_j-cQdDo3
z`OLAszN0w&r3IqXZu5B|J@z>Oz-hOU!J%PZS*r%zoFF3rp2Qr`LN#!!sn&aKU|0qw
zdLWR<znKGfdjN{YeFgwv_nv*@xm!0HYRigR0bobL!Dww}+Uwj=a4=f=Jg6s>7!`%v
zTXMH<H0<89&*vqj*4z;hm7nu<u>b(MS#hn`28I*MYwF!A($mb^15UfG<!&a4{$hbR
zC5F>(YuR0SF&+SlKgnT~m$Cn|{O$Wvcmn9{=|1#d=sd+!JjJB&4_CpsXcmtY+W-In
M07*qoM6N<$f+LcoaR2}S

diff --git a/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json
index 59eb3e9dc8..26d4a2c312 100644
--- a/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json
+++ b/Resources/Textures/Structures/Hydroponics/containers.rsi/meta.json
@@ -1,32 +1,20 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "claypot"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "claypot-item"
-    },
-    {
-      "name": "claypot-large"
-    },
-    {
-      "name": "hydrocover"
-    },
-    {
-      "name": "hydrotray"
-    },
-    {
-      "name": "hydrotray2"
-    },
-    {
-      "name": "hydrotray3"
-    }
-  ]
+    "states": [
+        {
+            "name": "hydrotray"
+        },
+        {
+            "name": "hydrotray2"
+        },
+        {
+            "name": "hydrotray3"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png b/Resources/Textures/Structures/Hydroponics/overlays.rsi/lownutri.png
deleted file mode 100644
index c8e64c4f996998ac51af81349948ceae9a17299e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkcv5PFK^^Mpuof6IBDt`
zznPtL6P7LS5LxQFAmGXR!sfO49-fm_JTKjsRqoe3xVd8M!n>JM8l)J$*Bm`#5iVo+
l;C90_b9R?lsSSUn%NArvPJcJGQ50x4gQu&X%Q~loCIHyMG8g~=

diff --git a/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json b/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
index 130495918e..9e32ca3cff 100644
--- a/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
+++ b/Resources/Textures/Structures/Hydroponics/overlays.rsi/meta.json
@@ -1,84 +1,81 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "alert3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "harvest3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "lowhealth3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "lownutri"
-    },
-    {
-      "name": "lownutri3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "lowwater3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    }
-  ]
+    "states": [
+        {
+            "name": "alert3",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "harvest3",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "lowhealth3",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "lownutri3",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "lowwater3",
+            "delays": [
+                [
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Power/power.rsi/eightdirwire.png b/Resources/Textures/Structures/Power/power.rsi/eightdirwire.png
deleted file mode 100644
index d0786fe1d161ae27a8c8fa148ab21febe1348f0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 389
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7i
zo}sY`b95C@(N|9w$B+p3y%V{)4l9VT6sw(o`O+pJ*zB$LwI7wcv)Edk3eqRZ86Gok
zDUf5*T)J|1!T&l9=d1%~SGs91`c4-*$i^d^!y^3PUYgP##y8zN^(&Y%c0Sx`!8PIO
zv5W=c2D;`|&TAV|ix!(ka7XBwXB|#GV74=m>r=zqB4zQ&1Ia~;duB{}yr`(?<C&fJ
z(jM*kq`z>^`|<||j;7W#dTZ93EE0)yczd%btI38Tr#pjpI%7hmOa2BihH0)nZBdK~
zR)>r)a5EIOe1D|Da6#}4t3N|Q{-&+>7!2;DJ#FA*@NHLO&tcfHGsH50>A?Kpsm!Jf
eHA;_uvMsFssAW9k2?sC$7(8A5T-G@yGywpP7mlI;

diff --git a/Resources/Textures/Structures/Power/power.rsi/meta.json b/Resources/Textures/Structures/Power/power.rsi/meta.json
index 773a2b5a3e..01f3339d17 100644
--- a/Resources/Textures/Structures/Power/power.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/power.rsi/meta.json
@@ -1,29 +1,26 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation",
-  "states": [
-    {
-      "name": "eightdirwire"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "generator"
-    },
-    {
-      "name": "provider"
-    },
-    {
-      "name": "storage"
-    },
-    {
-      "name": "wiredmachine"
-    },
-    {
-      "name": "wirelessmachine"
-    }
-  ]
+    "states": [
+        {
+            "name": "generator"
+        },
+        {
+            "name": "provider"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "wiredmachine"
+        },
+        {
+            "name": "wirelessmachine"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/flamingmetalbarrel.png b/Resources/Textures/Structures/Storage/barrels.rsi/flamingmetalbarrel.png
deleted file mode 100644
index 12d583f44dda1519cdc6819016b91ec3a93cee52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<Ub4f%&RCt{2TCtAWKoFgkQl(6j28lWarlWREnI>f-Dmxut5c3sI
zg|0<N_YH1n=nlRBiH0V>u-O@VH^!%vJiZ;A1wSF#YlCO!?ab`?-h6-u$3Or)I0gc`
z{!p8b0#Fb*IuW3=SVLC0bCnf0AtKLnou;X3j+;l$GrL8=uL2+|PjBTs0-dvj*PTw1
z)Z8oYb4g$mK&uahAs{yAg~lUBgLFDz%KgrBP&Fqh4awQuoTg<oibnv2e%!bg(*#9{
zFgEHdY}2qF32@o4Yg20iUgbKb0TO|P7^|>~T~tVsptW&MRnD5QNBb@fFb6OinP?vY
z#!*^jbXFCH0Jy3JbiU$GfD2lAbT%o+&Usn{U`JqU0`S2^06M9Q(pidv@}^_IstMj<
zZ6RF56_8}LG4OY#)&xXRq~Yr)cp86)A6NwKgq-8$cp60@f$21Y7h|97WN;mM<ZeN8
znLhtvJ-0OhqtVDb{A`X}*zeO<_fPYWa6X^udxygTe8btF&tW_s16<6-^b5dGJR19_
z6P%y<_F20CKAemj%w{t>P9_sN9*;*u%$_D91qu7?ZLn#$c~6o63Hz-Hu;IPkZfO;e
zZ95qRUbo+qfRue!4M4mVf(V=xLaGKx*dJbpxjz_cz#BPeD{x;mpsRhaHDI^f!Fs)h
z#bTjN9(sKrkh1T+2H<|&C%E>#)c_nXmrJ)DNx`>$ks9DT{3Y#stpOH&{T<N7K05;X
zf|PxB4Ztw7tAN0wV^=|P8<eu&nt&>=bbTTgn3vYDME*<KXGMU0xI~WkWq)`VfCtAw
zz<Yk&MT`62@Gb(JC~?``R3r3>P6Ra7*hGWYS(tJ;n*gW8)WTmWP<6>XB(Ml@D{h=6
zfs(X3a9Ul6QNSX=sj$}B%6Y5-l_(dK^9XhXBu!xwRoY6I3vpLyO~923i^yWYu`(a6
z3tgA0Ln5Iy0k+yVC2*%0SLZ6d;|PG&=HCTWWwA%V5<;qN4Eg78_Zb1M1H*QN)L%~R
z_E+ikDTIU81fcH!Vh6S%0y{;pSt6^hchKki2ERYRvp(N9g6a>DKycciZv@jHAcbK1
z1EetgM~M4_p$7ESA0UNb`U9kJcl`le1lJ$n8^QDkNFkX104W61A0UO``U89;nEn7M
j1l1oPf#F>M9vpuG^6}q5S$$4p00000NkvXXu0mjfNj|45

diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/iedweldbarrel.png b/Resources/Textures/Structures/Storage/barrels.rsi/iedweldbarrel.png
deleted file mode 100644
index b1df05ade171d208000c37e70fc8178ae460c4f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S|4BqaRCt{2Ry}LNP!zod3t3#M2!c>tq|n99AqF9%i=CuH>FUtE
z(Eb4bL5Hq(ad7bu2%-ku+ysY8ArJ^E6gM5xd!9z@Q1f0J>yiWE<$ZAPdFP$?5u+0$
zA`lUX2t)*aO`wxVc==+HF52z0e<!e?d{L=*e<7hnARdo<hG9_t{G9IAYbuw^o?oKB
z*Xz-8xl|$}O~6l%B(F%uU$t5#UDrkbU@)L<zo$Y%nm{I#5y?fF&62@wj^j|P)e`;F
z>6C2S7X9P#ST?LYfqM?#;NV$K4y4m*QSK`MLI#t3B6&y?Kyr|%<#M8~l}g|GZ)P(h
z_J+>m=okvvTLl`E$wq}{bEg7eal1bbfM;a9pyUDIrzHTe1i*{ydX?2mDz35zWX9!9
zlMjndxCCT9aLNC5$>d4|f;`~xfrM>}vjFWKCh=jKfv03>9>6wCCX=K;UWqzH81?%U
zbX14#f%mshVa6FRiOIWQLF648ADRblxqi*lhV)4O%xyT3ph74F0zJU9)-+9w!~U<a
z^o4%kGw1VgJb)QB=&%O>s8rzV8vjAbl?c>90>NEZ)bSnwwAdyDw&7?vqz6_BV`Se5
zO78)&1hi2h&5jr7c7+N9u3M>;SOW7H*D=<WgYO)T>(_^6S-U&nXb+P8;41fhs05CI
blN0y?A1(~QU$Ie^00000NkvXXu0mjfJO2oS

diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/meta.json b/Resources/Textures/Structures/Storage/barrels.rsi/meta.json
index cd8439513e..424e4f46f1 100644
--- a/Resources/Textures/Structures/Storage/barrels.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/barrels.rsi/meta.json
@@ -1,42 +1,20 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/4d150fd98a7b067305c157ad79431fa150f2c145/icons/obj/objects.dmi, modified and adapted by EmoGarbage404 (github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "waterbarrel"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/4d150fd98a7b067305c157ad79431fa150f2c145/icons/obj/objects.dmi, modified and adapted by EmoGarbage404 (github)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "weldbarrel"
-    },
-    {
-      "name": "silicatebarrel"
-    },
-    {
-      "name": "woodenbarrel"
-    },
-    {
-      "name": "metalbarrel"
-    },
-    {
-      "name": "flamingmetalbarrel",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "iedweldbarrel"
-    },
-    {
-      "name": "radbarrel"
-    }
-  ]
+    "states": [
+        {
+            "name": "silicatebarrel"
+        },
+        {
+            "name": "metalbarrel"
+        },
+        {
+            "name": "radbarrel"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/waterbarrel.png b/Resources/Textures/Structures/Storage/barrels.rsi/waterbarrel.png
deleted file mode 100644
index 41d81ba31a172ef6c9525ff0996b594b37846001..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SElET{RCt{2mN5##KoCVoP!X*40Jb)P6pGk;0KI{r;DG`LY^=3O
zXOl`q3&F<L186OX7BMq%R0JghI|O7u2uU{VKL7lkO&&6q1+V}XzyeqR5kRTdi^}!U
z*YWe-gUex-Qvu+`+f4@+lL0;J^nK{IN_0J6U0?|W7fB#e0~9JQ{loC+0=uwW@8VxF
zem!pBcG}W=F+kdBWhKDLi`52QqZ6o?0}cTph(zKLelGku76wWHY;PEh$py5YVNm#-
z-%|m=#Zli%05GHypwu#;q5sJM?|=+5fDOt6e=>zZKYcSYo&oHL5*f=ta_>L4qj3O9
z2Gq_1)UOQixuDVq*a6cLX8>(x7f={Fc0qL;KI$6r{d>a+gV!0L_CfMKxunKM0W_33
Zz#U<aqAd)6ABO+{002ovPDHLkV1ik#k?H^d

diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/weldbarrel.png b/Resources/Textures/Structures/Storage/barrels.rsi/weldbarrel.png
deleted file mode 100644
index 3508523112c6a1f29c1b505de0ce303a69709972..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Scu7P-RCt{2ma%HXFc5~XkU$o1Az<+0C3Ck7j>#)@GM&11=-|11
zfGnN-3Z8=TO9W#>wr++jUJQni&0_}l?p%d*NF#wohU$l4pCnFSPX8$x!JTCQ41fVJ
z00uw_z_P5)_x-E$S(ZWDwhvkW#OAhbLy{ys76bu!p2zQbo&(JzM5h8F4d6Hqe?xkT
zDl|<4X`1qTRaH>eHP4r2DVtUv;02S%nA~+;j;Ru)%L)*XkC5*mFKGbUoFHE3bB-sg
z)vx)d;}Kvy1`pSPjtbO26^Qryz6zVoxeBBL$Hh7oDS3c&?FdM81SG8<kXiRXJ<yy^
z=T=nFU>=}0q<bQYA_&7!`Z5~a0|cU?!94Jc@hAGgD+)aTH$8wYC_JF$x8MUmG5qZT
zlD0Nn69gt-91a{mE|>hAjQSMRhF`lKyy<E~5+4EdRj{YiesH_xD&!a!vzfj&q;tjO
worvkYg$gvD*jU>ilFQ^Ocm1FMI&^n{Z?s*`tg8PRTmS$707*qoM6N<$g2^Afe*gdg

diff --git a/Resources/Textures/Structures/Storage/barrels.rsi/woodenbarrel.png b/Resources/Textures/Structures/Storage/barrels.rsi/woodenbarrel.png
deleted file mode 100644
index 5cb2ceefb911b47a0fc9cb4d92f83c9b3ea9ccf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<SRY^oaRCt_YVHjXA>VQ!Pj5=V{0izBe$pJ2!;{OS$*>n9RBTXCt
zvs_Ss8K;`}AO3>Xk>UuV9iZwE#PH_AMzAHg0LXD72L8ZMm`<#*#5n-utJ??GfgK@&
zByMJAhNAA&sZ(G_k`f9er2&v5K)zIw;AXh<;w!_g7kj|sAT~%$0LT^q$uWE-+DxJx
z0P;Dq<sbl#3JC@bHpnrcXka)_Tr?2n09f#Yzz3*Uv>zh))%*}@KR}~_SU_|XfE)n=
zrW$-;dTG}>IQ#UCPjL2aARAv!A=?4?0J4RoSWdD7D6xnt4j=}A5+q%s06FDT0!Ye+
zxGY5%AJ}XtF~HgI4X_}>S6`6j08qJ}nVI<?<TF^Yi!DdMO2O6Br&GT+M2`j$V4SN#
zD<d_i8c-<+3n{8Q08+cHgSQDl!3>LQSk?p4G;5F`96?<$wAzHU001!1ss4ZIW5oaf
N002ovPDHLkV1g`3qW%B?


From 0569e2361ac3092177f8bcb9f662da265eefc9bb Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sat, 3 Oct 2026 22:57:47 +0000
Subject: [PATCH 39/69] Cleanup: Resolve ForceMakeAntag warnings (#46151)

Resolve ForceMakeAntag warnings
---
 .../Systems/AdminVerbSystem.Antags.cs         | 95 +++++++++++--------
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 9a94d3ff46..c1d519168f 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -18,26 +18,38 @@ namespace Content.Server.Administration.Systems;
 
 public sealed partial class AdminVerbSystem
 {
-    [Dependency] private AntagSelectionSystem _antag = default!;
-    [Dependency] private ZombieSystem _zombie = default!;
     [Dependency] private ServerGameTicker _gameTicker = default!;
+    [Dependency] private AntagSelectionSystem _antag = default!;
     [Dependency] private OutfitSystem _outfit = default!;
+    [Dependency] private ZombieSystem _zombie = default!;
 
-    private static readonly EntProtoId DefaultTraitorRule = "Traitor";
-    private static readonly EntProtoId DefaultInitialInfectedRule = "Zombie";
-    private static readonly EntProtoId DefaultNukeOpRule = "LoneOpsSpawn";
-    private static readonly EntProtoId DefaultRevsRule = "Revolutionary";
-    private static readonly EntProtoId DefaultThiefRule = "Thief";
-    private static readonly EntProtoId DefaultChangelingRule = "Changeling";
-    private static readonly EntProtoId ParadoxCloneRuleId = "ParadoxCloneSpawn";
-    private static readonly EntProtoId DefaultWizardRule = "Wizard";
-    private static readonly EntProtoId DefaultNinjaRule = "NinjaSpawn";
+    [Dependency] private EntityQuery<ActorComponent> _actorQuery;
+    [Dependency] private EntityQuery<HumanoidProfileComponent> _humanoidQuery;
+    [Dependency] private EntityQuery<MindContainerComponent> _mindContainerQuery;
+
+    private static readonly EntProtoId TraitorRule = "Traitor";
+    private static readonly ProtoId<AntagSpecifierPrototype> TraitorSpec = "Traitor";
+    private static readonly EntProtoId InitialInfectedRule = "Zombie";
+    private static readonly ProtoId<AntagSpecifierPrototype> InitialInfectedSpec = "InitialInfected";
+    private static readonly EntProtoId LoneOpRule = "LoneOpsSpawn";
+    private static readonly ProtoId<AntagSpecifierPrototype> LoneOpSpec = "LoneOp";
+    private static readonly EntProtoId RevsRule = "Revolutionary";
+    private static readonly ProtoId<AntagSpecifierPrototype> RevsSpec = "HeadRev";
+    private static readonly EntProtoId ThiefRule = "Thief";
+    private static readonly ProtoId<AntagSpecifierPrototype> ThiefSpec = "Thief";
+    private static readonly EntProtoId ChangelingRule = "Changeling";
+    private static readonly ProtoId<AntagSpecifierPrototype> ChangelingSpec = "Changeling";
+    private static readonly EntProtoId ParadoxCloneRule = "ParadoxCloneSpawn";
+    private static readonly EntProtoId WizardRule = "Wizard";
+    private static readonly ProtoId<AntagSpecifierPrototype> WizardSpec = "Wizard";
+    private static readonly EntProtoId NinjaRule = "NinjaSpawn";
+    private static readonly ProtoId<AntagSpecifierPrototype> NinjaSpec = "SpaceNinja";
     private static readonly ProtoId<StartingGearPrototype> PirateGearId = "PirateGear";
 
     // All antag verbs have names so invokeverb works.
     private void AddAntagVerbs(GetVerbsEvent<Verb> args)
     {
-        if (!TryComp<ActorComponent>(args.User, out var actor))
+        if (!_actorQuery.TryComp(args.User, out var actor))
             return;
 
         var player = actor.PlayerSession;
@@ -45,7 +57,7 @@ public sealed partial class AdminVerbSystem
         if (!_adminManager.HasAdminFlag(player, AdminFlags.Fun))
             return;
 
-        if (!HasComp<MindContainerComponent>(args.Target) || !TryComp<ActorComponent>(args.Target, out var targetActor))
+        if (!_mindContainerQuery.HasComp(args.Target) || !_actorQuery.TryComp(args.Target, out var targetActor))
             return;
 
         var targetPlayer = targetActor.PlayerSession;
@@ -58,7 +70,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Misc/job_icons.rsi"), "Syndicate"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, DefaultTraitorRule);
+                _antag.ForceMakeAntag<TraitorRuleComponent>(targetPlayer, TraitorRule, TraitorSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", traitorName, Loc.GetString("admin-verb-make-traitor")),
@@ -73,7 +85,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "InitialInfected"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<ZombieRuleComponent>(targetPlayer, DefaultInitialInfectedRule);
+                _antag.ForceMakeAntag<ZombieRuleComponent>(targetPlayer, InitialInfectedRule, InitialInfectedSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", initialInfectedName, Loc.GetString("admin-verb-make-initial-infected")),
@@ -103,7 +115,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Clothing/Head/Hardsuits/syndicate.rsi"), "icon"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<NukeopsRuleComponent>(targetPlayer, DefaultNukeOpRule);
+                _antag.ForceMakeAntag<NukeopsRuleComponent>(targetPlayer, LoneOpRule, LoneOpSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", nukeOpName, Loc.GetString("admin-verb-make-nuclear-operative")),
@@ -134,7 +146,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "HeadRevolutionary"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<RevolutionaryRuleComponent>(targetPlayer, DefaultRevsRule);
+                _antag.ForceMakeAntag<RevolutionaryRuleComponent>(targetPlayer, RevsRule, RevsSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", headRevName, Loc.GetString("admin-verb-make-head-rev")),
@@ -149,7 +161,7 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/Color/black.rsi"), "icon"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<ThiefRuleComponent>(targetPlayer, DefaultThiefRule);
+                _antag.ForceMakeAntag<ThiefRuleComponent>(targetPlayer, ThiefRule, ThiefSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", thiefName, Loc.GetString("admin-verb-make-thief")),
@@ -164,34 +176,40 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Objects/Weapons/Melee/armblade.rsi"), "icon"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<ChangelingRuleComponent>(targetPlayer, DefaultChangelingRule);
+                _antag.ForceMakeAntag<ChangelingRuleComponent>(targetPlayer, ChangelingRule, ChangelingSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", changelingName, Loc.GetString("admin-verb-make-changeling")),
         };
         args.Verbs.Add(changeling);
 
-        var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone");
-        Verb paradox = new()
+        // only humanoids can be cloned
+        if (_humanoidQuery.HasComp(args.Target))
         {
-            Text = paradoxCloneName,
-            Category = VerbCategory.Antag,
-            Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
-            Act = () =>
+            var paradoxCloneName = Loc.GetString("admin-verb-text-make-paradox-clone");
+            Verb paradox = new()
             {
-                if (_gameTicker.AddGameRule(ParadoxCloneRuleId) is not { } ruleEnt)
-                    return;
+                Text = paradoxCloneName,
+                Category = VerbCategory.Antag,
+                Icon = new SpriteSpecifier.Rsi(new("/Textures/Interface/Misc/job_icons.rsi"), "ParadoxClone"),
+                Act = () =>
+                {
+                    if (_gameTicker.AddGameRule(ParadoxCloneRule) is not { } ruleEnt)
+                        return;
 
-                if (!TryComp<ParadoxCloneRuleComponent>(ruleEnt, out var paradoxCloneRuleComp))
-                    return;
+                    if (!TryComp<ParadoxCloneRuleComponent>(ruleEnt, out var paradoxCloneRuleComp))
+                        return;
 
-                paradoxCloneRuleComp.OriginalBody = args.Target; // override the target player
+                    paradoxCloneRuleComp.OriginalBody = args.Target; // override the target player
 
-                _gameTicker.StartGameRule(ruleEnt.AsNullable());
-            },
-            Impact = LogImpact.High,
-            Message = string.Join(": ", paradoxCloneName, Loc.GetString("admin-verb-make-paradox-clone")),
-        };
+                    _gameTicker.StartGameRule(ruleEnt.AsNullable());
+                },
+                Impact = LogImpact.High,
+                Message = string.Join(": ", paradoxCloneName, Loc.GetString("admin-verb-make-paradox-clone")),
+            };
+
+            args.Verbs.Add(paradox);
+        }
 
         var wizardName = Loc.GetString("admin-verb-text-make-wizard");
         Verb wizard = new()
@@ -202,7 +220,7 @@ public sealed partial class AdminVerbSystem
             Act = () =>
             {
                 // Wizard has no rule components as of writing, but I gotta put something here to satisfy the machine so just make it wizard mind rule :)
-                _antag.ForceMakeAntag<WizardRoleComponent>(targetPlayer, DefaultWizardRule);
+                _antag.ForceMakeAntag<WizardRoleComponent>(targetPlayer, WizardRule, WizardSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", wizardName, Loc.GetString("admin-verb-make-wizard")),
@@ -217,14 +235,11 @@ public sealed partial class AdminVerbSystem
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Weapons/Melee/energykatana.rsi"), "icon"),
             Act = () =>
             {
-                _antag.ForceMakeAntag<NinjaRoleComponent>(targetPlayer, DefaultNinjaRule);
+                _antag.ForceMakeAntag<NinjaRoleComponent>(targetPlayer, NinjaRule, NinjaSpec);
             },
             Impact = LogImpact.High,
             Message = string.Join(": ", ninjaName, Loc.GetString("admin-verb-make-space-ninja")),
         };
         args.Verbs.Add(ninja);
-
-        if (HasComp<HumanoidProfileComponent>(args.Target)) // only humanoids can be cloned
-            args.Verbs.Add(paradox);
     }
 }

From bdca82f05d3cc92dcee8d6c009641a690abc9ef1 Mon Sep 17 00:00:00 2001
From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Date: Sat, 3 Oct 2026 23:16:36 +0000
Subject: [PATCH 40/69] Make logs slicable (#46122)

yeah
---
 .../Prototypes/Entities/Objects/Consumable/Food/produce.yml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index a1c8e0c9c9..593f4447fa 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -204,7 +204,7 @@
   - type: Produce
     plantId: TowercapPlants
   - type: ToolRefinable
-    qualityNeeded: Sawing
+    qualityNeeded: Slicing
     refineResult:
     - id: MaterialWoodPlank1
       amount: 2
@@ -226,7 +226,7 @@
   - type: Produce
     plantId: SteelcapPlants
   - type: ToolRefinable
-    qualityNeeded: Sawing
+    qualityNeeded: Slicing
     refineResult:
     - id: SheetSteel1
 

From 7ddd29ae071d34ae3a9d4c55eb335d7d6e6de7f8 Mon Sep 17 00:00:00 2001
From: Dogbone10 <135195193+Dogbone10@users.noreply.github.com>
Date: Sun, 4 Oct 2026 06:40:44 +0000
Subject: [PATCH 41/69] Round out Belts to fit more items. (#46035)

* Whitelist more items for belts across all jobs

* Removed radios from Medical Belt

* Allow EMT belt to hold mini fire extinguisher, no other sprays

* Add spray painter ammo, t=ray scanners to Janibelt

* Added a Tag for the Metal Foam Grenade

* Undo adding access breakers to utility belts.

* Parameds can't carry wrenches no more. Enjoy your crowbars and jaws of life!

* Re-added radios to Medical Belt

* Added commented out defib tag for future PRs

* Re-removed Foam Grenades from Utilty Belt, undid tag changes.

* No more defib comment on emt belt
---
 .../Prototypes/Entities/Clothing/Belt/job.yml | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/job.yml b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
index 3cb03d2aaa..bad1562d0c 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/job.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/job.yml
@@ -141,6 +141,13 @@
       - WireBrush
       - LightReplacer
       - CleanerGrenade
+      - Screwdriver
+      - Crowbar
+      - Powerdrill
+      components:
+      - TrayScanner
+      - SprayPainter
+      - SprayPainterAmmo
   - type: ItemMapper
     sprite: *BeltOverlay
     mapLayers:
@@ -270,6 +277,26 @@
     sprite: Clothing/Belt/emt.rsi
   - type: Clothing
     sprite: Clothing/Belt/emt.rsi
+  - type: Storage
+    whitelist:
+      tags:
+      - Bottle
+      - Brutepack
+      - Bloodpack
+      - Gauze
+      - Ointment
+      - Tourniquet
+      - CigPack
+      - PillCanister
+      - Radio
+      - DiscreteHealthAnalyzer
+      - SurgeryTool
+      - Dropper
+      components:
+      - Injector
+      - Pill
+      - Prying
+      - SpraySafety
 
 - type: entity
   parent: ClothingBeltStorageBase
@@ -286,7 +313,6 @@
       tags:
       - BotanyShovel
       - BotanyHatchet
-      - PlantBGone
       - Bottle
       - Syringe
       - CigPack
@@ -297,6 +323,7 @@
       - Seed
       - Smokable
       - HandLabeler
+      - Spray
   - type: ItemMapper
     sprite: *BeltOverlay
     mapLayers:

From 94087a918a2fae4571f5a529fe14ef7f5dce29a3 Mon Sep 17 00:00:00 2001
From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Date: Sun, 4 Oct 2026 11:50:25 +0200
Subject: [PATCH 42/69] Hotfix: Fix melee wideswing damage exploit (#46299)

* Initial commit

* TrimExcess to Take
---
 .../Weapons/Melee/MeleeWeaponSystem.cs        |  9 +--
 .../SolutionInjectOnEventSystem.cs            |  4 +-
 .../Weapons/Melee/MeleeWeaponSystem.cs        |  4 +-
 .../Chemistry/EntitySystems/InjectorSystem.cs |  4 +-
 Content.Shared/Flash/SharedFlashSystem.cs     |  2 +-
 .../Trigger/Systems/TriggerOnMeleeSystem.cs   |  5 +-
 .../Weapons/Melee/Events/HeavyAttackEvent.cs  |  4 +-
 .../Weapons/Melee/Events/MeleeHitEvent.cs     |  6 +-
 .../Weapons/Melee/SharedMeleeWeaponSystem.cs  | 64 ++++++++-----------
 9 files changed, 46 insertions(+), 56 deletions(-)

diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index acd4cd1a74..f91d0a6104 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -159,10 +159,10 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
         return Interaction.InRangeUnobstructed(user, target, targetCoordinates, targetLocalAngle, range, overlapCheck: false);
     }
 
-    protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
+    protected override void DoDamageEffect(HashSet<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
     {
         // Server never sends the event to us for predictiveeevent.
-        _color.RaiseEffect(Color.Red, targets, Filter.Local());
+        _color.RaiseEffect(Color.Red, targets.ToList(), Filter.Local());
     }
 
     /// <summary>
@@ -189,8 +189,9 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
 
         // This should really be improved. GetEntitiesInArc uses pos instead of bounding boxes.
         // Server will validate it with InRangeUnobstructed.
-        var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
-        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
+        var entities = GetNetEntitySet(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user));
+        entities = entities.Take(Math.Min(MaxTargets, entities.Count)).ToHashSet();
+        RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities, GetNetCoordinates(coordinates)));
     }
 
     private void ClientDisarm(EntityUid attacker, MapCoordinates mousePos, EntityCoordinates coordinates)
diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
index a98c272eed..84727915c3 100644
--- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs
@@ -63,7 +63,7 @@ public sealed partial class SolutionInjectOnCollideSystem : EntitySystem
 
     private void DoInjection(Entity<BaseSolutionInjectOnEventComponent> injectorEntity, EntityUid target, EntityUid? source = null)
     {
-        TryInjectTargets(injectorEntity, [target], source);
+        TryInjectTargets(injectorEntity, new HashSet<EntityUid>() { target }, source);
     }
 
     /// <summary>
@@ -79,7 +79,7 @@ public sealed partial class SolutionInjectOnCollideSystem : EntitySystem
     /// </list>
     /// </remarks>
     /// <returns>true if at least one target was successfully injected, otherwise false</returns>
-    private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injector, IReadOnlyList<EntityUid> targets, EntityUid? user = null)
+    private bool TryInjectTargets(Entity<BaseSolutionInjectOnEventComponent> injector, IReadOnlySet<EntityUid> targets, EntityUid? user = null)
     {
         // Make sure we have at least one target
         if (targets.Count == 0)
diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
index e7f4d9bf44..26b2f8e48a 100644
--- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -68,10 +68,10 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
         return Interaction.InRangeUnobstructed(user, target, range);
     }
 
-    protected override void DoDamageEffect(List<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
+    protected override void DoDamageEffect(HashSet<EntityUid> targets, EntityUid? user, TransformComponent targetXform)
     {
         var filter = Filter.Pvs(targetXform.Coordinates, entityMan: EntityManager).RemoveWhereAttachedEntity(o => o == user);
-        _color.RaiseEffect(Color.Red, targets, filter);
+        _color.RaiseEffect(Color.Red, targets.ToList(), filter);
     }
 
     public override void DoLunge(EntityUid user, EntityUid weapon, Angle angle, Vector2 localPos, string? animation, bool predicted = true)
diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
index ad209ce5d8..88eedd929f 100644
--- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs
@@ -100,10 +100,10 @@ public sealed partial class InjectorSystem : EntitySystem
 
     private void OnAttack(Entity<InjectorComponent> injector, ref MeleeHitEvent args)
     {
-        if (args.HitEntities is [])
+        if (args.HitEntities.Count == 0)
             return;
 
-        TryMobsDoAfter(injector, args.User, args.HitEntities[0]);
+        TryMobsDoAfter(injector, args.User, args.HitEntities.First());
     }
 
     /// <summary>
diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs
index f61a78b3ce..6baeead4f7 100644
--- a/Content.Shared/Flash/SharedFlashSystem.cs
+++ b/Content.Shared/Flash/SharedFlashSystem.cs
@@ -92,7 +92,7 @@ public abstract partial class SharedFlashSystem : EntitySystem
             Flash(target, args.User, ent.Owner, ent.Comp.MeleeDuration, ent.Comp.SlowTo, melee: true, stunDuration: ent.Comp.MeleeStunDuration);
         }
 
-        EntityUid? firstTarget = args.HitEntities.Count > 0 ? args.HitEntities[0] : null; // Just pick the first hit entity.
+        EntityUid? firstTarget = args.HitEntities.Count > 0 ? args.HitEntities.First() : null; // Just pick the first hit entity.
         var ev = new AfterFlashActivatedEvent(firstTarget, args.User);
         RaiseLocalEvent(ent, ref ev);
     }
diff --git a/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
index 7f90d6f790..f3b80e96a5 100644
--- a/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
+++ b/Content.Shared/Trigger/Systems/TriggerOnMeleeSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Trigger.Components.Triggers;
 using Content.Shared.Weapons.Melee.Events;
 
@@ -30,7 +31,7 @@ public sealed partial class TriggerOnMeleeTriggerSystem : TriggerOnXSystem
         if  (args.HitEntities.Count == 0)
             target = ent.Comp.TargetIsUser ? null : args.User;
         else
-            target = ent.Comp.TargetIsUser ? args.HitEntities[0] : args.User;
+            target = ent.Comp.TargetIsUser ? args.HitEntities.First() : args.User;
 
         Trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
     }
@@ -42,7 +43,7 @@ public sealed partial class TriggerOnMeleeTriggerSystem : TriggerOnXSystem
 
         if (!ent.Comp.TriggerEveryHit)
         {
-            var target = ent.Comp.TargetIsUser ? args.HitEntities[0] : args.User;
+            var target = ent.Comp.TargetIsUser ? args.HitEntities.First() : args.User;
             Trigger.Trigger(ent.Owner, target, ent.Comp.KeyOut);
             return;
         }
diff --git a/Content.Shared/Weapons/Melee/Events/HeavyAttackEvent.cs b/Content.Shared/Weapons/Melee/Events/HeavyAttackEvent.cs
index 6ea6caadc9..9cc8983039 100644
--- a/Content.Shared/Weapons/Melee/Events/HeavyAttackEvent.cs
+++ b/Content.Shared/Weapons/Melee/Events/HeavyAttackEvent.cs
@@ -14,9 +14,9 @@ public sealed class HeavyAttackEvent : AttackEvent
     /// <summary>
     /// As what the client swung at will not match server we'll have them tell us what they hit so we can verify.
     /// </summary>
-    public List<NetEntity> Entities;
+    public HashSet<NetEntity> Entities;
 
-    public HeavyAttackEvent(NetEntity weapon, List<NetEntity> entities, NetCoordinates coordinates) : base(coordinates)
+    public HeavyAttackEvent(NetEntity weapon, HashSet<NetEntity> entities, NetCoordinates coordinates) : base(coordinates)
     {
         Weapon = weapon;
         Entities = entities;
diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
index 75c85790de..d470c2799d 100644
--- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
+++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
@@ -31,9 +31,9 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs
     public DamageSpecifier BonusDamage = new();
 
     /// <summary>
-    ///     A list containing every hit entity. Can be zero.
+    ///     A set containing every hit entity. Can be zero.
     /// </summary>
-    public IReadOnlyList<EntityUid> HitEntities;
+    public IReadOnlySet<EntityUid> HitEntities;
 
     /// <summary>
     ///     Used to define a new hit sound in case you want to override the default GenericHit.
@@ -66,7 +66,7 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs
     /// </remarks>
     public bool IsHit = true;
 
-    public MeleeHitEvent(List<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction)
+    public MeleeHitEvent(HashSet<EntityUid> hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction)
     {
         HitEntities = hitEntities;
         User = user;
diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
index a4b11168f5..95e6eaa626 100644
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -527,7 +527,7 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, null);
+            var missEvent = new MeleeHitEvent(new HashSet<EntityUid>(), user, meleeUid, damage, null);
             RaiseLocalEvent(meleeUid, missEvent);
             _meleeSound.PlaySwingSound(user, meleeUid, component);
             return;
@@ -536,15 +536,15 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
         // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}");
 
         // Raise event before doing damage so we can cancel damage if the event is handled
-        var hitEvent = new MeleeHitEvent(new List<EntityUid> { target.Value }, user, meleeUid, damage, null);
+        var hitEvent = new MeleeHitEvent(new HashSet<EntityUid> { target.Value }, user, meleeUid, damage, null);
         RaiseLocalEvent(meleeUid, hitEvent);
 
         if (hitEvent.Handled)
             return;
 
-        var targets = new List<EntityUid>(1)
+        var targets = new HashSet<EntityUid>(1)
         {
-            target.Value
+            target.Value,
         };
 
         var weapon = GetEntity(ev.Weapon);
@@ -601,7 +601,7 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
         }
     }
 
-    protected abstract void DoDamageEffect(List<EntityUid> targets, EntityUid? user,  TransformComponent targetXform);
+    protected abstract void DoDamageEffect(HashSet<EntityUid> targets, EntityUid? user,  TransformComponent targetXform);
 
     private bool DoHeavyAttack(EntityUid user, HeavyAttackEvent ev, EntityUid meleeUid, MeleeWeaponComponent component, ICommonSession? session)
     {
@@ -620,7 +620,7 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
 
         var damage = GetDamage(meleeUid, user, component);
         var resistanceBypass = GetResistanceBypass(meleeUid, user, component);
-        var entities = GetEntityList(ev.Entities);
+        var entities = GetEntitySet(ev.Entities);
 
         if (entities.Count == 0)
         {
@@ -636,7 +636,7 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
                     LogImpact.Low,
                     $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed");
             }
-            var missEvent = new MeleeHitEvent(new List<EntityUid>(), user, meleeUid, damage, direction);
+            var missEvent = new MeleeHitEvent(new HashSet<EntityUid>(), user, meleeUid, damage, direction);
             RaiseLocalEvent(meleeUid, missEvent);
 
             // immediate audio feedback
@@ -648,35 +648,21 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
         // Naughty input
         if (entities.Count > MaxTargets)
         {
-            entities.RemoveRange(MaxTargets, entities.Count - MaxTargets);
+            entities = entities.Take(MaxTargets).ToHashSet();
         }
 
         // Validate client
-        for (var i = entities.Count - 1; i >= 0; i--)
-        {
-            var entity = entities[i];
+        entities.RemoveWhere(entity => TerminatingOrDeleted(entity) ||
+                                       !ArcRaySuccessful(entity,
+                                        userPos,
+                                        direction.ToWorldAngle(),
+                                        component.Angle,
+                                        distance,
+                                        userXform.MapID,
+                                        user,
+                                        session));
 
-            if (TerminatingOrDeleted(entity))
-            {
-                entities.RemoveAt(i);
-                continue;
-            }
-
-            if (!ArcRaySuccessful(entity,
-                    userPos,
-                    direction.ToWorldAngle(),
-                    component.Angle,
-                    distance,
-                    userXform.MapID,
-                    user,
-                    session))
-            {
-                // Bad input
-                entities.RemoveAt(i);
-            }
-        }
-
-        var targets = new List<EntityUid>();
+        var targets = new HashSet<EntityUid>();
         foreach (var entity in entities)
         {
             if (entity == user ||
@@ -710,17 +696,17 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
         }
 
         var appliedDamage = new DamageSpecifier();
+        var filteredTargets = new HashSet<EntityUid>();
 
-        for (var i = targets.Count - 1; i >= 0; i--)
+        foreach (var entity in targets)
         {
-            var entity = targets[i];
             // We raise an attack attempt here as well,
             // primarily because this was an untargeted wideswing: if a subscriber to that event cared about
             // the potential target (such as for pacifism), they need to be made aware of the target here.
             // In that case, just continue.
             if (!Blocker.CanAttack(user, entity, (weapon, component)))
             {
-                targets.RemoveAt(i);
+                filteredTargets.Add(entity);
                 continue;
             }
 
@@ -755,9 +741,11 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
             }
 
             if (TerminatingOrDeleted(entity))
-                targets.RemoveAt(i);
+                filteredTargets.Add(entity);
         }
 
+        targets.ExceptWith(filteredTargets);
+
         if (entities.Count != 0)
         {
             var target = entities.First();
@@ -768,12 +756,12 @@ public abstract partial class SharedMeleeWeaponSystem : EntitySystem
         {
             if (appliedDamage.GetTotal() > FixedPoint2.Zero)
             {
-                DoDamageEffect(targets, user, Transform(targets[0]));
+                DoDamageEffect(targets, user, Transform(targets.First()));
                 ResetUndamagedSwingsCount((meleeUid, component));
             }
             else
             {
-                UndamagedAttack((meleeUid, component), targets[0], user);
+                UndamagedAttack((meleeUid, component), targets.First(), user);
             }
         }
 

From cfd925d9e751e27718157040d432e907e71d59ba Mon Sep 17 00:00:00 2001
From: InsoPL <lukasz.lindert@protonmail.com>
Date: Sun, 4 Oct 2026 12:58:17 +0000
Subject: [PATCH 43/69] Vacuum shader (#46038)

* init

* slider

* fixes

* fixes

* vacuum

* toggle

* turned on be default lol

* typo

* mediump

* marker thingis

* GetWorldPositionRotationMatrixWithInv

* cvar dynamic

* fixes

* magic numbers bad

* discard

* refactors will continue until clean code improves

* format

* comm

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../GasTileVacuumOverlaySystem.cs             |  65 ++
 .../Atmos/Overlays/GasTileVacuumOverlay.cs    | 196 +++++
 .../Options/UI/Tabs/AccessibilityTab.xaml     |   1 +
 .../Options/UI/Tabs/AccessibilityTab.xaml.cs  |   8 +
 .../EntitySystems/GasTileOverlaySystem.cs     | 818 +++++++++---------
 .../SharedGasTileOverlaySystem.cs             |   5 +
 .../CCVar/CCVars.Accessibility.Motion.cs      |  12 +
 .../en-US/escape-menu/ui/options-menu.ftl     |   1 +
 Resources/Prototypes/Shaders/shaders.yml      |   5 +
 .../Textures/Shaders/vacuum_desaturation.swsl |  14 +
 10 files changed, 715 insertions(+), 410 deletions(-)
 create mode 100644 Content.Client/Atmos/EntitySystems/GasTileVacuumOverlaySystem.cs
 create mode 100644 Content.Client/Atmos/Overlays/GasTileVacuumOverlay.cs
 create mode 100644 Resources/Textures/Shaders/vacuum_desaturation.swsl

diff --git a/Content.Client/Atmos/EntitySystems/GasTileVacuumOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileVacuumOverlaySystem.cs
new file mode 100644
index 0000000000..19dcd5bfec
--- /dev/null
+++ b/Content.Client/Atmos/EntitySystems/GasTileVacuumOverlaySystem.cs
@@ -0,0 +1,65 @@
+using Content.Client.Atmos.Overlays;
+using Content.Shared.CCVar;
+using JetBrains.Annotations;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+
+namespace Content.Client.Atmos.EntitySystems;
+
+/// <summary>
+/// System responsible for rendering vacuum effects using <see cref="GasTileVacuumOverlay"/>.
+/// </summary>
+[UsedImplicitly]
+public sealed partial class GasTileVacuumOverlaySystem : EntitySystem
+{
+    [Dependency] private IOverlayManager _overlayMan = default!;
+    [Dependency] private IConfigurationManager _cfgManager = default!;
+
+    private GasTileVacuumOverlay? _gasTileVacuumOverlay;
+    private bool _vacuumOverlayEnabledDueToCvar; // due to CVar being enabled
+    private bool _vacuumOverlayEnabledIntensity; // due to non zero intensity in setting
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _cfgManager.OnValueChanged(CCVars.VacuumOverlay, OnVacuumOverlayChanged, true);
+        _cfgManager.OnValueChanged(CCVars.VacuumOverlayIntensity, OnVacuumOverlayIntensityChanged, true);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+
+        _cfgManager.UnsubValueChanged(CCVars.VacuumOverlay, OnVacuumOverlayChanged);
+        _cfgManager.UnsubValueChanged(CCVars.VacuumOverlayIntensity, OnVacuumOverlayIntensityChanged);
+        _overlayMan.RemoveOverlay<GasTileVacuumOverlay>();
+    }
+
+    private void OnVacuumOverlayChanged(bool enabled)
+    {
+        _vacuumOverlayEnabledDueToCvar = enabled;
+        UpdateOverlay();
+    }
+
+    private void OnVacuumOverlayIntensityChanged(float intensity)
+    {
+        _vacuumOverlayEnabledIntensity = intensity > 0f;
+        UpdateOverlay();
+    }
+
+    private void UpdateOverlay()
+    {
+        if (_vacuumOverlayEnabledDueToCvar && _vacuumOverlayEnabledIntensity)
+        {
+            _gasTileVacuumOverlay ??= new GasTileVacuumOverlay();
+
+            if (!_overlayMan.HasOverlay<GasTileVacuumOverlay>())
+                _overlayMan.AddOverlay(_gasTileVacuumOverlay);
+        }
+        else
+        {
+            _overlayMan.RemoveOverlay<GasTileVacuumOverlay>();
+        }
+    }
+}
diff --git a/Content.Client/Atmos/Overlays/GasTileVacuumOverlay.cs b/Content.Client/Atmos/Overlays/GasTileVacuumOverlay.cs
new file mode 100644
index 0000000000..0ddcd64a27
--- /dev/null
+++ b/Content.Client/Atmos/Overlays/GasTileVacuumOverlay.cs
@@ -0,0 +1,196 @@
+using System.Numerics;
+using Content.Client.Graphics;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.CCVar;
+using Robust.Client.Graphics;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Color = Robust.Shared.Maths.Color;
+
+namespace Content.Client.Atmos.Overlays;
+
+/// <summary>
+/// Overlay responsible for rendering vacuum overlay.
+/// </summary>
+public sealed partial class GasTileVacuumOverlay : Overlay
+{
+    public override bool RequestScreenTexture { get; set; } = true;
+    private static readonly ProtoId<ShaderPrototype> UnshadedShader = "unshaded";
+    private static readonly ProtoId<ShaderPrototype> VacuumOverlayShader = "VacuumDesaturation";
+    private static readonly Color EmptyColor = new(0, 0, 0, 0);
+    private static readonly Color MarkerColor = new(255f, 0, 0);
+
+    [Dependency] private IEntityManager _entManager = default!;
+    [Dependency] private IPrototypeManager _proto = default!;
+    [Dependency] private IClyde _clyde = default!;
+    [Dependency] private IConfigurationManager _configManager = default!;
+
+    private readonly SharedMapSystem _maps;
+    private readonly SharedTransformSystem _xformSys;
+    private readonly ShaderInstance _unshader;
+    private readonly ShaderInstance _shader;
+
+    private List<Entity<MapGridComponent>> _intersectingGrids = new();
+    private readonly OverlayResourceCache<CachedResources> _resources = new();
+
+    // Overlay settings
+    private float _intensity; // overlay intensity. 0.0f = turned off, 1.0f = full grayscale
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+
+    public GasTileVacuumOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _maps = _entManager.System<SharedMapSystem>();
+        _xformSys = _entManager.System<SharedTransformSystem>();
+
+        _unshader = _proto.Index(UnshadedShader).Instance();
+        _shader = _proto.Index(VacuumOverlayShader).InstanceUnique();
+        _configManager.OnValueChanged(CCVars.VacuumOverlayIntensity, SetVacuumOverlayIntensity, invokeImmediately: true);
+    }
+
+    private void SetVacuumOverlayIntensity(float intensity)
+    {
+        _intensity = MathHelper.Clamp(intensity, 0f, 1f);
+        _shader.SetParameter("intensity", _intensity);
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (args.MapId == MapId.Nullspace)
+            return false;
+
+        var res = _resources.GetForViewport(args.Viewport, static _ => new CachedResources());
+
+        var target = args.Viewport.RenderTarget;
+
+        // Probably the resolution of the game window changed, remake the textures.
+        if (res.VacuumTarget?.Texture.Size != target.Size)
+        {
+            res.VacuumTarget?.Dispose();
+            res.VacuumTarget = _clyde.CreateRenderTarget(
+                target.Size,
+                new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
+                name: $"{nameof(GasTileVacuumOverlay)}-blur");
+        }
+
+        var overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
+
+        args.WorldHandle.UseShader(_unshader);
+
+        var mapId = args.MapId;
+        var worldAABB = args.WorldAABB;
+        var worldBounds = args.WorldBounds;
+        var worldHandle = args.WorldHandle;
+        var worldToViewportLocal = args.Viewport.GetWorldToLocalMatrix();
+
+        // If there is no Vacuum after checking all visible tiles, we can bail early
+        var anyVacuum = false;
+
+        // We're rendering in the context of the vacuum target texture, which will encode data as to where vacuum effect will be
+        args.WorldHandle.RenderInRenderTarget(res.VacuumTarget,
+            () =>
+            {
+                _intersectingGrids.Clear();
+                _maps.FindGridsIntersecting(mapId, worldAABB, ref _intersectingGrids);
+                foreach (var grid in _intersectingGrids)
+                {
+                    if (!overlayQuery.TryGetComponent(grid.Owner, out var comp))
+                        continue;
+
+                    var (_, _, gridEntToWorld, worldToGridLocal) = _xformSys.GetWorldPositionRotationMatrixWithInv(grid.Owner);
+                    var gridEntToViewportLocal = gridEntToWorld * worldToViewportLocal;
+
+                    if (!Matrix3x2.Invert(gridEntToViewportLocal, out _))
+                        continue;
+
+                    // Draw commands (like DrawRect) will be using grid coordinates from here
+                    worldHandle.SetTransform(gridEntToViewportLocal);
+
+                    // We only care about tiles that fit in these bounds
+                    var floatBounds = worldToGridLocal.TransformBox(worldBounds).Enlarged(grid.Comp.TileSize);
+
+                    var localBounds = new Box2i(
+                        (int)MathF.Floor(floatBounds.Left),
+                        (int)MathF.Floor(floatBounds.Bottom),
+                        (int)MathF.Ceiling(floatBounds.Right),
+                        (int)MathF.Ceiling(floatBounds.Top));
+
+                    // for each tile and its gas --->
+                    foreach (var chunk in comp.Chunks.Values)
+                    {
+                        var enumerator = new GasChunkEnumerator(chunk);
+
+                        while (enumerator.MoveNext(out var tileGas))
+                        {
+                            // Check and make sure the tile is within the viewport/screen
+                            var tilePosition = chunk.Origin + (enumerator.X, enumerator.Y);
+                            if (!localBounds.Contains(tilePosition))
+                                continue;
+
+                            if (tileGas.ByteGasTemperature.Value != ThermalByte.StateVacuum)
+                                continue;
+
+                            // Encode the strength in the red channel
+                            // alpha set to 1 as tile is active
+                            worldHandle.DrawRect(Box2.CenteredAround(tilePosition + grid.Comp.TileSizeHalfVector,
+                                    grid.Comp.TileSizeVector),
+                                MarkerColor);
+                            anyVacuum = true;
+                        }
+                    }
+                }
+            },
+            // This clears the buffer to all zero first...
+            EmptyColor);
+
+        // no distortion, no need to render
+        if (!anyVacuum)
+        {
+            args.WorldHandle.UseShader(null);
+            args.WorldHandle.SetTransform(Matrix3x2.Identity);
+            return false;
+        }
+
+        return true;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        var res = _resources.GetForViewport(args.Viewport, static _ => new CachedResources());
+
+        if (ScreenTexture is null || res.VacuumTarget is null)
+            return;
+
+        _shader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+
+        args.WorldHandle.UseShader(_shader);
+        args.WorldHandle.DrawTextureRect(res.VacuumTarget.Texture, args.WorldBounds);
+
+        args.WorldHandle.UseShader(null);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+    }
+
+    protected override void DisposeBehavior()
+    {
+        _resources.Dispose();
+
+        _configManager.UnsubValueChanged(CCVars.VacuumOverlayIntensity, SetVacuumOverlayIntensity);
+        base.DisposeBehavior();
+    }
+
+    internal sealed class CachedResources : IDisposable
+    {
+        public IRenderTexture? VacuumTarget;
+
+        public void Dispose()
+        {
+            VacuumTarget?.Dispose();
+        }
+    }
+}
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
index 55c47957a0..65104d7e9c 100644
--- a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
@@ -44,6 +44,7 @@
                 <ui:OptionSlider Name="SpeechBubbleTextOpacitySlider" Title="{Loc 'ui-options-speech-bubble-text-opacity'}" />
                 <ui:OptionSlider Name="SpeechBubbleSpeakerOpacitySlider" Title="{Loc 'ui-options-speech-bubble-speaker-opacity'}" />
                 <ui:OptionSlider Name="SpeechBubbleBackgroundOpacitySlider" Title="{Loc 'ui-options-speech-bubble-background-opacity'}" />
+                <ui:OptionSlider Name="VacuumOverlayIntensityOpacitySlider" Title="{Loc 'ui-options-vacuum-overlay-intensity'}" />
                 <CheckBox Name="AutoFillHighlightsCheckBox" Text="{Loc 'ui-options-auto-fill-highlights'}" />
                 <ui:OptionColorSlider Name="HighlightsColorSlider"
                     Title="{Loc 'ui-options-highlights-color'}"
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
index 4f4c0a8e82..e1138c5508 100644
--- a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
@@ -2,14 +2,19 @@ using Content.Shared.CCVar;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Configuration;
 
 namespace Content.Client.Options.UI.Tabs;
 
 [GenerateTypedNameReferences]
 public sealed partial class AccessibilityTab : Control
 {
+    [Dependency] private IConfigurationManager _cfgManager = default!;
+
     public AccessibilityTab()
     {
+        IoCManager.InjectDependencies(this);
+
         RobustXamlLoader.Load(this);
 
         Control.AddOptionCheckBox(CCVars.ChatEnableColorName, EnableColorNameCheckBox);
@@ -30,11 +35,14 @@ public sealed partial class AccessibilityTab : Control
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleTextOpacity, SpeechBubbleTextOpacitySlider);
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleSpeakerOpacity, SpeechBubbleSpeakerOpacitySlider);
         Control.AddOptionPercentSlider(CCVars.SpeechBubbleBackgroundOpacity, SpeechBubbleBackgroundOpacitySlider);
+        Control.AddOptionPercentSlider(CCVars.VacuumOverlayIntensity, VacuumOverlayIntensityOpacitySlider);
         Control.AddOptionCheckBox(CCVars.ChatAutoFillHighlights, AutoFillHighlightsCheckBox);
         Control.AddOptionColorSlider(CCVars.ChatHighlightsColor, HighlightsColorSlider);
 
         Control.AddOptionCheckBox(CCVars.AccessibilityClientCensorNudity, CensorNudityCheckBox);
 
+        VacuumOverlayIntensityOpacitySlider.Visible = _cfgManager.GetCVar(CCVars.VacuumOverlay);
+
         Control.Initialize();
     }
 }
diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
index 061ef36bb0..33f31d5271 100644
--- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
@@ -10,7 +10,6 @@ using Microsoft.Extensions.ObjectPool;
 using Robust.Server.Player;
 using Robust.Shared;
 using Robust.Shared.Enums;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 using Robust.Shared.Threading;
@@ -20,467 +19,466 @@ using System.Runtime.CompilerServices;
 
 // ReSharper disable once RedundantUsingDirective
 
-namespace Content.Server.Atmos.EntitySystems
+namespace Content.Server.Atmos.EntitySystems;
+
+[UsedImplicitly]
+public sealed partial class GasTileOverlaySystem : SharedGasTileOverlaySystem
 {
-    [UsedImplicitly]
-    public sealed partial class GasTileOverlaySystem : SharedGasTileOverlaySystem
+    [Robust.Shared.IoC.Dependency] private IGameTiming _gameTiming = default!;
+    [Robust.Shared.IoC.Dependency] private IPlayerManager _playerManager = default!;
+    [Robust.Shared.IoC.Dependency] private IParallelManager _parMan = default!;
+    [Robust.Shared.IoC.Dependency] private AtmosphereSystem _atmosphereSystem = default!;
+    [Robust.Shared.IoC.Dependency] private ChunkingSystem _chunkingSys = default!;
+
+    [Robust.Shared.IoC.Dependency] private EntityQuery<MapGridComponent> _mapGridQuery;
+    [Robust.Shared.IoC.Dependency] private EntityQuery<GasTileOverlayComponent> _gasTileOverlayQuery;
+
+    /// <summary>
+    /// Per-tick cache of sessions.
+    /// </summary>
+    private readonly List<ICommonSession> _sessions = new();
+    private UpdatePlayerJob _updateJob;
+
+    private readonly Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> _lastSentChunks = new();
+
+    // Oh look its more duplicated decal system code!
+    private readonly ObjectPool<HashSet<Vector2i>> _chunkIndexPool =
+        new DefaultObjectPool<HashSet<Vector2i>>(
+            new DefaultPooledObjectPolicy<HashSet<Vector2i>>(), 64);
+    private readonly ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> _chunkViewerPool =
+        new DefaultObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>>(
+            new DefaultPooledObjectPolicy<Dictionary<NetEntity, HashSet<Vector2i>>>(), 64);
+
+    private bool _doSessionUpdate;
+
+    /// <summary>
+    /// Overlay update interval, in seconds.
+    /// </summary>
+    private float _updateInterval;
+
+    private int _thresholds;
+
+    public override void Initialize()
     {
-        [Robust.Shared.IoC.Dependency] private IGameTiming _gameTiming = default!;
-        [Robust.Shared.IoC.Dependency] private IPlayerManager _playerManager = default!;
-        [Robust.Shared.IoC.Dependency] private IParallelManager _parMan = default!;
-        [Robust.Shared.IoC.Dependency] private AtmosphereSystem _atmosphereSystem = default!;
-        [Robust.Shared.IoC.Dependency] private ChunkingSystem _chunkingSys = default!;
+        base.Initialize();
 
-        [Robust.Shared.IoC.Dependency] private EntityQuery<MapGridComponent> _mapGridQuery = default!;
-        [Robust.Shared.IoC.Dependency] private EntityQuery<GasTileOverlayComponent> _gasTileOverlayQuery = default!;
-
-        /// <summary>
-        /// Per-tick cache of sessions.
-        /// </summary>
-        private readonly List<ICommonSession> _sessions = new();
-        private UpdatePlayerJob _updateJob;
-
-        private readonly Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> _lastSentChunks = new();
-
-        // Oh look its more duplicated decal system code!
-        private ObjectPool<HashSet<Vector2i>> _chunkIndexPool =
-            new DefaultObjectPool<HashSet<Vector2i>>(
-                new DefaultPooledObjectPolicy<HashSet<Vector2i>>(), 64);
-        private ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> _chunkViewerPool =
-            new DefaultObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>>(
-                new DefaultPooledObjectPolicy<Dictionary<NetEntity, HashSet<Vector2i>>>(), 64);
-
-        private bool _doSessionUpdate;
-
-        /// <summary>
-        ///     Overlay update interval, in seconds.
-        /// </summary>
-        private float _updateInterval;
-
-        private int _thresholds;
-
-        public override void Initialize()
+        _updateJob = new UpdatePlayerJob()
         {
-            base.Initialize();
+            EntManager = EntityManager,
+            System = this,
+            ChunkIndexPool = _chunkIndexPool,
+            Sessions = _sessions,
+            ChunkingSys = _chunkingSys,
+            ChunkViewerPool = _chunkViewerPool,
+            LastSentChunks = _lastSentChunks,
+            GridQuery = _mapGridQuery,
+        };
 
-            _updateJob = new UpdatePlayerJob()
+        _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
+
+        InitializeCVars();
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
+        SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(EntityUid uid, GasTileOverlayComponent component, ComponentStartup args)
+    {
+        // This **shouldn't** be required, but just in case we ever get entity prototypes that have gas overlays, we
+        // need to ensure that we send an initial full state to players.
+        Dirty(uid, component);
+    }
+
+    public override void Shutdown()
+    {
+        base.Shutdown();
+        _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
+    }
+
+    private void OnPvsToggle(bool value)
+    {
+        if (value == PvsEnabled)
+            return;
+
+        PvsEnabled = value;
+
+        if (value)
+            return;
+
+        foreach (var lastSent in _lastSentChunks.Values)
+        {
+            foreach (var set in lastSent.Values)
             {
-                EntManager = EntityManager,
-                System = this,
-                ChunkIndexPool = _chunkIndexPool,
-                Sessions = _sessions,
-                ChunkingSys = _chunkingSys,
-                ChunkViewerPool = _chunkViewerPool,
-                LastSentChunks = _lastSentChunks,
-                GridQuery = _mapGridQuery,
-            };
-
-            _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
-
-            InitializeCVars();
-
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
-            SubscribeLocalEvent<GasTileOverlayComponent, ComponentStartup>(OnStartup);
+                set.Clear();
+                _chunkIndexPool.Return(set);
+            }
+            lastSent.Clear();
         }
 
-        private void OnStartup(EntityUid uid, GasTileOverlayComponent component, ComponentStartup args)
+        // PVS was turned off, ensure data gets sent to all clients.
+        var query = AllEntityQuery<GasTileOverlayComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var grid, out var meta))
         {
-            // This **shouldn't** be required, but just in case we ever get entity prototypes that have gas overlays, we
-            // need to ensure that we send an initial full state to players.
-            Dirty(uid, component);
+            grid.ForceTick = _gameTiming.CurTick;
+            Dirty(uid, grid, meta);
         }
+    }
 
-        public override void Shutdown()
+    private void UpdateTickRate(float value) => _updateInterval = value > 0.0f ? 1 / value : float.MaxValue;
+    private void UpdateThresholds(int value) => _thresholds = value;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public void Invalidate(Entity<GasTileOverlayComponent?> grid, Vector2i index)
+    {
+        if (_gasTileOverlayQuery.Resolve(grid.Owner, ref grid.Comp))
+            grid.Comp.InvalidTiles.Add(index);
+    }
+
+    private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+    {
+        if (e.NewStatus != SessionStatus.InGame)
         {
-            base.Shutdown();
-            _playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
-        }
-
-        private void OnPvsToggle(bool value)
-        {
-            if (value == PvsEnabled)
-                return;
-
-            PvsEnabled = value;
-
-            if (value)
-                return;
-
-            foreach (var lastSent in _lastSentChunks.Values)
+            if (_lastSentChunks.Remove(e.Session, out var sets))
             {
-                foreach (var set in lastSent.Values)
+                foreach (var set in sets.Values)
                 {
                     set.Clear();
                     _chunkIndexPool.Return(set);
                 }
-                lastSent.Clear();
-            }
-
-            // PVS was turned off, ensure data gets sent to all clients.
-            var query = AllEntityQuery<GasTileOverlayComponent, MetaDataComponent>();
-            while (query.MoveNext(out var uid, out var grid, out var meta))
-            {
-                grid.ForceTick = _gameTiming.CurTick;
-                Dirty(uid, grid, meta);
             }
         }
 
-        private void UpdateTickRate(float value) => _updateInterval = value > 0.0f ? 1 / value : float.MaxValue;
-        private void UpdateThresholds(int value) => _thresholds = value;
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Invalidate(Entity<GasTileOverlayComponent?> grid, Vector2i index)
+        if (!_lastSentChunks.ContainsKey(e.Session))
         {
-            if (_gasTileOverlayQuery.Resolve(grid.Owner, ref grid.Comp))
-                grid.Comp.InvalidTiles.Add(index);
+            _lastSentChunks[e.Session] = new();
         }
+    }
 
-        private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e)
+    private byte GetOpacity(float moles, float molesVisible, float molesVisibleMax)
+    {
+        return (byte) (ContentHelpers.RoundToLevels(
+            MathHelper.Clamp01((moles - molesVisible) /
+                               (molesVisibleMax - molesVisible)) * 255, byte.MaxValue,
+            _thresholds) * 255 / (_thresholds - 1));
+    }
+
+    public GasOverlayData GetOverlayData(GasMixture? mixture)
+    {
+        ThermalByte byteTemp;
+        if (mixture == null)
         {
-            if (e.NewStatus != SessionStatus.InGame)
+            byteTemp = new();
+            byteTemp.SetVacuum();
+        }
+        else
+            byteTemp = new(mixture.Temperature);
+
+        var data = new GasOverlayData(0, new byte[VisibleGasId.Length], byteTemp);
+
+        for (var i = 0; i < VisibleGasId.Length; i++)
+        {
+            var id = VisibleGasId[i];
+            var gas = _atmosphereSystem.GetGas(id);
+            var moles = mixture?[id] ?? 0f;
+            ref var opacity = ref data.Opacity[i];
+
+            if (moles < gas.GasMolesVisible)
             {
-                if (_lastSentChunks.Remove(e.Session, out var sets))
-                {
-                    foreach (var set in sets.Values)
-                    {
-                        set.Clear();
-                        _chunkIndexPool.Return(set);
-                    }
-                }
+                continue;
             }
 
-            if (!_lastSentChunks.ContainsKey(e.Session))
-            {
-                _lastSentChunks[e.Session] = new();
-            }
-        }
-
-        private byte GetOpacity(float moles, float molesVisible, float molesVisibleMax)
-        {
-            return (byte) (ContentHelpers.RoundToLevels(
-                MathHelper.Clamp01((moles - molesVisible) /
-                                   (molesVisibleMax - molesVisible)) * 255, byte.MaxValue,
+            opacity = (byte) (ContentHelpers.RoundToLevels(
+                MathHelper.Clamp01((moles - gas.GasMolesVisible) /
+                                   (gas.GasMolesVisibleMax - gas.GasMolesVisible)) * 255, byte.MaxValue,
                 _thresholds) * 255 / (_thresholds - 1));
         }
 
-        public GasOverlayData GetOverlayData(GasMixture? mixture)
+        return data;
+    }
+
+    /// <summary>
+    /// Updates the visuals for a tile on some grid chunk. Returns true if the visuals have changed.
+    /// </summary>
+    private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayChunk chunk, Vector2i index)
+    {
+        ref var oldData = ref chunk.TileData[chunk.GetDataIndex(index)];
+        if (!gridAtmosphere.Tiles.TryGetValue(index, out var tile))
         {
-            ThermalByte byteTemp;
-            if (mixture == null)
-            {
-                byteTemp = new();
-                byteTemp.SetVacuum();
-            }
-            else
-                byteTemp = new(mixture.Temperature);
+            if (oldData.Equals(default))
+                return false;
 
-            var data = new GasOverlayData(0, new byte[VisibleGasId.Length], byteTemp);
+            chunk.LastUpdate = _gameTiming.CurTick;
+            oldData = default;
+            return true;
+        }
 
+        var changed = false;
+
+        ThermalByte newByteTemp = new();
+
+        if (tile.Hotspot.Valid)
+            newByteTemp.SetTemperature(tile.Hotspot.Temperature);
+        else if (!tile.Space && tile.Air?.TotalMoles <= ThermalByte.MinimalPressureThreshold)
+            newByteTemp.SetVacuum();
+        else if (!tile.Space && tile.Air != null)
+            newByteTemp = new(tile.Air.Temperature);
+
+        if (oldData.Equals(default))
+        {
+            changed = true;
+            oldData = new GasOverlayData(tile.Hotspot.State, new byte[VisibleGasId.Length], newByteTemp);
+        }
+        else if (oldData.FireState != tile.Hotspot.State ||
+                 Math.Abs(oldData.ByteGasTemperature.Value - newByteTemp.Value) > 1 || // Dirty Temperature when there is more then 1 byte difference. That should measure up to minimum 4 degreese difference, 6 degreese on average.
+                 oldData.ByteGasTemperature.Value != newByteTemp.Value && newByteTemp.Value > ThermalByte.TempResolution) // change of special ThermalByte value
+        {
+            changed = true;
+            oldData = new GasOverlayData(tile.Hotspot.State, oldData.Opacity, newByteTemp);
+        }
+
+        if (tile is {Air: not null, NoGridTile: false})
+        {
             for (var i = 0; i < VisibleGasId.Length; i++)
             {
                 var id = VisibleGasId[i];
                 var gas = _atmosphereSystem.GetGas(id);
-                var moles = mixture?[id] ?? 0f;
-                ref var opacity = ref data.Opacity[i];
+                var moles = tile.Air[id];
+                ref var oldOpacity = ref oldData.Opacity[i];
 
                 if (moles < gas.GasMolesVisible)
                 {
+                    if (oldOpacity != 0)
+                    {
+                        oldOpacity = 0;
+                        changed = true;
+                    }
+
                     continue;
                 }
 
-                opacity = (byte) (ContentHelpers.RoundToLevels(
-                    MathHelper.Clamp01((moles - gas.GasMolesVisible) /
-                                       (gas.GasMolesVisibleMax - gas.GasMolesVisible)) * 255, byte.MaxValue,
-                    _thresholds) * 255 / (_thresholds - 1));
-            }
+                var opacity = GetOpacity(moles, gas.GasMolesVisible, gas.GasMolesVisibleMax);
 
-            return data;
+                if (oldOpacity == opacity)
+                    continue;
+
+                oldOpacity = opacity;
+                changed = true;
+            }
+        }
+        else
+        {
+            for (var i = 0; i < VisibleGasId.Length; i++)
+            {
+                changed |= oldData.Opacity[i] != 0;
+                oldData.Opacity[i] = 0;
+            }
         }
 
-        /// <summary>
-        ///     Updates the visuals for a tile on some grid chunk. Returns true if the visuals have changed.
-        /// </summary>
-        private bool UpdateChunkTile(GridAtmosphereComponent gridAtmosphere, GasOverlayChunk chunk, Vector2i index)
+        if (!changed)
+            return false;
+
+        chunk.LastUpdate = _gameTiming.CurTick;
+        return true;
+    }
+
+    private void UpdateOverlayData()
+    {
+        // TODO parallelize?
+        var query = AllEntityQuery<GasTileOverlayComponent, GridAtmosphereComponent, MetaDataComponent>();
+        while (query.MoveNext(out var uid, out var overlay, out var gam, out var meta))
         {
-            ref var oldData = ref chunk.TileData[chunk.GetDataIndex(index)];
-            if (!gridAtmosphere.Tiles.TryGetValue(index, out var tile))
-            {
-                if (oldData.Equals(default))
-                    return false;
-
-                chunk.LastUpdate = _gameTiming.CurTick;
-                oldData = default;
-                return true;
-            }
-
             var changed = false;
-
-            ThermalByte newByteTemp = new();
-
-            if (tile.Hotspot.Valid)
-                newByteTemp.SetTemperature(tile.Hotspot.Temperature);
-            else if (!tile.Space && tile.Air?.TotalMoles <= 5f)
-                newByteTemp.SetVacuum();
-            else if (!tile.Space && tile.Air != null)
-                newByteTemp = new(tile.Air.Temperature);
-
-            if (oldData.Equals(default))
+            foreach (var index in overlay.InvalidTiles)
             {
-                changed = true;
-                oldData = new GasOverlayData(tile.Hotspot.State, new byte[VisibleGasId.Length], newByteTemp);
-            }
-            else if (oldData.FireState != tile.Hotspot.State ||
-                     Math.Abs(oldData.ByteGasTemperature.Value - newByteTemp.Value) > 1 || // Dirty Temperature when there is more then 1 byte difference. That should measure up to minimum 4 degreese difference, 6 degreese on average.
-                     (oldData.ByteGasTemperature.Value != newByteTemp.Value && newByteTemp.Value > ThermalByte.TempResolution)) // change of special ThermalByte value
-            {
-                changed = true;
-                oldData = new GasOverlayData(tile.Hotspot.State, oldData.Opacity, newByteTemp);
+                var chunkIndex = GetGasChunkIndices(index);
+
+                if (!overlay.Chunks.TryGetValue(chunkIndex, out var chunk))
+                    overlay.Chunks[chunkIndex] = chunk = new GasOverlayChunk(chunkIndex);
+
+                changed |= UpdateChunkTile(gam, chunk, index);
             }
 
-            if (tile is {Air: not null, NoGridTile: false})
-            {
-                for (var i = 0; i < VisibleGasId.Length; i++)
-                {
-                    var id = VisibleGasId[i];
-                    var gas = _atmosphereSystem.GetGas(id);
-                    var moles = tile.Air[id];
-                    ref var oldOpacity = ref oldData.Opacity[i];
+            if (changed)
+                Dirty(uid, overlay, meta);
 
-                    if (moles < gas.GasMolesVisible)
-                    {
-                        if (oldOpacity != 0)
-                        {
-                            oldOpacity = 0;
-                            changed = true;
-                        }
-
-                        continue;
-                    }
-
-                    var opacity = GetOpacity(moles, gas.GasMolesVisible, gas.GasMolesVisibleMax);
-
-                    if (oldOpacity == opacity)
-                        continue;
-
-                    oldOpacity = opacity;
-                    changed = true;
-                }
-            }
-            else
-            {
-                for (var i = 0; i < VisibleGasId.Length; i++)
-                {
-                    changed |= oldData.Opacity[i] != 0;
-                    oldData.Opacity[i] = 0;
-                }
-            }
-
-            if (!changed)
-                return false;
-
-            chunk.LastUpdate = _gameTiming.CurTick;
-            return true;
-        }
-
-        private void UpdateOverlayData()
-        {
-            // TODO parallelize?
-            var query = AllEntityQuery<GasTileOverlayComponent, GridAtmosphereComponent, MetaDataComponent>();
-            while (query.MoveNext(out var uid, out var overlay, out var gam, out var meta))
-            {
-                var changed = false;
-                foreach (var index in overlay.InvalidTiles)
-                {
-                    var chunkIndex = GetGasChunkIndices(index);
-
-                    if (!overlay.Chunks.TryGetValue(chunkIndex, out var chunk))
-                        overlay.Chunks[chunkIndex] = chunk = new GasOverlayChunk(chunkIndex);
-
-                    changed |= UpdateChunkTile(gam, chunk, index);
-                }
-
-                if (changed)
-                    Dirty(uid, overlay, meta);
-
-                overlay.InvalidTiles.Clear();
-            }
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-            AccumulatedFrameTime += frameTime;
-
-            if (_doSessionUpdate)
-            {
-                UpdateSessions();
-                return;
-            }
-
-            if (AccumulatedFrameTime < _updateInterval)
-                return;
-
-            AccumulatedFrameTime -= _updateInterval;
-
-            // First, update per-chunk visual data for any invalidated tiles.
-            UpdateOverlayData();
-
-            // Then, next tick we send the data to players.
-            // This is to avoid doing all the work in the same tick.
-            _doSessionUpdate = true;
-        }
-
-        public void UpdateSessions()
-        {
-            _doSessionUpdate = false;
-
-            if (!PvsEnabled)
-                return;
-
-            // Now we'll go through each player, then through each chunk in range of that player checking if the player is still in range
-            // If they are, check if they need the new data to send (i.e. if there's an overlay for the gas).
-            // Afterwards we reset all the chunk data for the next time we tick.
-            _sessions.Clear();
-
-            foreach (var player in _playerManager.Sessions)
-            {
-                if (player.Status != SessionStatus.InGame)
-                    continue;
-
-                _sessions.Add(player);
-            }
-
-            if (_sessions.Count == 0)
-                return;
-
-            _parMan.ProcessNow(_updateJob, _sessions.Count);
-            _updateJob.LastSessionUpdate = _gameTiming.CurTick;
-        }
-
-        public void Reset(RoundRestartCleanupEvent ev)
-        {
-            foreach (var data in _lastSentChunks.Values)
-            {
-                foreach (var previous in data.Values)
-                {
-                    previous.Clear();
-                    _chunkIndexPool.Return(previous);
-                }
-
-                data.Clear();
-            }
-        }
-
-        #region Jobs
-
-        /// <summary>
-        /// Updates per player gas overlay data.
-        /// </summary>
-        private record struct UpdatePlayerJob : IParallelRobustJob
-        {
-            public int BatchSize => 2;
-
-            public IEntityManager EntManager;
-            public ChunkingSystem ChunkingSys;
-            public GasTileOverlaySystem System;
-            public ObjectPool<HashSet<Vector2i>> ChunkIndexPool;
-            public ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> ChunkViewerPool;
-
-            public GameTick LastSessionUpdate;
-            public Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> LastSentChunks;
-            public List<ICommonSession> Sessions;
-
-            public EntityQuery<MapGridComponent> GridQuery;
-
-            public void Execute(int index)
-            {
-                var playerSession = Sessions[index];
-                var chunksInRange = ChunkingSys.GetChunksForSession(playerSession, ChunkSize, ChunkIndexPool, ChunkViewerPool);
-                var previouslySent = LastSentChunks[playerSession];
-
-                var ev = new GasOverlayUpdateEvent();
-
-                foreach (var (netGrid, oldIndices) in previouslySent)
-                {
-                    // Mark the whole grid as stale and flag for removal.
-                    if (!chunksInRange.TryGetValue(netGrid, out var chunks))
-                    {
-                        previouslySent.Remove(netGrid);
-
-                        // If grid was deleted then don't worry about sending it to the client.
-                        if (!EntManager.TryGetEntity(netGrid, out var gridId) || GridQuery.HasComp(gridId.Value))
-                            ev.RemovedChunks[netGrid] = oldIndices;
-                        else
-                        {
-                            oldIndices.Clear();
-                            ChunkIndexPool.Return(oldIndices);
-                        }
-
-                        continue;
-                    }
-
-                    var old = ChunkIndexPool.Get();
-                    DebugTools.Assert(old.Count == 0);
-                    foreach (var chunk in oldIndices)
-                    {
-                        if (!chunks.Contains(chunk))
-                            old.Add(chunk);
-                    }
-
-                    if (old.Count == 0)
-                        ChunkIndexPool.Return(old);
-                    else
-                        ev.RemovedChunks.Add(netGrid, old);
-                }
-
-                foreach (var (netGrid, gridChunks) in chunksInRange)
-                {
-                    // Not all grids have atmospheres.
-                    if (!EntManager.TryGetEntity(netGrid, out var grid) || !EntManager.TryGetComponent(grid, out GasTileOverlayComponent? overlay))
-                        continue;
-
-                    List<GasOverlayChunk> dataToSend = new();
-                    ev.UpdatedChunks[netGrid] = dataToSend;
-
-                    previouslySent.TryGetValue(netGrid, out var previousChunks);
-
-                    foreach (var gIndex in gridChunks)
-                    {
-                        if (!overlay.Chunks.TryGetValue(gIndex, out var value))
-                            continue;
-
-                        // If the chunk was updated since we last sent it, send it again
-                        if (value.LastUpdate > LastSessionUpdate)
-                        {
-                            dataToSend.Add(value);
-                            continue;
-                        }
-
-                        // Always send it if we didn't previously send it
-                        if (previousChunks == null || !previousChunks.Contains(gIndex))
-                            dataToSend.Add(value);
-                    }
-
-                    previouslySent[netGrid] = gridChunks;
-                    if (previousChunks != null)
-                    {
-                        previousChunks.Clear();
-                        ChunkIndexPool.Return(previousChunks);
-                    }
-                }
-
-                if (ev.UpdatedChunks.Count != 0 || ev.RemovedChunks.Count != 0)
-                    System.RaiseNetworkEvent(ev, playerSession.Channel);
-            }
-        }
-
-        #endregion
-
-        private void InitializeCVars()
-        {
-            Subs.CVar(ConfMan, CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
-            Subs.CVar(ConfMan, CCVars.GasOverlayThresholds, UpdateThresholds, true);
-            Subs.CVar(ConfMan, CVars.NetPVS, OnPvsToggle, true);
+            overlay.InvalidTiles.Clear();
         }
     }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        AccumulatedFrameTime += frameTime;
+
+        if (_doSessionUpdate)
+        {
+            UpdateSessions();
+            return;
+        }
+
+        if (AccumulatedFrameTime < _updateInterval)
+            return;
+
+        AccumulatedFrameTime -= _updateInterval;
+
+        // First, update per-chunk visual data for any invalidated tiles.
+        UpdateOverlayData();
+
+        // Then, next tick we send the data to players.
+        // This is to avoid doing all the work in the same tick.
+        _doSessionUpdate = true;
+    }
+
+    public void UpdateSessions()
+    {
+        _doSessionUpdate = false;
+
+        if (!PvsEnabled)
+            return;
+
+        // Now we'll go through each player, then through each chunk in range of that player checking if the player is still in range
+        // If they are, check if they need the new data to send (i.e. if there's an overlay for the gas).
+        // Afterwards we reset all the chunk data for the next time we tick.
+        _sessions.Clear();
+
+        foreach (var player in _playerManager.Sessions)
+        {
+            if (player.Status != SessionStatus.InGame)
+                continue;
+
+            _sessions.Add(player);
+        }
+
+        if (_sessions.Count == 0)
+            return;
+
+        _parMan.ProcessNow(_updateJob, _sessions.Count);
+        _updateJob.LastSessionUpdate = _gameTiming.CurTick;
+    }
+
+    public void Reset(RoundRestartCleanupEvent ev)
+    {
+        foreach (var data in _lastSentChunks.Values)
+        {
+            foreach (var previous in data.Values)
+            {
+                previous.Clear();
+                _chunkIndexPool.Return(previous);
+            }
+
+            data.Clear();
+        }
+    }
+
+    #region Jobs
+
+    /// <summary>
+    /// Updates per player gas overlay data.
+    /// </summary>
+    private record struct UpdatePlayerJob : IParallelRobustJob
+    {
+        public int BatchSize => 2;
+
+        public IEntityManager EntManager;
+        public ChunkingSystem ChunkingSys;
+        public GasTileOverlaySystem System;
+        public ObjectPool<HashSet<Vector2i>> ChunkIndexPool;
+        public ObjectPool<Dictionary<NetEntity, HashSet<Vector2i>>> ChunkViewerPool;
+
+        public GameTick LastSessionUpdate;
+        public Dictionary<ICommonSession, Dictionary<NetEntity, HashSet<Vector2i>>> LastSentChunks;
+        public List<ICommonSession> Sessions;
+
+        public EntityQuery<MapGridComponent> GridQuery;
+
+        public void Execute(int index)
+        {
+            var playerSession = Sessions[index];
+            var chunksInRange = ChunkingSys.GetChunksForSession(playerSession, ChunkSize, ChunkIndexPool, ChunkViewerPool);
+            var previouslySent = LastSentChunks[playerSession];
+
+            var ev = new GasOverlayUpdateEvent();
+
+            foreach (var (netGrid, oldIndices) in previouslySent)
+            {
+                // Mark the whole grid as stale and flag for removal.
+                if (!chunksInRange.TryGetValue(netGrid, out var chunks))
+                {
+                    previouslySent.Remove(netGrid);
+
+                    // If grid was deleted then don't worry about sending it to the client.
+                    if (!EntManager.TryGetEntity(netGrid, out var gridId) || GridQuery.HasComp(gridId.Value))
+                        ev.RemovedChunks[netGrid] = oldIndices;
+                    else
+                    {
+                        oldIndices.Clear();
+                        ChunkIndexPool.Return(oldIndices);
+                    }
+
+                    continue;
+                }
+
+                var old = ChunkIndexPool.Get();
+                DebugTools.Assert(old.Count == 0);
+                foreach (var chunk in oldIndices)
+                {
+                    if (!chunks.Contains(chunk))
+                        old.Add(chunk);
+                }
+
+                if (old.Count == 0)
+                    ChunkIndexPool.Return(old);
+                else
+                    ev.RemovedChunks.Add(netGrid, old);
+            }
+
+            foreach (var (netGrid, gridChunks) in chunksInRange)
+            {
+                // Not all grids have atmospheres.
+                if (!EntManager.TryGetEntity(netGrid, out var grid) || !EntManager.TryGetComponent(grid, out GasTileOverlayComponent? overlay))
+                    continue;
+
+                List<GasOverlayChunk> dataToSend = new();
+                ev.UpdatedChunks[netGrid] = dataToSend;
+
+                previouslySent.TryGetValue(netGrid, out var previousChunks);
+
+                foreach (var gIndex in gridChunks)
+                {
+                    if (!overlay.Chunks.TryGetValue(gIndex, out var value))
+                        continue;
+
+                    // If the chunk was updated since we last sent it, send it again
+                    if (value.LastUpdate > LastSessionUpdate)
+                    {
+                        dataToSend.Add(value);
+                        continue;
+                    }
+
+                    // Always send it if we didn't previously send it
+                    if (previousChunks == null || !previousChunks.Contains(gIndex))
+                        dataToSend.Add(value);
+                }
+
+                previouslySent[netGrid] = gridChunks;
+                if (previousChunks != null)
+                {
+                    previousChunks.Clear();
+                    ChunkIndexPool.Return(previousChunks);
+                }
+            }
+
+            if (ev.UpdatedChunks.Count != 0 || ev.RemovedChunks.Count != 0)
+                System.RaiseNetworkEvent(ev, playerSession.Channel);
+        }
+    }
+
+    #endregion
+
+    private void InitializeCVars()
+    {
+        Subs.CVar(ConfMan, CCVars.NetGasOverlayTickRate, UpdateTickRate, true);
+        Subs.CVar(ConfMan, CCVars.GasOverlayThresholds, UpdateThresholds, true);
+        Subs.CVar(ConfMan, CVars.NetPVS, OnPvsToggle, true);
+    }
 }
diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
index ad3dec38c7..d3e6c818a0 100644
--- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
+++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
@@ -162,6 +162,11 @@ public struct ThermalByte : IEquatable<ThermalByte>
     public const float TempDegreeResolution = (TempMaximum - TempMinimum) / TempResolution;
     public const float TempToByteFactor = TempResolution / (TempMaximum - TempMinimum);
 
+    /// <summary>
+    /// The minimum pressure gas must have for tile temperature to be networked to clients. Below this threshold thermal byte is set to StateVacuum.
+    /// </summary>
+    public const float MinimalPressureThreshold = 20f;
+
     private byte _coreValue;
 
     public ThermalByte(float temperatureKelvin)
diff --git a/Content.Shared/CCVar/CCVars.Accessibility.Motion.cs b/Content.Shared/CCVar/CCVars.Accessibility.Motion.cs
index 65b33da7ce..cbc68788e3 100644
--- a/Content.Shared/CCVar/CCVars.Accessibility.Motion.cs
+++ b/Content.Shared/CCVar/CCVars.Accessibility.Motion.cs
@@ -43,6 +43,18 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> DisableFlashEffect =
         CVarDef.Create("accessibility.disable_flash_effect", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 
+    /// <summary>
+    ///     Decreases the intensity of the vacuum overlay 1.0f is maximum.
+    /// </summary>
+    public static readonly CVarDef<float> VacuumOverlayIntensity =
+        CVarDef.Create("accessibility.vacuum_overlay_intensity", 0.5f, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+    /// <summary>
+    ///     Toggles vacuum overlay serverside. If you do not want it as an option for your players use this.
+    /// </summary>
+    public static readonly CVarDef<bool> VacuumOverlay =
+        CVarDef.Create("accessibility.vacuum_overlay", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.SERVER);
+
     /// <summary>
     ///     Decreases motion on the heat distortion shader.
     /// </summary>
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 5996e122b8..27a1cbfadd 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -403,6 +403,7 @@ ui-options-chat-window-opacity = Chat window opacity
 ui-options-speech-bubble-text-opacity = Speech bubble text opacity
 ui-options-speech-bubble-speaker-opacity = Speech bubble speaker opacity
 ui-options-speech-bubble-background-opacity = Speech bubble background opacity
+ui-options-vacuum-overlay-intensity = Vacuum overlay intensity
 
 ui-options-censor-nudity = Censor character nudity
 
diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml
index 8758d96472..88bb31916e 100644
--- a/Resources/Prototypes/Shaders/shaders.yml
+++ b/Resources/Prototypes/Shaders/shaders.yml
@@ -140,3 +140,8 @@
   id: Sharpness
   kind: source
   path: "/Textures/Shaders/sharpness.swsl"
+
+- type: shader
+  id: VacuumDesaturation
+  kind: source
+  path: "/Textures/Shaders/vacuum_desaturation.swsl"
diff --git a/Resources/Textures/Shaders/vacuum_desaturation.swsl b/Resources/Textures/Shaders/vacuum_desaturation.swsl
new file mode 100644
index 0000000000..bdcacd8460
--- /dev/null
+++ b/Resources/Textures/Shaders/vacuum_desaturation.swsl
@@ -0,0 +1,14 @@
+uniform sampler2D SCREEN_TEXTURE;
+uniform mediump float intensity;
+
+void fragment()
+{
+    if (texture2D(TEXTURE, UV).r < 0.1)
+        discard;
+
+    mediump vec4 screen_pixel = texture2D(SCREEN_TEXTURE, UV);
+    mediump float gray = dot(screen_pixel.rgb, vec3(0.299, 0.587, 0.114));
+
+    screen_pixel.rgb = mix(screen_pixel.rgb, vec3(gray), intensity);
+    COLOR = screen_pixel;
+}

From b383ea8504e59f40a8598cd6b765c8403e03bb5a Mon Sep 17 00:00:00 2001
From: InsoPL <lukasz.lindert@protonmail.com>
Date: Sun, 4 Oct 2026 15:29:52 +0000
Subject: [PATCH 44/69] Strapable Supplybot (#43786)

* supplybot

* fix for being able to buckle to itself
---
 Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs  | 4 ++--
 Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index ca4ce5033b..f413e5b689 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -260,7 +260,7 @@ public abstract partial class SharedBuckleSystem
         if (!_container.IsInSameOrNoContainer((buckleUid, null, null), (strapUid, null, null)))
             return false;
 
-        if (user != null && !HasComp<HandsComponent>(user))
+        if (user != null && !HasComp<HandsComponent>(user) && strapUid != user)
         {
             if (popup)
                 _popup.PopupEntity(Loc.GetString("buckle-component-no-hands-message"), user.Value, user);
@@ -526,7 +526,7 @@ public abstract partial class SharedBuckleSystem
             if (!_interaction.InRangeUnobstructed(user.Value, strap.Owner, buckle.Comp.Range, popup: popup))
                 return false;
 
-            if (user.Value != buckle.Owner && !ActionBlocker.CanComplexInteract(user.Value))
+            if (user.Value != buckle.Owner && !ActionBlocker.CanComplexInteract(user.Value) && user.Value != strap.Owner)
                 return false;
         }
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index de0750eebf..63aff9241f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -440,6 +440,9 @@
     - Supply
   - type: Puller
     needsHands: false
+  - type: Strap
+    position: Down
+    rotation: -90
 
 - type: entity
   parent: [ MobSiliconBase, MobCombat ]

From 8722815b66b895d5842a4f202fd076bf7f087530 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sun, 4 Oct 2026 20:27:08 +0000
Subject: [PATCH 45/69] Clean up shuttle airlock fixtures (#44521)

* shuttle airlock fixtures

* giant space is kill

* a little space as a treat

* unindent the ports

* shorter comment
---
 .../Structures/Doors/Airlocks/shuttle.yml     | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 7913109f6e..3c64dafed7 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -9,20 +9,14 @@
   - type: Fixtures
     fixtures:
       fix1:
-        shape:
+        shape: &shape
           !type:PhysShapeAabb
           bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
         density: 100
         mask:
-          - FullTileMask
+        - FullTileMask
         layer:
-          - AirlockLayer
-      docking:
-        shape:
-          !type:PhysShapeCircle
-          radius: 0.2
-          position: "0,-0.5"
-        hard: false
+        - AirlockLayer
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/shuttle-base.rsi
     layers:
@@ -81,10 +75,10 @@
   - type: Airtight
     noAirWhenFullyAirBlocked: false
     airBlockedDirection:
-      - South
+    - South
   - type: Tag
     tags:
-      - ForceNoFixRotations
+    - ForceNoFixRotations
   - type: Construction
     graph: AirlockShuttle
     node: airlock
@@ -113,8 +107,12 @@
   - type: Fixtures
     fixtures:
       fix1:
-        layer:     #removed opaque from the layer, allowing lasers to pass through glass airlocks
-        - GlassAirlockLayer
+        shape: *shape
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - GlassAirlockLayer # vs. AirlockLayer
 
 # TODO: migrate into assembly with the others
 - type: entity

From 09ac03b9322c7858d10bf692de9b53381f0d98f4 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Sun, 4 Oct 2026 22:47:04 +0000
Subject: [PATCH 46/69] Door/FirelockComponent cleanup + nullable layer states
 + firelock panel fix (#44714)

* destroy firelock empty sprites with fury

* fix the meta.json

* remove unused states

* we need all the layers

* string? never heard of it

* DoorSystem cleanup, FirelockSystem layer checks

* DoorComponent cleanup

* FirelockComponent cleanup

* firelock panel animation

* fix offset (-15/16, bad math)

* component cleanup and comments

* door cleanup

* 9-state firelock animations, no locked/deny state

* "comments"

* dedicated edge firelock panel, null airlock states

* screw it, subscriptions for airlocksystem too

* format

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 Content.Client/Doors/AirlockSystem.cs         |  79 +++---
 Content.Client/Doors/DoorSystem.cs            |  23 +-
 Content.Client/Doors/FirelockSystem.cs        |  90 ++++---
 .../Doors/Components/AirlockComponent.cs      |  24 +-
 .../Doors/Components/DoorComponent.cs         | 107 +++++---
 .../Doors/Components/FirelockComponent.cs     | 212 +++++++--------
 .../Structures/Doors/Firelocks/firelock.yml   |  20 +-
 .../Misc/edge_door_hazard.rsi/alert_cold.png  | Bin 251 -> 0 bytes
 .../Misc/edge_door_hazard.rsi/alert_hot.png   | Bin 258 -> 0 bytes
 .../edge_door_hazard.rsi/bolted_unlit.png     | Bin 96 -> 0 bytes
 .../edge_door_hazard.rsi/closed_unlit.png     | Bin 366 -> 0 bytes
 .../Misc/edge_door_hazard.rsi/closing.png     | Bin 565 -> 1310 bytes
 .../edge_door_hazard.rsi/closing_unlit.png    | Bin 366 -> 0 bytes
 .../Doors/Misc/edge_door_hazard.rsi/deny.png  | Bin 321 -> 0 bytes
 .../Misc/edge_door_hazard.rsi/deny_unlit.png  | Bin 366 -> 0 bytes
 .../Misc/edge_door_hazard.rsi/locked.png      | Bin 321 -> 0 bytes
 .../Doors/Misc/edge_door_hazard.rsi/meta.json | 250 +++++++-----------
 .../Misc/edge_door_hazard.rsi/opening.png     | Bin 541 -> 1263 bytes
 .../edge_door_hazard.rsi/opening_unlit.png    | Bin 366 -> 0 bytes
 .../Misc/edge_door_hazard.rsi/palert.png      | Bin 214 -> 0 bytes
 .../edge_door_hazard.rsi/panel_closing.png    | Bin 343 -> 476 bytes
 .../Misc/edge_door_hazard.rsi/panel_open.png  | Bin 193 -> 224 bytes
 .../edge_door_hazard.rsi/panel_opening.png    | Bin 329 -> 447 bytes
 23 files changed, 396 insertions(+), 409 deletions(-)
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_cold.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_hot.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/bolted_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closed_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closing_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/locked.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/opening_unlit.png
 delete mode 100644 Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/palert.png

diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs
index d80aa78eaa..ce76f88705 100644
--- a/Content.Client/Doors/AirlockSystem.cs
+++ b/Content.Client/Doors/AirlockSystem.cs
@@ -7,87 +7,83 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Doors;
 
+/// <inheritdoc/>
 public sealed partial class AirlockSystem : SharedAirlockSystem
 {
     [Dependency] private AppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
+    [Dependency] private EntityQuery<DoorComponent> _doorQuery;
 
-    private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
+    [SubscribeLocalEvent]
+    private void OnComponentStartup(Entity<AirlockComponent> ent, ref ComponentStartup args)
     {
         // Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash.
-        if (!TryComp<DoorComponent>(uid, out var door))
+        if (!_doorQuery.TryComp(ent, out var door))
             return;
 
-        if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting.
+        if (ent.Comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting.
         {
-            door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.OpenSpriteState));
-            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.ClosedSpriteState));
+            door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.OpenSpriteState));
+            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.ClosedSpriteState));
         }
 
-        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
+        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
         {
             LayerKey = DoorVisualLayers.BaseUnlit,
-            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningSpriteState, 0f) },
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.OpeningSpriteState, 0f) },
         }
         );
 
-        ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
+        ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
         {
             LayerKey = DoorVisualLayers.BaseUnlit,
-            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingSpriteState, 0f) },
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.ClosingSpriteState, 0f) },
         }
         );
 
-        door.DenyingAnimation = new Animation()
+        door.DenyingAnimation = new Animation
         {
-            Length = TimeSpan.FromSeconds(comp.DenyAnimationTime),
+            Length = TimeSpan.FromSeconds(ent.Comp.DenyAnimationTime),
             AnimationTracks =
             {
-                new AnimationTrackSpriteFlick()
+                new AnimationTrackSpriteFlick
                 {
                     LayerKey = DoorVisualLayers.BaseUnlit,
-                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.DenySpriteState, 0f) },
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.DenySpriteState, 0f) },
                 }
             }
         };
 
-        if (!comp.AnimatePanel)
+        if (!ent.Comp.AnimatePanel)
             return;
 
-        // For some reason the open panel sprite is used for both open and
-        // closed sprites. I really don't get it.
-        door.OpenSpriteStates.Add((WiresVisualLayers.MaintenancePanel, comp.OpenPanelSpriteState));
-        door.ClosedSpriteStates.Add((WiresVisualLayers.MaintenancePanel, comp.OpenPanelSpriteState));
+        door.OpenSpriteStates.Add((WiresVisualLayers.MaintenancePanel, null));
+        door.ClosedSpriteStates.Add((WiresVisualLayers.MaintenancePanel, ent.Comp.OpenPanelSpriteState));
 
-        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
+        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
         {
             LayerKey = WiresVisualLayers.MaintenancePanel,
-            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.OpeningPanelSpriteState, 0f) },
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.OpeningPanelSpriteState, 0f) },
         });
 
         ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
         {
             LayerKey = WiresVisualLayers.MaintenancePanel,
-            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(comp.ClosingPanelSpriteState, 0f) },
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.ClosingPanelSpriteState, 0f) },
         });
     }
 
-    private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<AirlockComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_appearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
+        if (!_appearanceSystem.TryGetData<DoorState>(ent, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        _appearanceSystem.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var hasPower, args.Component);
+        _appearanceSystem.TryGetData<bool>(ent, PowerDeviceVisuals.Powered, out var hasPower, args.Component);
 
         var showBaseUnlit = false;
         var showBolted = false;
@@ -95,10 +91,10 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
 
         if (hasPower)
         {
-            _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var boltedVisible, args.Component);
+            _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.BoltLights, out var boltedVisible, args.Component);
             showBolted = boltedVisible && (state == DoorState.Closed || state == DoorState.Welded);
 
-            _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.EmergencyLights, out var emergencyVisible, args.Component);
+            _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.EmergencyLights, out var emergencyVisible, args.Component);
             showEmergency = emergencyVisible;
 
             if (!showBolted && !showEmergency)
@@ -106,33 +102,34 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
                 if (state == DoorState.Closing || state == DoorState.Opening || state == DoorState.Denying || state == DoorState.Closed)
                     showBaseUnlit = true;
 
-                if (state == DoorState.Open && comp.OpenUnlitVisible)
+                if (state == DoorState.Open && ent.Comp.OpenUnlitVisible)
                     showBaseUnlit = true;
 
-                _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLightsVisible, args.Component);
+                _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.ClosedLights, out var closedLightsVisible, args.Component);
                 if (state == DoorState.Closed && closedLightsVisible)
                     showBaseUnlit = true;
             }
         }
 
-        _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseUnlit, showBaseUnlit);
-        _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseBolted, showBolted);
-        if (comp.EmergencyAccessLayer)
+        _sprite.LayerSetVisible((ent, args.Sprite), DoorVisualLayers.BaseUnlit, showBaseUnlit);
+        _sprite.LayerSetVisible((ent, args.Sprite), DoorVisualLayers.BaseBolted, showBolted);
+        if (ent.Comp.EmergencyAccessLayer)
         {
             var isDoorIdle = state != DoorState.Open && state != DoorState.Opening && state != DoorState.Closing;
-            _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseEmergencyAccess,
+            _sprite.LayerSetVisible((ent, args.Sprite),
+                DoorVisualLayers.BaseEmergencyAccess,
                 showEmergency && isDoorIdle && !showBolted);
         }
 
-        if (comp.OpenUnlitVisible)
+        if (ent.Comp.OpenUnlitVisible)
         {
             switch (state)
             {
                 case DoorState.Open:
-                    _sprite.LayerSetRsiState((uid, args.Sprite), DoorVisualLayers.BaseUnlit, comp.OpenSpriteState);
+                    _sprite.LayerSetRsiState((ent, args.Sprite), DoorVisualLayers.BaseUnlit, ent.Comp.OpenSpriteState);
                     break;
                 case DoorState.Closed:
-                    _sprite.LayerSetRsiState((uid, args.Sprite), DoorVisualLayers.BaseUnlit, comp.ClosedSpriteState);
+                    _sprite.LayerSetRsiState((ent, args.Sprite), DoorVisualLayers.BaseUnlit, ent.Comp.ClosedSpriteState);
                     break;
             }
         }
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index d72589fed6..025f5bb6ed 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -6,23 +6,19 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Doors;
 
+/// <inheritdoc/>
 public sealed partial class DoorSystem : SharedDoorSystem
 {
     [Dependency] private AnimationPlayerSystem _animationSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<DoorComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<DoorComponent, AnimationCompletedEvent>(OnAnimationCompleted);
-    }
-
+    /// <inheritdoc/>
     protected override void OnComponentInit(Entity<DoorComponent> ent, ref ComponentInit args)
     {
+        // Base call deferred until end of function.
         var comp = ent.Comp;
-        comp.OpenSpriteStates = new List<(Enum, string)>(2);
-        comp.ClosedSpriteStates = new List<(Enum, string)>(2);
+        comp.OpenSpriteStates = new(2);
+        comp.ClosedSpriteStates = new(2);
 
         comp.OpenSpriteStates.Add((DoorVisualLayers.Base, comp.OpenSpriteState));
         comp.ClosedSpriteStates.Add((DoorVisualLayers.Base, comp.ClosedSpriteState));
@@ -74,8 +70,11 @@ public sealed partial class DoorSystem : SharedDoorSystem
                 },
             },
         };
+
+        base.OnComponentInit(ent, ref args);
     }
 
+    [SubscribeLocalEvent]
     private void OnAnimationCompleted(Entity<DoorComponent> ent, ref AnimationCompletedEvent args)
     {
         if (args.Key != DoorComponent.OpenKey && args.Key != DoorComponent.CloseKey)
@@ -105,6 +104,7 @@ public sealed partial class DoorSystem : SharedDoorSystem
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(Entity<DoorComponent> entity, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
@@ -116,9 +116,8 @@ public sealed partial class DoorSystem : SharedDoorSystem
         if (AppearanceSystem.TryGetData<string>(entity, PaintableVisuals.Prototype, out var prototype, args.Component))
             UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
 
-        // We are checking beforehand since some doors may not have an emagging visual layer, and we don't want LayerSetVisible to throw an error.
-        if (_sprite.TryGetLayer(entity.Owner, DoorVisualLayers.BaseEmagging, out var _, false))
-            _sprite.LayerSetVisible(entity.Owner, DoorVisualLayers.BaseEmagging, state == DoorState.Emagging);
+        if (_sprite.LayerMapTryGet(entity.Owner, DoorVisualLayers.BaseEmagging, out var emaggingLayer, logMissing: false))
+            _sprite.LayerSetVisible(entity.Owner, emaggingLayer, state == DoorState.Emagging);
 
         UpdateAppearanceForDoorState(entity, args.Sprite, state);
     }
diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index a3644a818b..f4ea6c02cd 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -1,3 +1,4 @@
+using Content.Client.Wires.Visualizers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Robust.Client.Animations;
@@ -5,60 +6,85 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Doors;
 
+// TODO: Consolidate redundant code from the AirlockSystem.
+
+/// <inheritdoc/>
 public sealed partial class FirelockSystem : SharedFirelockSystem
 {
     [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<FirelockComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
+    [Dependency] private EntityQuery<DoorComponent> _doorQuery;
 
+    /// <inheritdoc/>
     protected override void OnComponentStartup(Entity<FirelockComponent> ent, ref ComponentStartup args)
     {
         base.OnComponentStartup(ent, ref args);
-        if (!TryComp<DoorComponent>(ent.Owner, out var door))
+        if (!_doorQuery.TryComp(ent.Owner, out var door))
             return;
 
-        door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.WarningLightSpriteState));
-        door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.WarningLightSpriteState));
+        // Add animations if we have an unlit layer.
+        if (_sprite.LayerMapTryGet(ent.Owner, DoorVisualLayers.BaseUnlit, out _, logMissing: false))
+        {
+            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.WarningLightSpriteState));
+            door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, ent.Comp.WarningLightSpriteState));
 
-        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
-            {
-                LayerKey = DoorVisualLayers.BaseUnlit,
-                KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.OpeningLightSpriteState, 0f) },
-            }
-        );
+            ((Animation)door.OpeningAnimation).AnimationTracks.Add(
+                new AnimationTrackSpriteFlick
+                {
+                    LayerKey = DoorVisualLayers.BaseUnlit,
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.OpeningLightSpriteState, 0f) },
+                }
+            );
 
-        ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick()
-            {
-                LayerKey = DoorVisualLayers.BaseUnlit,
-                KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.ClosingLightSpriteState, 0f) },
-            }
-        );
+            ((Animation)door.ClosingAnimation).AnimationTracks.Add(
+                new AnimationTrackSpriteFlick
+                {
+                    LayerKey = DoorVisualLayers.BaseUnlit,
+                    KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.ClosingLightSpriteState, 0f) },
+                }
+            );
+        }
+
+        if (!ent.Comp.AnimatePanel)
+            return;
+
+        door.OpenSpriteStates.Add((WiresVisualLayers.MaintenancePanel, null));
+        door.ClosedSpriteStates.Add((WiresVisualLayers.MaintenancePanel, ent.Comp.OpenPanelSpriteState));
+
+        ((Animation)door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
+        {
+            LayerKey = WiresVisualLayers.MaintenancePanel,
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.OpeningPanelSpriteState, 0f) },
+        });
+
+        ((Animation)door.ClosingAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
+        {
+            LayerKey = WiresVisualLayers.MaintenancePanel,
+            KeyFrames = { new AnimationTrackSpriteFlick.KeyFrame(ent.Comp.ClosingPanelSpriteState, 0f) },
+        });
     }
 
-    private void OnAppearanceChange(EntityUid uid, FirelockComponent comp, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<FirelockComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        var boltedVisible = false;
-        var unlitVisible = false;
-
-        if (!_appearanceSystem.TryGetData<DoorState>(uid, DoorVisuals.State, out var state, args.Component))
+        if (!_appearanceSystem.TryGetData<DoorState>(ent, DoorVisuals.State, out var state, args.Component))
             state = DoorState.Closed;
 
-        boltedVisible = _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component) && lights;
-        unlitVisible =
+        var boltedVisible = _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.BoltLights, out var lights, args.Component) && lights;
+        var unlitVisible =
             state == DoorState.Closing
-            ||  state == DoorState.Opening
-            ||  state == DoorState.Denying
-            || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights);
+            || state == DoorState.Opening
+            || state == DoorState.Denying
+            || _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights;
 
-        _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseUnlit, unlitVisible && !boltedVisible);
-        _sprite.LayerSetVisible((uid, args.Sprite), DoorVisualLayers.BaseBolted, boltedVisible);
+        if (_sprite.LayerMapTryGet((ent, args.Sprite), DoorVisualLayers.BaseUnlit, out var unlitLayer, logMissing: false))
+            _sprite.LayerSetVisible((ent, args.Sprite), unlitLayer, unlitVisible && !boltedVisible);
+
+        if (_sprite.LayerMapTryGet((ent, args.Sprite), DoorVisualLayers.BaseBolted, out var boltedLayer, logMissing: false))
+            _sprite.LayerSetVisible((ent, args.Sprite), boltedLayer, boltedVisible);
     }
 }
diff --git a/Content.Shared/Doors/Components/AirlockComponent.cs b/Content.Shared/Doors/Components/AirlockComponent.cs
index d79c807e66..d5e7ffdd72 100644
--- a/Content.Shared/Doors/Components/AirlockComponent.cs
+++ b/Content.Shared/Doors/Components/AirlockComponent.cs
@@ -21,7 +21,7 @@ public sealed partial class AirlockComponent : Component
     public bool Safety = true;
 
     [DataField, AutoNetworkedField]
-    public bool EmergencyAccess = false;
+    public bool EmergencyAccess;
 
     /// <summary>
     /// Sound to play when the airlock emergency access is turned on.
@@ -47,14 +47,14 @@ public sealed partial class AirlockComponent : Component
     /// Whether the maintenance panel should be visible even if the airlock is opened.
     /// </summary>
     [DataField]
-    public bool OpenPanelVisible = false;
+    public bool OpenPanelVisible;
 
     /// <summary>
     /// Whether the airlock should stay open if the airlock was clicked.
     /// If the airlock was bumped into it will still auto close.
     /// </summary>
     [DataField]
-    public bool KeepOpenIfClicked = false;
+    public bool KeepOpenIfClicked;
 
     /// <summary>
     /// Whether the airlock should auto close. This value is reset every time the airlock closes.
@@ -90,7 +90,7 @@ public sealed partial class AirlockComponent : Component
     /// Whether the door lights should be visible.
     /// </summary>
     [DataField]
-    public bool OpenUnlitVisible = false;
+    public bool OpenUnlitVisible;
 
     /// <summary>
     /// Whether the door should display emergency access lights.
@@ -108,50 +108,50 @@ public sealed partial class AirlockComponent : Component
     /// The sprite state used to animate the airlock frame when the airlock opens.
     /// </summary>
     [DataField]
-    public string OpeningSpriteState = "opening_unlit";
+    public string? OpeningSpriteState = "opening_unlit";
 
     /// <summary>
     /// The sprite state used to animate the airlock panel when the airlock opens.
     /// </summary>
     [DataField]
-    public string OpeningPanelSpriteState = "panel_opening";
+    public string? OpeningPanelSpriteState = "panel_opening";
 
     /// <summary>
     /// The sprite state to use for the wire panel when the airlock is open. The
     /// first frame will be used for when the airlock is closed.
     /// </summary>
     [DataField]
-    public string OpenPanelSpriteState = "panel_open";
+    public string? OpenPanelSpriteState = "panel_open";
 
     /// <summary>
     /// The sprite state used to animate the airlock frame when the airlock closes.
     /// </summary>
     [DataField]
-    public string ClosingSpriteState = "closing_unlit";
+    public string? ClosingSpriteState = "closing_unlit";
 
     /// <summary>
     /// The sprite state used to animate the airlock panel when the airlock closes.
     /// </summary>
     [DataField]
-    public string ClosingPanelSpriteState = "panel_closing";
+    public string? ClosingPanelSpriteState = "panel_closing";
 
     /// <summary>
     /// The sprite state used for the open airlock lights.
     /// </summary>
     [DataField]
-    public string OpenSpriteState = "open_unlit";
+    public string? OpenSpriteState = "open_unlit";
 
     /// <summary>
     /// The sprite state used for the closed airlock lights.
     /// </summary>
     [DataField]
-    public string ClosedSpriteState = "closed_unlit";
+    public string? ClosedSpriteState = "closed_unlit";
 
     /// <summary>
     /// The sprite state used for the 'access denied' lights animation.
     /// </summary>
     [DataField]
-    public string DenySpriteState = "deny_unlit";
+    public string? DenySpriteState = "deny_unlit";
 
     /// <summary>
     /// How long the animation played when the airlock denies access is in seconds.
diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs
index d7926b8be4..58db40fa83 100644
--- a/Content.Shared/Doors/Components/DoorComponent.cs
+++ b/Content.Shared/Doors/Components/DoorComponent.cs
@@ -12,6 +12,10 @@ using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
 
 namespace Content.Shared.Doors.Components;
 
+/// <summary>
+/// A component for doors, airlocks, etc.
+/// Stores animation data and
+/// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class DoorComponent : Component
 {
@@ -21,7 +25,6 @@ public sealed partial class DoorComponent : Component
     /// <remarks>
     /// This should never be set directly, use <see cref="SharedDoorSystem.SetState(EntityUid, DoorState, DoorComponent?)"/> instead.
     /// </remarks>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField, AutoNetworkedField]
     [Access(typeof(SharedDoorSystem))]
     public DoorState State = DoorState.Closed;
@@ -55,7 +58,7 @@ public sealed partial class DoorComponent : Component
     public TimeSpan OpenTimeTwo = TimeSpan.FromSeconds(0.2f);
 
     /// <summary>
-    ///     Interval between deny sounds & visuals;
+    /// Interval between deny sounds & visuals;
     /// </summary>
     [DataField]
     public TimeSpan DenyDuration = TimeSpan.FromSeconds(0.45f);
@@ -64,14 +67,14 @@ public sealed partial class DoorComponent : Component
     public TimeSpan EmagDuration = TimeSpan.FromSeconds(0.8f);
 
     /// <summary>
-    ///     When the door is active, this is the time when the state will next update.
+    /// When the door is active, this is the time when the state will next update.
     /// </summary>
     [AutoNetworkedField, ViewVariables]
     public TimeSpan? NextStateChange;
 
     /// <summary>
-    ///     Whether the door is currently partially closed or open. I.e., when the door is "closing" and is already opaque,
-    ///     but not yet actually closed.
+    /// Whether the door is currently partially closed or open. I.e., when the door is "closing" and is already opaque,
+    /// but not yet actually closed.
     /// </summary>
     [DataField, AutoNetworkedField]
     public bool Partial;
@@ -81,32 +84,32 @@ public sealed partial class DoorComponent : Component
     /// <summary>
     /// Sound to play when the door opens.
     /// </summary>
-    [DataField("openSound")]
+    [DataField]
     public SoundSpecifier? OpenSound;
 
     /// <summary>
     /// Sound to play when the door closes.
     /// </summary>
-    [DataField("closeSound")]
+    [DataField]
     public SoundSpecifier? CloseSound;
 
     /// <summary>
     /// Sound to play if the door is denied.
     /// </summary>
-    [DataField("denySound")]
+    [DataField]
     public SoundSpecifier? DenySound;
 
     /// <summary>
     /// Sound to play when door has been emagged or possibly electrically tampered
     /// </summary>
-    [DataField("sparkSound")]
+    [DataField]
     public SoundSpecifier SparkSound = new SoundCollectionSpecifier("sparks");
     #endregion
 
     #region Crushing
     /// <summary>
-    ///     This is how long a door-crush will stun you. This also determines how long it takes the door to open up
-    ///     again. Total stun time is actually given by this plus <see cref="OpenTimeOne"/>.
+    /// This is how long a door-crush will stun you. This also determines how long it takes the door to open up
+    /// again. Total stun time is actually given by this plus <see cref="OpenTimeOne"/>.
     /// </summary>
     [DataField]
     public TimeSpan DoorStunTime = TimeSpan.FromSeconds(2f);
@@ -137,64 +140,69 @@ public sealed partial class DoorComponent : Component
 
     #region Graphics
 
-
+    /// <summary>
+    /// The animation key used when the door is opening.
+    /// </summary>
     public const string OpenKey = "door_animation_open";
 
+    /// <summary>
+    /// The animation key used when the door is closing.
+    /// </summary>
     public const string CloseKey = "door_animation_close";
 
     /// <summary>
-    /// The key used when playing door deny animations.
+    /// The animation key used when the door has denied someone access.
     /// </summary>
     public const string DenyKey = "door_animation_deny";
 
     /// <summary>
-    /// The key used when playing door emag animations.
+    /// The animation key used when the door has been emagged.
     /// </summary>
     public const string EmagKey = "door_animation_emag";
 
     /// <summary>
-    /// The sprite state used for the door when it's open.
+    /// The sprite state used for the door's base layer when it's open.
     /// </summary>
     [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string OpenSpriteState = "open";
+    public string? OpenSpriteState = "open";
 
     /// <summary>
-    /// The sprite states used for the door while it's open.
+    /// The map of keyed sprite states used for the door while it's open.
+    /// When the door finishes opening, any mapped layer contained will be updated.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public List<(Enum, string)> OpenSpriteStates = default!;
+    [ViewVariables]
+    public List<(Enum, string?)> OpenSpriteStates = default!;
 
     /// <summary>
-    /// The sprite state used for the door when it's closed.
+    /// The sprite state used for the door's base layer when it's closed.
     /// </summary>
     [DataField]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string ClosedSpriteState = "closed";
+    public string? ClosedSpriteState = "closed";
 
     /// <summary>
-    /// The sprite states used for the door while it's closed.
+    /// The map of keyed sprite states used for the door while it's closed.
+    /// When the door finishes closing, any mapped layer contained will be updated.
     /// </summary>
-    [ViewVariables(VVAccess.ReadOnly)]
-    public List<(Enum, string)> ClosedSpriteStates = default!;
+    [ViewVariables]
+    public List<(Enum, string?)> ClosedSpriteStates = default!;
 
     /// <summary>
     /// The sprite state used for the door when it's opening.
     /// </summary>
     [DataField]
-    public string OpeningSpriteState = "opening";
+    public string? OpeningSpriteState = "opening";
 
     /// <summary>
     /// The sprite state used for the door when it's closing.
     /// </summary>
     [DataField]
-    public string ClosingSpriteState = "closing";
+    public string? ClosingSpriteState = "closing";
 
     /// <summary>
     /// The sprite state used for the door when it's being emagged.
     /// </summary>
     [DataField]
-    public string EmaggingSpriteState = "sparks";
+    public string? EmaggingSpriteState = "sparks";
 
     /// <summary>
     /// The length of the door's opening animation.
@@ -238,7 +246,7 @@ public sealed partial class DoorComponent : Component
 
     #region Serialization
     /// <summary>
-    ///     Time until next state change. Because apparently <see cref="IGameTiming.CurTime"/> might not get saved/restored.
+    /// Time until next state change. Because apparently <see cref="IGameTiming.CurTime"/> might not get saved/restored.
     /// </summary>
     [DataField]
     private float? SecondsUntilStateChange
@@ -265,9 +273,15 @@ public sealed partial class DoorComponent : Component
     }
     #endregion
 
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    /// <summary>
+    /// Whether or not the door can be pried open with a tool.
+    /// </summary>
+    [DataField]
     public bool CanPry = true;
 
+    /// <summary>
+    /// The quality of the tool needed to pry the door open.
+    /// </summary>
     [DataField]
     public ProtoId<ToolQualityPrototype> PryingQuality = "Prying";
 
@@ -277,27 +291,27 @@ public sealed partial class DoorComponent : Component
     [DataField]
     public TimeSpan PryTime = TimeSpan.FromSeconds(1.5f);
 
+    /// <summary>
+    /// If true, the door toggles airtight status when opening or closing.
+    /// </summary>
     [DataField]
     public bool ChangeAirtight = true;
 
     /// <summary>
     /// Whether the door blocks light.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool Occludes = true;
 
     /// <summary>
     /// Whether the door will open when it is bumped into.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool BumpOpen = true;
 
     /// <summary>
     /// Whether the door will open when it is activated or clicked.
     /// </summary>
-    [ViewVariables(VVAccess.ReadWrite)]
     [DataField]
     public bool ClickOpen = true;
 
@@ -315,13 +329,23 @@ public sealed partial class DoorComponent : Component
     [DataField]
     public bool AllowMachineLayer;
 
+    /// <summary>
+    /// The draw depth of the door when it is open.
+    /// </summary>
     [DataField(customTypeSerializer: typeof(ConstantSerializer<DrawDepthTag>))]
-    public int OpenDrawDepth = (int) DrawDepth.DrawDepth.Doors;
+    public int OpenDrawDepth = (int)DrawDepth.DrawDepth.Doors;
 
+    /// <summary>
+    /// The draw depth of the door when it is closed.
+    /// </summary>
     [DataField(customTypeSerializer: typeof(ConstantSerializer<DrawDepthTag>))]
-    public int ClosedDrawDepth = (int) DrawDepth.DrawDepth.Doors;
+    public int ClosedDrawDepth = (int)DrawDepth.DrawDepth.Doors;
 }
 
+/// <summary>
+/// An enumeration for the current status of the door.
+/// </summary>
+/// <seealso cref="DoorVisuals.State"/>
 [Serializable, NetSerializable]
 public enum DoorState : byte
 {
@@ -334,6 +358,9 @@ public enum DoorState : byte
     Emagging
 }
 
+/// <summary>
+/// AppearanceData keys for door data.
+/// </summary>
 [Serializable, NetSerializable]
 public enum DoorVisuals : byte
 {
@@ -343,11 +370,19 @@ public enum DoorVisuals : byte
     ClosedLights,
 }
 
+/// <summary>
+/// Sprite layer keys for door visuals.
+/// </summary>
 public enum DoorVisualLayers : byte
 {
+    /// <summary>The body of the door.</summary>
     Base,
+    /// <summary>Any lights on the body of the door.</summary>
     BaseUnlit,
+    /// <summary>An indicator that the door is bolted.</summary>
     BaseBolted,
+    /// <summary>An indicator that anyone is permited to open/close the door.</summary>
     BaseEmergencyAccess,
+    /// <summary>A reaction on the door when emagged, typically sparks.</summary>
     BaseEmagging,
 }
diff --git a/Content.Shared/Doors/Components/FirelockComponent.cs b/Content.Shared/Doors/Components/FirelockComponent.cs
index 027aa24fdf..00f1d49004 100644
--- a/Content.Shared/Doors/Components/FirelockComponent.cs
+++ b/Content.Shared/Doors/Components/FirelockComponent.cs
@@ -1,134 +1,136 @@
 using Content.Shared.Guidebook;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Doors.Components
+namespace Content.Shared.Doors.Components;
+
+/// <summary>
+/// Companion component to <see cref="DoorComponent"/> that handles firelock-specific behavior, including
+/// auto-closing on depressurization, air/fire alarm interactions, and preventing normal door functions when
+/// retaining pressure..
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class FirelockComponent : Component
 {
+    #region Settings
+
     /// <summary>
-    /// Companion component to <see cref="DoorComponent"/> that handles firelock-specific behavior, including
-    /// auto-closing on depressurization, air/fire alarm interactions, and preventing normal door functions when
-    /// retaining pressure..
+    /// Pry time modifier to be used when the firelock is currently closed due to fire or pressure.
     /// </summary>
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-    public sealed partial class FirelockComponent : Component
-    {
-        #region Settings
+    [DataField]
+    public float LockedPryTimeModifier = 1.5f;
 
-        /// <summary>
-        /// Pry time modifier to be used when the firelock is currently closed due to fire or pressure.
-        /// </summary>
-        /// <returns></returns>
-        [DataField("lockedPryTimeModifier"), ViewVariables(VVAccess.ReadWrite)]
-        public float LockedPryTimeModifier = 1.5f;
+    /// <summary>
+    /// Maximum pressure difference before the firelock will refuse to open, in kPa.
+    /// </summary>
+    [DataField, GuidebookData]
+    public float PressureThreshold = 20;
 
-        /// <summary>
-        /// Maximum pressure difference before the firelock will refuse to open, in kPa.
-        /// </summary>
-        [DataField("pressureThreshold"), ViewVariables(VVAccess.ReadWrite)]
-        [GuidebookData]
-        public float PressureThreshold = 20;
+    /// <summary>
+    /// Maximum temperature difference before the firelock will refuse to open, in k.
+    /// </summary>
+    [DataField, GuidebookData]
+    public float TemperatureThreshold = 330;
+    // this used to check for hot-spots, but because accessing that data is a a mess this now just checks
+    // temperature. This does mean a cold room will trigger hot-air pop-ups
 
-        /// <summary>
-        /// Maximum temperature difference before the firelock will refuse to open, in k.
-        /// </summary>
-        [DataField("temperatureThreshold"), ViewVariables(VVAccess.ReadWrite)]
-        [GuidebookData]
-        public float TemperatureThreshold = 330;
-        // this used to check for hot-spots, but because accessing that data is a a mess this now just checks
-        // temperature. This does mean a cold room will trigger hot-air pop-ups
+    /// <summary>
+    /// If true, and if this door has an <see cref="AtmosAlarmableComponent"/>, then it will only auto-close if the
+    /// alarm is set to danger.
+    /// </summary>
+    [DataField]
+    public bool AlarmAutoClose = true;
 
-        /// <summary>
-        /// If true, and if this door has an <see cref="AtmosAlarmableComponent"/>, then it will only auto-close if the
-        /// alarm is set to danger.
-        /// </summary>
-        [DataField("alarmAutoClose"), ViewVariables(VVAccess.ReadWrite)]
-        public bool AlarmAutoClose = true;
+    /// <summary>
+    /// The cooldown duration before a firelock can automatically close due to a hazardous environment after it has
+    /// been pried open. Measured in seconds.
+    /// </summary>
+    [DataField]
+    public TimeSpan EmergencyCloseCooldownDuration = TimeSpan.FromSeconds(2);
 
-        /// <summary>
-        /// The cooldown duration before a firelock can automatically close due to a hazardous environment after it has
-        /// been pried open. Measured in seconds.
-        /// </summary>
-        [DataField]
-        public TimeSpan EmergencyCloseCooldownDuration = TimeSpan.FromSeconds(2);
+    #endregion
 
-        #endregion
+    #region Set by system
 
-        #region Set by system
+    /// <summary>
+    /// When the firelock will be allowed to automatically close again due to a hazardous environment.
+    /// </summary>
+    [DataField]
+    public TimeSpan? EmergencyCloseCooldown;
 
-        /// <summary>
-        /// When the firelock will be allowed to automatically close again due to a hazardous environment.
-        /// </summary>
-        [DataField]
-        public TimeSpan? EmergencyCloseCooldown;
+    /// <summary>
+    /// Whether the firelock can open, or is locked due to its environment.
+    /// </summary>
+    public bool IsLocked => Pressure || Temperature;
 
-        /// <summary>
-        /// Whether the firelock can open, or is locked due to its environment.
-        /// </summary>
-        public bool IsLocked => Pressure || Temperature;
+    /// <summary>
+    /// Whether the firelock is holding back a hazardous pressure.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Pressure;
 
-        /// <summary>
-        /// Whether the firelock is holding back a hazardous pressure.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool Pressure;
+    /// <summary>
+    /// Whether the firelock is holding back extreme temperatures.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Temperature;
 
-        /// <summary>
-        /// Whether the firelock is holding back extreme temperatures.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool Temperature;
+    /// <summary>
+    /// Whether the airlock is powered.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Powered;
 
-        /// <summary>
-        /// Whether the airlock is powered.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public bool Powered;
+    #endregion
 
-        #endregion
+    #region Client animation
 
-        #region Client animation
+    /// <summary>
+    /// The sprite state used to animate the airlock frame when the airlock opens.
+    /// </summary>
+    [DataField]
+    public string? OpeningLightSpriteState = "opening_unlit";
 
-        /// <summary>
-        /// The sprite state used to animate the airlock frame when the airlock opens.
-        /// </summary>
-        [DataField]
-        public string OpeningLightSpriteState = "opening_unlit";
+    /// <summary>
+    /// The sprite state used to animate the airlock frame when the airlock closes.
+    /// </summary>
+    [DataField]
+    public string? ClosingLightSpriteState = "closing_unlit";
 
-        /// <summary>
-        /// The sprite state used to animate the airlock frame when the airlock closes.
-        /// </summary>
-        [DataField]
-        public string ClosingLightSpriteState = "closing_unlit";
+    /// <summary>
+    /// Whether or not the maintenance panel on this door should be animated.
+    /// </summary>
+    [DataField]
+    public bool AnimatePanel = true;
 
-        /// <summary>
-        /// The sprite state used to animate the airlock panel when the airlock opens.
-        /// </summary>
-        [DataField]
-        public string OpeningPanelSpriteState = "panel_opening";
+    /// <summary>
+    /// The sprite state used to animate the airlock panel when the airlock opens.
+    /// </summary>
+    [DataField]
+    public string? OpeningPanelSpriteState = "panel_opening";
 
-        /// <summary>
-        /// The sprite state used to animate the airlock panel when the airlock closes.
-        /// </summary>
-        [DataField]
-        public string ClosingPanelSpriteState = "panel_closing";
+    /// <summary>
+    /// The sprite state used to draw when the door is closed, but the panel is open.
+    /// </summary>
+    [DataField]
+    public string? OpenPanelSpriteState = "panel_open";
 
-        /// <summary>
-        /// The sprite state used for the open airlock lights.
-        /// </summary>
-        [DataField]
-        public string OpenLightSpriteState = "open_unlit";
+    /// <summary>
+    /// The sprite state used to animate the airlock panel when the airlock closes.
+    /// </summary>
+    [DataField]
+    public string? ClosingPanelSpriteState = "panel_closing";
 
-        /// <summary>
-        /// The sprite state used for the closed airlock lights.
-        /// </summary>
-        [DataField]
-        public string WarningLightSpriteState = "closed_unlit";
+    /// <summary>
+    /// The sprite state used for the closed airlock lights.
+    /// </summary>
+    [DataField]
+    public string? WarningLightSpriteState = "closed_unlit";
 
-        /// <summary>
-        /// The sprite state used for the 'access denied' lights animation.
-        /// </summary>
-        [DataField]
-        public string DenySpriteState = "deny_unlit";
+    /// <summary>
+    /// The sprite state used for the 'access denied' lights animation.
+    /// </summary>
+    [DataField]
+    public string? DenySpriteState = "deny_unlit";
 
-        #endregion
-    }
+    #endregion
 }
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 47ae39dc1a..838fa6151c 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -206,6 +206,7 @@
   id: FirelockEdge
   parent: Firelock
   name: firelock
+  suffix: Edge
   components:
     - type: Sprite
       sprite: Structures/Doors/Misc/edge_door_hazard.rsi
@@ -213,31 +214,17 @@
       layers:
       - state: closed
         map: [ "enum.DoorVisualLayers.Base" ]
-      - state: closed_unlit
-        shader: unshaded
-        sprite: Structures/Doors/Misc/edge_door_hazard.rsi
-        map: [ "enum.DoorVisualLayers.BaseUnlit" ]
-        visible: false
       - state: welded
-        sprite: Structures/Doors/Misc/edge_door_hazard.rsi
         map: [ "enum.WeldableLayers.BaseWelded" ]
-      - state: bolted_unlit
-        shader: unshaded
-        sprite: Structures/Doors/Misc/edge_door_hazard.rsi
-        map: [ "enum.DoorVisualLayers.BaseBolted" ]
-        visible: false
       - state: panel_open
-        sprite: Structures/Doors/Airlocks/Effects/airlock-effects.rsi
         map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
       - state: pressure_unlit
         visible: false
         shader: unshaded
-        sprite: Structures/Doors/Misc/edge_door_hazard.rsi
         map: [ "enum.FirelockVisualLayersPressure.Base" ]
       - state: temperature_unlit
         visible: false
         shader: unshaded
-        sprite: Structures/Doors/Misc/edge_door_hazard.rsi
         map: [ "enum.FirelockVisualLayersTemperature.Base" ]
     - type: Airtight
       airBlocked: false
@@ -259,6 +246,11 @@
       enabled: false
     - type: Door
       occludes: false
+    - type: Firelock # Remove absent unlit states
+      openingLightSpriteState: null
+      closingLightSpriteState: null
+      warningLightSpriteState: null
+      denySpriteState: null
     - type: Physics
       canCollide: false
     - type: Construction
diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_cold.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_cold.png
deleted file mode 100644
index c18f592c9f02f7bc8e8e21c502d87771b5147872..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGohdf;zLn`LHy|t0|kbwYefV%cU
zpLxo~29syL)bL<!RBPP)=)0Hqw0%XJ9zXJL?a%6dTKcwZ?!9Z@-X%KcZoDFP@zF|G
zmt4VU`HJ)NUWz|Fe~6R8@7-(r1F|z-#IJ9-Xvqk)0|I0gZ|iu&b9j~Rw5?`4Q_^Q{
zW=`3e!XCkE-4G|?uqlzf;5?s!)p`Y(@&@C}Lf%(`!|Pm%HUE}8bvMbe-X+d9AxF<O
g+-`2T08H6|Lb;5(dD&r>sofwUPgg&ebxsLQ0DcKtu>b%7

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_hot.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/alert_hot.png
deleted file mode 100644
index 3a572356dc6df4b579a67e59c819a422f5eafeb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoCp}#pLn`LHy|t0I*+78xg0l5R
zWB*@Yd=3U}xV%&$)a8;x5y$@Us7+svo;-H+eN+Fkj*qo(_ifx(&M&>Jqp<UYOxu~`
z%Eb~zohR1v?@9On-u)r`Aq#`}_pkB~_;kLk4|jMy2WSfv^lfxWDQ!#B6@0wf%rY!}
zXDGYI<?mNHl@>i^oYTT6l3mX5IcDyH+&D*=28Qrus$nmDVt<OQeR^kd$<yd7dDg#F
kcoy8SVu<}2g{1CyB~z($46DOI*&2{uPgg&ebxsLQ0KUCpBLDyZ

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/bolted_unlit.png
deleted file mode 100644
index 0858c19f0521b74f4a058fbddc280ea48a5751bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>Ygr+Ar*7p9%SSN@(wNd?w`wN
fz5vKX1`XxR4h{^A{hv+-f`mO?{an^LB{Ts5qcarg

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closed_unlit.png
deleted file mode 100644
index 2a951fd0e6d03e2ff1872fc3c24e649c1ba46db0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo}rO2qk9QZ(T>yz&ooa@Ed~xChm}E!k(GfF$npYWX($`y91TWhus9QtZOF*PAPA(R
zfH<?A1uUKeWP?Bg5QFr?Xmnc{7?>FtCa^QG0M!^685=MzfS3!?!@2-s)-)g+1eky(
zF@aSESy}*DP+f)w1|Zp+%V$kJxt%*6$dvMQaSVxYe|wM-WK5I7|Mhtu4nWp{ol*h{
V42*LtJe`3&22WQ%mvv4FO#r^0K6L;9

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closing.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closing.png
index 2f954bac2b762e035595dccb3a36eb29f9aac5e6..afd1596fd579e85fa922384b9972af640a0bcb2f 100644
GIT binary patch
delta 1304
zcmV+z1?T#;1fB|z7k^*~1^@s6;+S_h00001b5ch_0Itp)=>Px(*hxe|RCt{2ok3{Z
zRvgAZJMJMW?i_0Gu?#~P3xWk_r^LH-JLa?v#$c2VmL|l95_%Y84A#@wO6j4DExXj%
z*$$)ZnA`?qmmZevG?J!}rR-7?aOE|kCQ3#cv_mXKvL*S+mVeTKzaN;y!tedQ$VArR
z`(uC*LI@#*5JCtcgb+dqA%qY@2qA=!$VmWzs;Xw8P{7vK7Uqi^*xfT@kqw<sU}1F(
zqobo(Uth=O=4RjfQ?2s3yU!D`*qf9~8|K0)P$(1tzyyweKP&zlOBYeA)ndt@s;c?f
zI~#EMRaG_f`G355`^rE(Z@UM#uMC*^eBM-5)pYuW5T}yC&)<AQV$Gqds_FD64a30f
z%nT+cl5siPn4Cyrc4h{KVc;zJ%cT_3>2$1aUDsXy6aZv%ISfA?0B{(q++z6I0J6E9
z{oL}$^{+4MfA`)wD2ftW4k3hT7>3KA1c17xVduh89Dhzvb}k&Du4(r3)AS1=Oh5l=
zocxu=1J~c5R1^i3Y86`#PwgWBTMtcCs#Pe8g0tk$WHPaO8;u6WK0I{!lK@aG7O}88
zhRR$b_Ono#OPC9*V<;Aj_Oa9S-+b>0{QRH4{WnxqjU_{^R!ayWP?<}({GRv0`ksl*
z`2=?NOn(eT_!EHCeR#k52_b|KLI@#*5JCtcgb+dqA%qY@2#J^%-jDBhf7^V($JdVK
zBU9PPdXlQDnt%QBsM-E*>BqP9^B)XO<JPrBdu=Z{PQ1r_u{e$S;*Wv;|Hi+Cp=sFF
zw{h!g_#Exds~F0>ifk^2ZB4^`@teT;0M{eRo_~C^@@E1tJN5IU%;EHQ>kpg5%jxHL
z%?G5@X_QN;SbFlhu0sfcaw+B8&lf^K2oY%xr`OsqXg<Ko&`S<4r*lu=`G6<)4FJH)
zmy}4W+Ez8&+W+x#%Cnyj0M6I-nxoZg?Kk}F(9{3X(o6QSZgcoKoqIlBKIc6j@Xw=U
zY=0+zW%0n?KWIL{`MM}he(QdaoKNT`N08Hb+~v2ff#p)lzD7k^(QaNhU5|1p)piYb
z`lHC<<qhi(n<L2S=TA8Ag04@l;jO6@0N{f!UyH0hErc+C|KTYBVCC26`0mef`&JB&
zyO8UXYgkieQM&Y#y|$MePA>r5z5fZujekm@fB((zQE%P_b(6!(Y25|YH4XWluU!5!
z(U0$UKOuw=LI@#*5JCtcgb+dqA%qY@2q6*k!u#?4?r)n9crZAPp;u0tTw!|hLEZSe
zreRy(?%2<_<`Y`i2Ic7FJz3j%KEd+KX2@hRkaNS^AEqBK)06MijqjzOACyDJ8-KOm
z$`Hog>QCAI_@SFfFDtlnc^?39W9g!OQVqkfkAHe^(C^#>j&A(d@BeGR-q{eob9o=5
zZzM4L`V1=7DgfAi@msddC!0gYYaO4QIPmo2=OYLqLT3o$ZZsOl^8ro2=X}7(RMsVw
z?a9k@;}K#$KsJZ0x6^!p_5BH9GJk|U-e@%Zzdyk0v^$aQ$;)=*N2apA{rp<3hCeF%
zp>l-rHrEBt2ZYJc>X31xbv{9+A1~9Bm+i)P)6Wme5yl&p-^$R9yVc(|AF!s(wtb4r
z_T)Qt<9GG#j{SUVKEZ3PUk(|swYJlIg5{UZpzAth-Cq7P(U0$E|NpT>s}XC{{zn!7
O0000<MNUMnLSTZTFQl&k

delta 553
zcmbQowUuRpc)bG$GXn#|rB_WhK#H+A$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBK4*bP
zWHAE+-(e7DJf6QI1t@3};1l8sq=A5!msea|Tvk?AU0q#YUq2)yBtJi;p}xK=nz=ig
zdCHV2v(s4SrZOIwz<OmB%hffkx0*P<U#MpemfIi&)Xi8D<QL4~@a#q!kX`EO;usQf
z`0ez&d50BvT9bKnPd+M{^1c50%n!oqjG5wBmw4JuUG?ZahxnxK$C*JZL$s!PE&Zil
zbe>%|_TuB0c8A^fPFDWdakpMf`@3PBZl8DE`v-4~?CvJX7BjpkZ#ec|Y<kuib?g1d
zc<bXfr~0Mr;uSD<H!0^<x<13dthQfzPxxsYzHjD+#s3O7Kau);e@?=ddXA?oig&*I
zZ!K}EV>8Kfc-hApvz_sN;X|GB_L<AKXGp)@|8#o__g}t+Me>KP9$L;-m;L^wxb9s3
z+LqN|=LNm2Dfm!1*I%%n|9ec%=f>%MUbVCN>!TWF{d8W{FoafceYd>t9VfF+H-8RL
z=v0kE%k+-@?bYk1e#tr4=hbP%KBcc&O5?MmkB{4*Jy}2JhhMswVKS4MtNl-#k^GW%
zMvtZ!-2e2yd_rIIHBR;i1s+@h&zg%8-wD0*|M|aQ!H&n=>Fo35Jm&IWa-NQGgA&LQ
hKsRWJ)f>tGVOX4?=DgzKw_~9A^mO%eS?83{1OQ8V=QjWV

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/closing_unlit.png
deleted file mode 100644
index 2a951fd0e6d03e2ff1872fc3c24e649c1ba46db0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo}rO2qk9QZ(T>yz&ooa@Ed~xChm}E!k(GfF$npYWX($`y91TWhus9QtZOF*PAPA(R
zfH<?A1uUKeWP?Bg5QFr?Xmnc{7?>FtCa^QG0M!^685=MzfS3!?!@2-s)-)g+1eky(
zF@aSESy}*DP+f)w1|Zp+%V$kJxt%*6$dvMQaSVxYe|wM-WK5I7|Mhtu4nWp{ol*h{
V42*LtJe`3&22WQ%mvv4FO#r^0K6L;9

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny.png
deleted file mode 100644
index 71044ccdac0b608dc4e14e34fdfd5b2ee0aa3000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucL7M=d5LX}#1iZYw;^N}6va;&x>iYWnAt538
z`6&(c^<B}--O<cbrc9Zg#xggR@xTPuE2~(pu3^2^#PR(CbFkb7DWGP?k|4ie28U-i
z(tw;sPZ!4!i_>rY8Tncic#=zk9hWKn|Npu-c2B}1{&SPI=s09LSA2ZLulRY%PeH4*
zpKSBj>aJXJRK$p<&e`HJ#|eX!X$LaZ6;>UxoMrLd_H8Hg^vMEerRP5GeW~+?ujI<V
zO=W%J%uo0ZS=DImU=2E*pt~(<HM_Ye&*5*ccV^W^-224*S&(B^c-X=?kiR@#{an^L
HB{Ts5nnrH<

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/deny_unlit.png
deleted file mode 100644
index 2a951fd0e6d03e2ff1872fc3c24e649c1ba46db0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo}rO2qk9QZ(T>yz&ooa@Ed~xChm}E!k(GfF$npYWX($`y91TWhus9QtZOF*PAPA(R
zfH<?A1uUKeWP?Bg5QFr?Xmnc{7?>FtCa^QG0M!^685=MzfS3!?!@2-s)-)g+1eky(
zF@aSESy}*DP+f)w1|Zp+%V$kJxt%*6$dvMQaSVxYe|wM-WK5I7|Mhtu4nWp{ol*h{
V42*LtJe`3&22WQ%mvv4FO#r^0K6L;9

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/locked.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/locked.png
deleted file mode 100644
index 71044ccdac0b608dc4e14e34fdfd5b2ee0aa3000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucL7M=d5LX}#1iZYw;^N}6va;&x>iYWnAt538
z`6&(c^<B}--O<cbrc9Zg#xggR@xTPuE2~(pu3^2^#PR(CbFkb7DWGP?k|4ie28U-i
z(tw;sPZ!4!i_>rY8Tncic#=zk9hWKn|Npu-c2B}1{&SPI=s09LSA2ZLulRY%PeH4*
zpKSBj>aJXJRK$p<&e`HJ#|eX!X$LaZ6;>UxoMrLd_H8Hg^vMEerRP5GeW~+?ujI<V
zO=W%J%uo0ZS=DImU=2E*pt~(<HM_Ye&*5*ccV^W^-224*S&(B^c-X=?kiR@#{an^L
HB{Ts5nnrH<

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/meta.json b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/meta.json
index 4930e1fdb9..9bf58ef564 100644
--- a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/meta.json
+++ b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/meta.json
@@ -1,160 +1,96 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/ at 38b65a605df7ae2907d6bf0d4aebc5faa1bbc561",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "alert_cold",
-      "directions": 4,
-      "delays": [
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ]
-       ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/ at 38b65a605df7ae2907d6bf0d4aebc5faa1bbc561",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "alert_hot",
-      "directions": 4,
-      "delays": [
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ],
-          [
-            0.5,
-            0.5
-          ]
-       ]
-    },
-    {
-        "name": "bolted_unlit"
-    },
-    {
-        "name": "closed"
-    },
-    {
-        "name": "closed_unlit"
-    },
-    {
-      "name": "closing",
-      "delays": [
-          [
-            0.2,
-            0.2,
-            0.2,
-            0.2,
-            0.2,
-            0.2
-          ]
-       ]
-    },
-    {
-      "name": "closing_unlit"
-    },
-    {
-        "name": "deny"
-    },
-    {
-        "name": "deny_unlit"
-    },
-    {
-        "name": "locked"
-    },
-    {
-        "name": "open"
-    },
-    {
-      "name": "opening",
-      "delays": [
-          [
-            0.2,
-            0.2,
-            0.2,
-            0.2,
-            0.2,
-            0.2
-          ]
-       ]
-    },
-    {
-      "name": "opening_unlit"
-    },
-    {
-      "name": "palert",
-      "delays": [
-          [
-            0.5,
-            0.5
-          ]
-       ]
-    },
-    {
-      "name": "panel_closing",
-      "delays": [
-          [
-            0.1,
-            0.1,
-            0.07,
-            0.07,
-            0.07,
-            0.07,
-            0.27
-          ]
-       ]
-    },
-    {
-        "name": "panel_open"
-    },
-    {
-      "name": "panel_opening",
-      "delays": [
-          [
-            0.2,
-            0.07,
-            0.07,
-            0.07,
-            0.07,
-            0.07,
-            0.2
-          ]
-       ]
-    },
-    {
-        "name": "welded"
-    },
-    {
-        "name": "welded_open"
-    },
-    {
-      "name": "pressure_unlit"
-    },
-    {
-      "name": "temperature_unlit"
-    }
-  ]
+    "states": [
+        {
+            "name": "closed"
+        },
+        {
+            "name": "closing",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.03,
+                    0.03,
+                    0.03,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "open"
+        },
+        {
+            "name": "opening",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.03,
+                    0.03,
+                    0.03,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_closing",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.03,
+                    0.03,
+                    0.03,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "panel_open"
+        },
+        {
+            "name": "panel_opening",
+            "delays": [
+                [
+                    0.1,
+                    0.05,
+                    0.05,
+                    0.03,
+                    0.03,
+                    0.03,
+                    0.05,
+                    0.05,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "pressure_unlit"
+        },
+        {
+            "name": "temperature_unlit"
+        },
+        {
+            "name": "welded"
+        },
+        {
+            "name": "welded_open"
+        }
+    ]
 }
diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/opening.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/opening.png
index 696dc0197e0ae4ed448fb5b22d9e30aa0c5f4cab..50ea547dc103a9f635b9b16acf5787735ec2c9f9 100644
GIT binary patch
delta 1256
zcmV<E1Q+|A1n&uu7k^*~1^@s6;+S_h00001b5ch_0Itp)=>Px(sYygZRCt{2oiS(|
zR~*Ja$;yxmN+lxYQ5QidH3v0vCtF?Ij-J{=DU^~z6B}y?rb8(u&`c!>AwwyxyF^HC
zhY~v4TcLExP`gu!>wv4!CD@?IjgJVQT^#c|#CJKJq`UX5lYeZ`_XA;g(%tXV2_J9x
z{t`e4A%qY@2qA<JLI@#*5JCtcgb+eV<ir5LG)<Y$=TWUzF;`f__Kxg{EPW=1`IS+O
zjErD)brtLD>jUpk_~jp8c_F{La2e^;E68NC*s9mDZEfJz<puZo3sV`SQYrlT^FzgB
zB!D%{uK@Xc-hWv@JHLv%R;#%eP%T5a|F6@RkbYUs>nAM7hP8pY!Vk@U(==r+my@?I
z4#~qnS`Q(FG)+_MnA;bJWG<JJrfJG<{6Yxnee?bDd%f*G1Ra0Ewr$KzPh%o|6Zq)>
zLI?nWZQJ<zqg?>NwZ(I;z`Oq0-O~U7%d#MZ!1ee3b${0l!)W{ZMx%j=@i=B)n?|`(
z0RY!8e$8mR9dt5GjPJGeCzlLuuOF2hBd^C?e*yq9*(`>i3<218U-<Z*4IKW<d4o9X
z=O>M(6RWN_8Vw9T9YQ9Xb<g|4ujh7d1wsg^lVSMjep|n;*N<wBM@tFU9|wS~dL5f*
z4*&qQT7M0{mv`~c!#K`Q8cl-bg*|uOd*ZP53sV^<H~?Vt>;bmwb@#lEU&rmg_&OOn
z`E|UVF1|{RCckqJEEN-4_g~XAoqM77qf|_^+=F%ehxb|cjrYs%^|t!}j^dAbcR`;{
z+{c?!3HPLT?tRj-n<!5H=sy4cm#@OIEd2KU6MyAnmVbGMZ~qu`w_@<@LcD$zx3i5D
zLP*sNVgCEZjIy`ghY*%y%q}<i+wOy{9f{PL7`AsL(h>dzptKJkG(RDP5JCtcgb+dq
zA%qY@2qA<JLI@!dbL{>2LHD=J2mCko4Q$O`yqBPk{6@Wwxx$Ume*Ud1`d+mxms<Pz
z9e?H%y76|-AzSAYbo%i@y?DPc%6`78S2c^OzZ-8*4zEA%&IgRgQ7R@Ngm53pWD=!f
z0;OUC$z)Pl=5*w}$9m5>F&@Xv^fYYShS%S%S2ar~f0W*!9A1CZe87i`FS!Tk^y0m!
zbmSi`ol=?)(DCYI37Ze-)*F^1a6Z66wSO1iP88OW@6^vfs#iBl*nB`QF1|O1_IyB4
zFWxVUvY)T&)y)#-@5ZZ=BXB-o_l@tgd+~l@P)9zu`Bi8?|0rJ7EdGAJ-|x&PbmI-m
z;h#@95&if<_Y*=0A%qY@2qA<JLI@#*5JCtcgb)%j$KH=0bbrfyz_rD5k@X_|n17}z
zKYu&;`}=3_JnLy$sZ?B(C(7ThA0K5e-j8XT9sBvc^m+-H59kYl^8r!!;{8~b)v=%7
zFHVxbX+GecyQd<pX8Uof+MRwspjTc$oqxYzzaRQ0f75(GKQ8|A!d~EfK(7%($m8_G
zH=htU3<Kp#1=R-<sZ^?`;zpx^(P0nvQGFm$u2f(c&xau#f4?|M{x|>>3I)usjN*&8
z{zjC;30`WoT1*Im^6c}iSfNmGpL6`>*;vo7!p(OdAFIDS8<SrDiRi}<vj2b4z^iMy
S4X48Z0000<MNUMnLSTX__iaZ2

delta 529
zcmV+s0`C3q37rIx7k@wq0{{R3(&~ad00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^
z1poj532;bRa{vGi!vFvd!vV){sAK>D06b7kR7C&)000004Gj$!7Z)8J9VaIzFE1}t
zR8((oWPpEvidzGVTLYAol$&M*on-;QkOkDL1l6ns+JXr8(0>C{9<Uk!0004WQchC<
zK<3zH00049Nkl<ZSi|j?%Z|e!3`GORZIgy{X#W3S3+81<pxIO-jpSPif{wvJSzIrR
zN~Kb%R4Ua!5#Dcp8_M7A_#J+p=VRU1N9+OFAVm;wly=l2D(93(PzH3H;R0lX&7tHu
z!;JR~oiA>E8GiulJy2_7M{W8xuhm7)X`0?6GMAJ`M83HFZNSF!L29jN&3ku|GfK02
zMCO8uh{)*#<|m|`ht%5I0+@1wPV?*@kvXR_BAo!8XLpPs{t%z;xO1fGGmb3*=jjz4
zAq09Bu}5HoBfpZPQ<~o*D(93(9POPx{WkdduW*%0rGHYXR4T0xIv3`iS^QQXz;I`+
zKA7!Y)(6)N!vBvm6h6P5QXgE*J+t`L|Jz}L>aOPrN_`;BJ-7J9|4-H@{~!50L8%Xf
zxfd3{`v39z<o|y?LGkw&8w|q#4?Qw8K2K2V17Yr&#c%b&I76!sX6ye+eeeO5113Wq
T&s0MI015yANkvXXu0mjfM}Ol@

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/opening_unlit.png
deleted file mode 100644
index 2a951fd0e6d03e2ff1872fc3c24e649c1ba46db0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zo}rO2qk9QZ(T>yz&ooa@Ed~xChm}E!k(GfF$npYWX($`y91TWhus9QtZOF*PAPA(R
zfH<?A1uUKeWP?Bg5QFr?Xmnc{7?>FtCa^QG0M!^685=MzfS3!?!@2-s)-)g+1eky(
zF@aSESy}*DP+f)w1|Zp+%V$kJxt%*6$dvMQaSVxYe|wM-WK5I7|Mhtu4nWp{ol*h{
V42*LtJe`3&22WQ%mvv4FO#r^0K6L;9

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/palert.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/palert.png
deleted file mode 100644
index 02839146fbf37a7fc85a0c895dc658cb35f04ba8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQjEnx?oJHr&dIz4a#+$GeH|GX
zHuiJ>Nn{1`ISV`@iy0XB4ude`@%$AjKtcWhpAc6d{l}2u|4fGeCrbYVfiSN<P>87{
z$S;_oVYarP1d!+C>Eak-aXL9cf^~6%3zM6pqkyW0MuYFP&PK-*M>sT&u6VQN#DN73
z3mqaDZnC&J^ROyuJTtPo<iO}?F7SnQVF3d}ngQ$7#*KgSfTl5cy85}Sb4q9e08Rxy
A;{X5v

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_closing.png
index ae69b8aded52705141caf90baca11d9b6f490f76..664599f2e8a4d2a07496e888a5b88a24b1f086ef 100644
GIT binary patch
delta 451
zcmcc4bccC@ay<iMage(c!@6@aFBupZr+K<KhE&XXduyYAaG(hL17}smckgsq%(h!?
zDp%~=u+#HSud<<@5KlcTbLV1JUztS1m)8z9S{PbN2&)?&JQWak>(jmFZ~IpFp8T$>
z|Nh?X&(`|eA9pff0|}=tJvsfW{?=oALBZ$oY~EY<XFS;V>u8-~xcug8du!Ka%5T0B
zJ@3vAtC-&W<=TSp*)%J^|N2#8E0_DP>&B{e_IGZ|+TPx~rdDL<+Pd^DAD+2B-MRYk
z)sHiIYNr(CXZh9rzrwoZ*W3z&A9F;^y4QXe|M>FZ=8hi$JMDA6|MQY}%?sS`xBC9f
zdaKJ@`d8h#nA)?y{uNW(+qggfb_#towEXO+F75v)_q)Zs>u>ho`Yk9Z_<Q~5Z-Gzb
zj(j`o^;P~s>UWDp)^+)}+%3ze1b+XE@Zg{OUd8WAjo%s`pYvx?){_&yYp2iJTT{I-
zZ&~d;%b%`SPfVO0rEj{sgb}Fb^O=)2`m5af?p&!_d2=bZM%t~}XHH%}dvt#7{+`7*
my;QzVR5st*e&;5`{{yCh=T%kPl+4eAZ1QyVb6Mw<&;$Vby4?!^

delta 317
zcmcb^e4S~6ay_G*r;B4q#hkad9kZAm1z0b1`Ayi@Y5h^H(Lo_yQ0Yu6i{b-cr?PuT
zT#uYn3S{%ybjpYGvs?$qq5nRKyI1xxfI-`ZX+fJesYf2HF>FX-gNT92|7&%ZroB6v
z{_Tfm{tCIt9UX7;!s7Ybckeq~xB2ebS4lVPudI>#d{*<^Pfc5~)63kR+!cw`nO#+v
z`sKwl{=3OSf*Yg!f1mq#Im@>9_}|*7{=7P`{%DKe%0<;Bo7>+!Y&)}k&3^}Gk2Hjp
zwWsb(mS253EhgH__x@!0g{Keadaqpnxqr3(p8c}#Zw2uzQuqCS7--(#&nnMmUp9OC
z_vOPGS94>|J+HYo?@vT*uDf+sUPrvc|2zCZLla``7^mMZTVSYBc?)ERr>mdKI;Vst
E07hw%0ssI2

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_open.png
index 5f3bfeae15880d37195a14cbfdcb01447290f46c..ae2df5527a8514cd1a6e06250953079975eeef83 100644
GIT binary patch
delta 196
zcmX@e_<(VON<Cw7kh>GZx^prw85kI5dAc};M6@O+NU$zW5b0?OG~jYOr~&0Lvi1B>
zxf=52-{VQUOP>oV@64LW$Zf~Iha(_aVB_zT2TE=U>wP<4VtshF^BW!>+vz95ytgp_
z3A0bKI5_jb2cSeu&&w_9%%7KLi>y?=#Tb3{tc2Az+cgOZH<|=q=iE8>;k&gp^I^R=
vS-T~b9waS|4l|Ic``(<$8K>UU#K^|b#%#rH5YWgCbS8tRtDnm{r-UW|FPu=V

delta 165
zcmaFBc#v^|N_~f?i(^Q|oa6)v*2M`TJxzfITy6&wn0)8V`M<F<QFysng3~sS<e&Cz
zwa(N2uQuE8zx`tA{r$$5P8G2M!H$O@h1awG91AG;_(%SjnxEe+%NEv|!LjGh6ev&X
zbOh?OkQMvTF7_>nDZ)nixVi3QIkp)WSTkgwt28olHp+qR(~u}+U}(FbTcA4o`+No<
N@O1TaS?83{1OQCVM1=qV

diff --git a/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Misc/edge_door_hazard.rsi/panel_opening.png
index 8271b80b11bd4293bee2ac6040dc747c43d89c31..16c1ebc8bee6b4c815f481de556149b7c21eb483 100644
GIT binary patch
delta 422
zcmX@fw4Zr`ay<iMage(c!@6@aFBupZD?MEtLn`LHy|vLhI#7iDL9$lMySuSnd3j}T
z=DAwEy5?KRFT1oPGxKEpMaKdYp@N+0PTP3+9zA&yz~#3sAz1yg%e~rt_hOh^-%G!@
zp7VM49rJk{3^33Ywd(hdUp0UIU){d>GedLxw$3?q^{PfXyN(ydE<PQ;`s16Y>oa(*
zCvX0EOkrPrrhAQ4>UFb;m)E<rxqe?!+i>=9_m6L1N_))NCU3sBLD=7IdGS>w>Bn2e
zKklm+xcI;N+rzgCb@AJk{Z?h$AG`Ks&29UR_4akgo*%pTIc@rx3C7<Ii(pP-sAu@_
zKXc3D`J3<0zx=+g_T8O3`^rm~J~Ml1zgf2Sa<t~Q`|_sMpEgF`&EK;(I^|un<-NC|
z*Y17^>pJKAbjH5_XPCFN%}x6KH*mAMd|^mreYpAiJ8G7zrp%jt%CPqTO!gP&c8b@>
zXZhEu2mVj{zv{%D_TnY=4U>w4ErY(ZgB&3bbIA|)?UuQ!swuasvq3_hu6{1-oD!M<
D(TvVk

delta 303
zcmdnbe3EH`ay_Gfr;B4q#hkad9K8+)2(UfK)bYr>6#LRQhI5{408hoVCWQ*&!soub
zHkiduY00`Yw{r2f-)8+bO#eT`8LjSQ0D*>0vv%bj|90%#f9H2Aqr9Gl9Y5IpRd3qr
z%HLm#ZkD~in`S(FSI3$=eqnhoF7nr|l>XlHLt@W|Z@cE2me$*5CZ4`p^Wo^!6SAlE
zXG#ki+Sl#ayT9Z6Y%Q_ZvHRoVbJg{gw99q&r@Rx7y>I=lUbQ+g?A=N!ua*1qr@U*t
zx%1{PZj0;8C(M2@gPj5*ekewM{t;W|_AWobRp!~_UbSZ{l$7M;?KZ!*hz>oHXgAO0
q`JLv?GyD9WF-_9g3D*W?{F`R`$ES{E*4vpmAQ4YjKbLh*2~7ZR4T(em


From b9b794deefc4c8daae880999f6ed31155b3ff1aa Mon Sep 17 00:00:00 2001
From: portfiend <109661617+portfiend@users.noreply.github.com>
Date: Sun, 4 Oct 2026 23:38:48 +0000
Subject: [PATCH 47/69] Microwave Refactor and Prediction (#43129)

* adjust fields of meal recipe prototype

* document microwave recipe datafields

* use file scoped namespace for microwave recipes

* more of this

* localize every microwave recipe

* make microwave system shared

* refactor recipe reagent contents

* refactor recipe solids + add material ingredient datafield

* im making this a bit less silly

* awa

* move this shit out

* move this shit out also

* refactor Wzhzhzh

* im gonna shorten this parameter by 1 actually

* move this into recipes

* make processcontents a little better(?)

* clean imports

* rename a struct

* use cooking ingredients struct

* comment

* use whitelist for this

* unused dependency

* rearranged the parameters of get recipe portions

* rearrange some stuff

* clean up more imports

* move container related functions into separate file

* move this function out of ProcessContents

* prevent microwaves from having items inserted while active

* use IsPowered in microwave system

* use byref syntax and Entity<>

* moving the override up
sorry i like it being up here

* refactor microwave updating

* clean up recipe finish logic

* im renaming this function actually

* move some functions around

* move more stuff around

* some comments

* fix compiler error

* fix the yml of all microwave recipes

* use materials instead of solids for this stuff

* oops

* fix this

* turn microwave sparks into datafield

* move activelymicrowaved events into separate folder

* make UpdateUserInterfaceState use entity only

* rearrange some functions

* move UI functions out

* comment microwave UI stuff

* more comments

* comment recipe functions

* refactor GetTotalIngredients to use an operator

* give CookingIngredients addition methods

* comment the rest of CookingIngredients

* make subtraction functions clearer?

* remove redundant comment

* handle zero/negative ingredient cases

* simplify subtract contents logic

* fix these comments

* typo

* add microwave recipe test

* move active microwave methods

* comment active microwave methods

* comment cooking methods

* comment microwave methods

* change setappearance to use entity<>

* add some public api decorators

* comment all of MicrowaveComponent

* use file-scoped namespace for MicrowaveComponent

* comment

* fix baguette sword

* maybe...?

* oh oops

* document the rest of the owl

* kill the massive YML breaking change

* fix protoman dependency

* move shared microwave stuff to SharedMicrowaveSystem

* fix usings

* move microwave components to shared

* fix up microwave datafields

* move APIs to shared

* move activemicrowave methods to shared

* initialize on shared

* move ui functions to shared

* add actor here

* stuff

* predict microwave update loop

* make clientside microwave system

* adjust the update loop for microwaves

* clean up

* add field deltas to microwaves

* dirty fields instead of whole component

* move this to the partial

* move GetRecipesForMicrowave to shared

* comments

* predict microwave BUI

* oops

* refactor microwave bui update

* move UI messages to shared

* move messages to UI file

* move init to shared

* move container methosd to shared

* oops my using

* move cooking functions into partial

* move cooking methods to shared

* move microwave recipe methods to shared

* move the rest of the microwave events to shared

* update imports

* remove custom type serializer

* better (?) microwave UI prediction

* fix list notations

* OK IT WAS THE DATAFIELDS

* add IOC inject

* dont use IOC for htis

* sealed

* prediction fixes pt1

* make microwave cooking updates more consistent

* datafield tweaks

* test for multiple portions in microwave recipes

* test for multiple recipe portions

* better(?) prediction for malfunctions

* remove redundant comment

* prevent solution reactions in microwave

* cleanup some microwave stuff

* eh i think this should be container actually

* this can be API i think

* reduce system redundancy

* this has to be public

* use resolve pattern for explode

* use GetMicrowaveContents in microwave system

* this can be an API too

* add conversion script for unlocalized recipes

* use EnsureComp instead of AddComp

* suffering

* fix recipe prediction

* fix the audio

* reduce redundant networking

* i think this should be autopaused?

* nevermind we use dynamic portions in the test

* oops i wrote the test wrong

* make lemoon cake take 2 lemoons again
sorry test fail

* rename "materials" to "stacks"
realized theyre different

* add stack guidebook quantities

* Kill audio

* fix lemoon cake recipe for real?

* mark PortionedRecipe as a datadefinition

* fix the microwave timer

* review

* cleanup

* Update SharedMicrowaveSystem.Recipes.cs

* update

* add audio params

* review: inject microwavesystem

* review: named variable

* review: move dependencies

* review: use gametest for recipe test

* review: make access attributes standalone

* rename prototypes and datafields

* review: rename this var

* review: move this function down

* review: remove these scripts

* actually this should stay

* refactor cook time buttons

* review: use a color name for this

* fix timer reset

* Dirty

* review: make ActivelyMicrowavedComponent networked

* review: slarti comments part 1

* review: remove serializable attribute from CookingIngredients

* rename file

* review: more microwave audio boilerplate. yippee!

* review: use resolve pattern for TryGetStackId
i dont like the way this makes the rest of the code look but we ball maybe. i dont know what else to do here

* review: move ui update to constructor

* review: kill LastCookUpdated

* actually i do this instead

* fixed up the PR

* cleanup

* ///

* Update microwave.yml

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Controls/GuideMicrowaveEmbed.xaml.cs      |  60 +-
 .../Controls/GuideMicrowaveGroupEmbed.cs      |   2 +-
 .../EntitySystems/ClientMicrowaveSystem.cs    |  52 ++
 .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 235 +++---
 .../Kitchen/UI/MicrowaveCookTimeButton.xaml   |   9 +
 .../UI/MicrowaveCookTimeButton.xaml.cs        |  39 +
 Content.Client/Kitchen/UI/MicrowaveMenu.xaml  |  14 +-
 .../Kitchen/UI/MicrowaveMenu.xaml.cs          | 165 ++--
 .../Tests/Kitchen/MicrowaveRecipeTest.cs      |  86 ++
 .../WizdenContentFreeze.cs                    |   2 +-
 Content.Server/Access/Systems/IdCardSystem.cs |   4 +-
 .../Components/ActiveMicrowaveComponent.cs    |  25 -
 .../Kitchen/Components/MicrowaveComponent.cs  | 113 ---
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  | 761 ------------------
 .../EntitySystems/ServerMicrowaveSystem.cs    | 115 +++
 .../Components/ActiveMicrowaveComponent.cs    |  88 ++
 .../Components/ActivelyMicrowavedComponent.cs |   7 +-
 .../Kitchen/Components/MicrowaveComponent.cs  | 231 ++++++
 .../Components/RecipeProviderComponent.cs     |   6 +-
 .../Kitchen/Components/SharedMicrowave.cs     |  86 --
 .../EntitySystems/MicrowaveSystem.API.cs      | 154 ++++
 .../EntitySystems/MicrowaveSystem.Active.cs   | 123 +++
 .../MicrowaveSystem.Container.cs              | 136 ++++
 .../EntitySystems/MicrowaveSystem.Cooking.cs  | 285 +++++++
 .../EntitySystems/MicrowaveSystem.Recipes.cs  | 282 +++++++
 .../EntitySystems/MicrowaveSystem.UI.cs       | 120 +++
 .../Kitchen/EntitySystems/MicrowaveSystem.cs  | 191 +++++
 .../Kitchen/GetSecretRecipesEvent.cs          |   2 +-
 .../Kitchen/MicrowaveMealRecipePrototype.cs   | 293 ++++++-
 Content.Shared/Kitchen/RecipeManager.cs       |  32 -
 Content.Shared/Kitchen/RecipeSystem.cs        |  45 ++
 Resources/Locale/en-US/guidebook/cooking.ftl  |   3 +
 .../microwave-meal-recipe-prototype.ftl       | 221 +++++
 .../Structures/Machines/microwave.yml         |   2 +-
 .../Recipes/Cooking/meal_recipes.yml          | 457 +++++------
 .../Recipes/Cooking/medical_recipes.yml       |  16 +-
 36 files changed, 2947 insertions(+), 1515 deletions(-)
 create mode 100644 Content.Client/Kitchen/EntitySystems/ClientMicrowaveSystem.cs
 create mode 100644 Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml
 create mode 100644 Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml.cs
 create mode 100644 Content.IntegrationTests/Tests/Kitchen/MicrowaveRecipeTest.cs
 delete mode 100644 Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
 delete mode 100644 Content.Server/Kitchen/Components/MicrowaveComponent.cs
 delete mode 100644 Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
 create mode 100644 Content.Server/Kitchen/EntitySystems/ServerMicrowaveSystem.cs
 create mode 100644 Content.Shared/Kitchen/Components/ActiveMicrowaveComponent.cs
 rename {Content.Server => Content.Shared}/Kitchen/Components/ActivelyMicrowavedComponent.cs (66%)
 create mode 100644 Content.Shared/Kitchen/Components/MicrowaveComponent.cs
 delete mode 100644 Content.Shared/Kitchen/Components/SharedMicrowave.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.API.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Active.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Container.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Cooking.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Recipes.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.UI.cs
 create mode 100644 Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.cs
 delete mode 100644 Content.Shared/Kitchen/RecipeManager.cs
 create mode 100644 Content.Shared/Kitchen/RecipeSystem.cs
 create mode 100644 Resources/Locale/en-US/kitchen/prototypes/microwave-meal-recipe-prototype.ftl

diff --git a/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs
index e54892d634..5eb654f8ee 100644
--- a/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs
+++ b/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs
@@ -39,10 +39,10 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
 
     public GuideMicrowaveEmbed(string recipe) : this()
     {
-        GenerateControl(_prototype.Index<FoodRecipePrototype>(recipe));
+        GenerateControl(_prototype.Index<MicrowaveMealRecipePrototype>(recipe));
     }
 
-    public GuideMicrowaveEmbed(FoodRecipePrototype recipe) : this()
+    public GuideMicrowaveEmbed(MicrowaveMealRecipePrototype recipe) : this()
     {
         GenerateControl(recipe);
     }
@@ -66,7 +66,7 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
             return false;
         }
 
-        if (!_prototype.TryIndex<FoodRecipePrototype>(id, out var recipe))
+        if (!_prototype.TryIndex<MicrowaveMealRecipePrototype>(id, out var recipe))
         {
             _sawmill.Error($"Specified recipe prototype \"{id}\" is not a valid recipe prototype");
             return false;
@@ -78,7 +78,7 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
         return true;
     }
 
-    private void GenerateHeader(FoodRecipePrototype recipe)
+    private void GenerateHeader(MicrowaveMealRecipePrototype recipe)
     {
         var entity = _prototype.Index<EntityPrototype>(recipe.Result);
 
@@ -89,9 +89,9 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
         ResultDescription.SetMarkup(entity.Description);
     }
 
-    private void GenerateSolidIngredients(FoodRecipePrototype recipe)
+    private void GenerateSolidIngredients(MicrowaveMealRecipePrototype recipe)
     {
-        foreach (var (product, amount) in recipe.IngredientsSolids.OrderByDescending(p => p.Value))
+        foreach (var (product, amount) in recipe.Ingredients.Solids.OrderByDescending(p => p.Value))
         {
             var ingredient = _prototype.Index<EntityPrototype>(product);
 
@@ -122,9 +122,9 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
         }
     }
 
-    private void GenerateLiquidIngredients(FoodRecipePrototype recipe)
+    private void GenerateLiquidIngredients(MicrowaveMealRecipePrototype recipe)
     {
-        foreach (var (product, amount) in recipe.IngredientsReagents.OrderByDescending(p => p.Value))
+        foreach (var (product, amount) in recipe.Ingredients.Reagents.OrderByDescending(p => p.Value))
         {
             var reagent = _prototype.Index<ReagentPrototype>(product);
 
@@ -165,22 +165,58 @@ public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag,
         }
     }
 
-    private void GenerateIngredients(FoodRecipePrototype recipe)
+    private void GenerateStackIngredients(MicrowaveMealRecipePrototype recipe)
+    {
+        foreach (var (product, amount) in recipe.Ingredients.Stacks.OrderByDescending(p => p.Value))
+        {
+            var stack = _prototype.Index(product);
+
+            // stack icon
+
+            IngredientsGrid.AddChild(new GuideEntityEmbed(stack.Spawn, false, false));
+
+            // stack name
+
+            var stackName = Loc.GetString(stack.Name);
+            var stackNameMsg = new FormattedMessage();
+            stackNameMsg.AddMarkupOrThrow(Loc.GetString("guidebook-microwave-stack-name-display", ("stack", stackName)));
+            stackNameMsg.Pop();
+
+            var stackNameLabel = new RichTextLabel();
+            stackNameLabel.SetMessage(stackNameMsg);
+
+            IngredientsGrid.AddChild(stackNameLabel);
+
+            // stack quantity
+
+            var stackQuantityMsg = new FormattedMessage();
+            stackQuantityMsg.AddMarkupOrThrow(Loc.GetString("guidebook-microwave-stack-quantity-display", ("amount", amount)));
+            stackQuantityMsg.Pop();
+
+            var stackQuantityLabel = new RichTextLabel();
+            stackQuantityLabel.SetMessage(stackQuantityMsg);
+
+            IngredientsGrid.AddChild(stackQuantityLabel);
+        }
+    }
+
+    private void GenerateIngredients(MicrowaveMealRecipePrototype recipe)
     {
         GenerateLiquidIngredients(recipe);
+        GenerateStackIngredients(recipe);
         GenerateSolidIngredients(recipe);
     }
 
-    private void GenerateCookTime(FoodRecipePrototype recipe)
+    private void GenerateCookTime(MicrowaveMealRecipePrototype recipe)
     {
         var msg = new FormattedMessage();
-        msg.AddMarkupOrThrow(Loc.GetString("guidebook-microwave-cook-time", ("time", recipe.CookTime)));
+        msg.AddMarkupOrThrow(Loc.GetString("guidebook-microwave-cook-time", ("time", recipe.Time)));
         msg.Pop();
 
         CookTimeLabel.SetMessage(msg);
     }
 
-    private void GenerateControl(FoodRecipePrototype recipe)
+    private void GenerateControl(MicrowaveMealRecipePrototype recipe)
     {
         GenerateHeader(recipe);
         GenerateIngredients(recipe);
diff --git a/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs b/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs
index 9fe70faaaa..584a2c3387 100644
--- a/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs
+++ b/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs
@@ -50,7 +50,7 @@ public sealed partial class GuideMicrowaveGroupEmbed : BoxContainer, IDocumentTa
 
     private void CreateEntries(string group)
     {
-        var prototypes = _prototype.EnumeratePrototypes<FoodRecipePrototype>()
+        var prototypes = _prototype.EnumeratePrototypes<MicrowaveMealRecipePrototype>()
             .Where(p => p.Group.Equals(group))
             .OrderBy(p => p.Name);
 
diff --git a/Content.Client/Kitchen/EntitySystems/ClientMicrowaveSystem.cs b/Content.Client/Kitchen/EntitySystems/ClientMicrowaveSystem.cs
new file mode 100644
index 0000000000..c2203b790b
--- /dev/null
+++ b/Content.Client/Kitchen/EntitySystems/ClientMicrowaveSystem.cs
@@ -0,0 +1,52 @@
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Kitchen.EntitySystems;
+using Robust.Client.Player;
+
+namespace Content.Client.Kitchen.EntitySystems;
+
+/// <inheritdoc />
+public sealed partial class ClientMicrowaveSystem : MicrowaveSystem
+{
+    [Dependency] private IPlayerManager _player = default!;
+    [Dependency] private SharedUserInterfaceSystem _userInterface = default!;
+
+    public override void UpdateUI(Entity<MicrowaveComponent?> microwave)
+    {
+        base.UpdateUI(microwave);
+
+        if (!MicrowaveQuery.Resolve(microwave.Owner, ref microwave.Comp))
+            return;
+
+        if (_userInterface.TryGetOpenUi(microwave.Owner, MicrowaveUiKey.Key, out var bui))
+            bui.Update();
+    }
+
+    protected override void ActivateMicrowaveCycle(Entity<MicrowaveComponent> ent)
+    {
+        base.ActivateMicrowaveCycle(ent);
+
+        if (!Timing.IsFirstTimePredicted)
+            return;
+
+        var audioParams = ent.Comp.LoopingSound.Params;
+        audioParams = audioParams.WithLoop(true).WithMaxDistance(5);
+
+        ent.Comp.PlayingStream ??= Audio.PlayLocal(ent.Comp.LoopingSound, ent, _player.LocalEntity, audioParams)?.Entity;
+    }
+
+    protected override void DeactivateMicrowaveCycle(Entity<MicrowaveComponent> ent)
+    {
+        base.DeactivateMicrowaveCycle(ent);
+
+        // We have this check here so Audio.Stop doesn't mistakenly tell us that the entity has been deleted when it hasn't been!!!
+        if (!Timing.IsFirstTimePredicted)
+            return;
+
+        ent.Comp.PlayingStream = Audio.Stop(ent.Comp.PlayingStream);
+
+        foreach (var solid in GetMicrowaveContents(ent.AsNullable()))
+        {
+            RemComp<ActivelyMicrowavedComponent>(solid);
+        }
+    }
+}
diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index 643ac47054..2bd63e123b 100644
--- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -1,151 +1,128 @@
-using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Kitchen.Components;
+using Content.Shared.Kitchen.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Timing;
 
-namespace Content.Client.Kitchen.UI
+namespace Content.Client.Kitchen.UI;
+
+[UsedImplicitly]
+public sealed partial class MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
 {
-    [UsedImplicitly]
-    public sealed class MicrowaveBoundUserInterface : BoundUserInterface
+    [Dependency] private SpriteSystem _sprite = default!;
+    [Dependency] private MicrowaveSystem _microwave = default!;
+
+    [ViewVariables]
+    private MicrowaveMenu? _menu;
+
+    [ViewVariables]
+    private readonly Dictionary<int, EntityUid> _solids = new();
+
+    protected override void Open()
     {
-        [ViewVariables]
-        private MicrowaveMenu? _menu;
+        base.Open();
 
-        [ViewVariables]
-        private readonly Dictionary<int, EntityUid> _solids = new();
-
-        [ViewVariables]
-        private readonly Dictionary<int, ReagentQuantity> _reagents = new();
-
-        public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        _menu = this.CreateWindow<MicrowaveMenu>();
+        _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
+        _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
+        _menu.IngredientsList.OnItemSelected += args =>
         {
-        }
+            SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
+        };
 
-        protected override void Open()
+        _menu.OnCookTimeSelected += (name, index, cookTime) =>
         {
-            base.Open();
-            _menu = this.CreateWindow<MicrowaveMenu>();
-            _menu.StartButton.OnPressed += _ => SendPredictedMessage(new MicrowaveStartCookMessage());
-            _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage());
-            _menu.IngredientsList.OnItemSelected += args =>
-            {
-                SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex])));
-            };
-
-            _menu.OnCookTimeSelected += (args, buttonIndex) =>
-            {
-                var selectedCookTime = (uint) 0;
-
-                if (args.Button is MicrowaveMenu.MicrowaveCookTimeButton microwaveCookTimeButton)
-                {
-                    // args.Button is a MicrowaveCookTimeButton
-                    var actualButton = (MicrowaveMenu.MicrowaveCookTimeButton) args.Button;
-                    selectedCookTime = actualButton.CookTime == 0 ? 0 : actualButton.CookTime;
-                    // SendMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
-                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime / 5, actualButton.CookTime));
-
-                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                                                                    ("time", selectedCookTime));
-                }
-                else
-                {
-                    // args.Button is a normal button aka instant cook button
-                    SendPredictedMessage(new MicrowaveSelectCookTimeMessage((int) selectedCookTime, 0));
-
-                    _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                                                         ("time", Loc.GetString("microwave-menu-instant-button")));
-                }
-            };
-        }
-
-        protected override void UpdateState(BoundUserInterfaceState state)
-        {
-            base.UpdateState(state);
-            if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null)
-            {
-                return;
-            }
-
-            _menu.IsBusy = cState.IsMicrowaveBusy;
-            _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd;
-
-            _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0);
-            // TODO move this to a component state and ensure the net ids.
-            RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids));
-
-            //Set the cook time info label
-            var cookTime = cState.ActiveButtonIndex == 0
-                ? Loc.GetString("microwave-menu-instant-button")
-                : cState.CurrentCookTime.ToString();
-
-
+            SendPredictedMessage(new MicrowaveSelectCookTimeMessage(index, cookTime));
             _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                                                         ("time", cookTime));
-            _menu.StartButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
-            _menu.EjectButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0;
+                ("time", name));
+        };
 
+        Update();
+    }
 
-            //Set the correct button active button
-            if (cState.ActiveButtonIndex == 0)
-            {
-                _menu.InstantCookButton.Pressed = true;
-            }
-            else
-            {
-                var currentlySelectedTimeButton = (Button) _menu.CookTimeButtonVbox.GetChild(cState.ActiveButtonIndex - 1);
-                currentlySelectedTimeButton.Pressed = true;
-            }
+    public override void Update()
+    {
+        base.Update();
 
-            //Set the "micowave light" ui color to indicate if the microwave is busy or not
-            if (cState.IsMicrowaveBusy && cState.ContainedSolids.Length > 0)
-            {
-                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#947300") };
-            }
-            else
-            {
-                _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") };
-            }
-        }
+        if (_menu is null || !EntMan.TryGetComponent<MicrowaveComponent>(Owner, out var comp))
+            return;
 
-        private void RefreshContentsDisplay(EntityUid[] containedSolids)
+        RefreshContentsDisplay();
+        UpdateActiveDisplay(comp);
+
+        // Update the currently-selected cook time label and button
+        var buttonIndex = comp.CurrentCookTimeButtonIndex;
+        if (_menu.TryGetCookTimeButton(buttonIndex, out var button))
+            button.Pressed = true;
+
+        var timeLabel = buttonIndex == 0
+            ? Loc.GetString("microwave-menu-instant-button")
+            : comp.CurrentCookTimerTime.ToString();
+
+        _menu.CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+            ("time", timeLabel));
+    }
+
+    /// <summary>
+    /// Update the state of various controls in this menu based on the active / empty status of the microwave.
+    /// </summary>
+    private void UpdateActiveDisplay(MicrowaveComponent? comp)
+    {
+        if (_menu is null)
+            return;
+
+        // Disable various UI controls if the microwave is active or empty
+        var isActive = EntMan.TryGetComponent<ActiveMicrowaveComponent>(Owner, out var activeComp);
+        var isEmpty = !_microwave.HasContents((Owner, comp));
+        _menu.IsBusy = isActive;
+        _menu.ToggleBusyDisableOverlayPanel(isActive);
+        _menu.StartButton.Disabled = isActive || isEmpty;
+        _menu.EjectButton.Disabled = isActive || isEmpty;
+
+        if (activeComp != null)
+            _menu.CurrentCooktimeEnd = activeComp.CookTimeEnd;
+
+        // Set the "microwave light" panel color
+        _menu.SetIngredientPanelLight(isActive && !isEmpty);
+    }
+
+    /// <summary>
+    /// Update the panel containing all of the microwave's contents.
+    /// </summary>
+    private void RefreshContentsDisplay()
+    {
+        if (_menu == null)
+            return;
+
+        _solids.Clear();
+        _menu.IngredientsList.Clear();
+        foreach (var entity in _microwave.GetMicrowaveContents(Owner))
         {
-            _reagents.Clear();
+            if (EntMan.Deleted(entity))
+                continue;
 
-            if (_menu == null) return;
-
-            _solids.Clear();
-            _menu.IngredientsList.Clear();
-            foreach (var entity in containedSolids)
-            {
-                if (EntMan.Deleted(entity))
-                {
-                    return;
-                }
-
-                // TODO just use sprite view
-
-                Texture? texture;
-                if (EntMan.TryGetComponent<IconComponent>(entity, out var iconComponent))
-                {
-                    texture = EntMan.System<SpriteSystem>().GetIcon(iconComponent);
-                }
-                else if (EntMan.TryGetComponent<SpriteComponent>(entity, out var spriteComponent))
-                {
-                    texture = spriteComponent.Icon?.Default;
-                }
-                else
-                {
-                    continue;
-                }
-
-                var solidItem = _menu.IngredientsList.AddItem(EntMan.GetComponent<MetaDataComponent>(entity).EntityName, texture);
-                var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
-                _solids.Add(solidIndex, entity);
-            }
+            // TODO just use sprite view
+            var itemIcon = GetEntityIcon(entity);
+            var itemName = EntMan.GetComponent<MetaDataComponent>(entity).EntityName;
+            var solidItem = _menu.IngredientsList.AddItem(itemName, itemIcon);
+            var solidIndex = _menu.IngredientsList.IndexOf(solidItem);
+            _solids.Add(solidIndex, entity);
         }
     }
+
+    /// <summary>
+    /// Get the texture associated with an ingredient.
+    /// </summary>
+    /// <param name="uid">The ingredient entity.</param>
+    private Texture? GetEntityIcon(EntityUid uid)
+    {
+        if (EntMan.TryGetComponent<IconComponent>(uid, out var icon))
+            return _sprite.GetIcon(icon);
+
+        if (EntMan.TryGetComponent<SpriteComponent>(uid, out var sprite))
+            return sprite.Icon?.Default;
+
+        return null;
+    }
 }
diff --git a/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml b/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml
new file mode 100644
index 0000000000..479ca641a2
--- /dev/null
+++ b/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml
@@ -0,0 +1,9 @@
+<Button xmlns="https://spacestation14.io"
+    xmlns:system="clr-namespace:System;assembly=System.Runtime"
+    TextAlign="Center"
+    ToggleMode="True"
+    HorizontalExpand="True">
+    <Button.StyleClasses>
+        <system:String>OpenBoth</system:String>
+    </Button.StyleClasses>
+</Button>
diff --git a/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml.cs
new file mode 100644
index 0000000000..f6152d5de3
--- /dev/null
+++ b/Content.Client/Kitchen/UI/MicrowaveCookTimeButton.xaml.cs
@@ -0,0 +1,39 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Kitchen.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class MicrowaveCookTimeButton : Button
+{
+    public event Action<string, uint>? OnCookTimeSelected;
+    private uint _cookTime = 0;
+
+    public uint CookTime
+    {
+        get => _cookTime;
+        set
+        {
+            _cookTime = value;
+            UpdateLabel();
+        }
+    }
+
+    public MicrowaveCookTimeButton()
+    {
+        RobustXamlLoader.Load(this);
+        UpdateLabel();
+
+        OnPressed += _ => OnCookTimeSelected?.Invoke(Text ?? string.Empty, _cookTime);
+    }
+
+    private void UpdateLabel()
+    {
+        var labelText = _cookTime == 0
+            ? Loc.GetString("microwave-menu-instant-button")
+            : _cookTime.ToString();
+
+        Text = labelText;
+    }
+}
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
index a95d51af74..e60fbe8741 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml
@@ -2,6 +2,7 @@
     xmlns="https://spacestation14.io"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    xmlns:kitchen="clr-namespace:Content.Client.Kitchen.UI"
     Title="{Loc 'microwave-menu-title'}"
     MinWidth="512"
     MinSize="512 256">
@@ -49,15 +50,11 @@
                                 Align="Center"
                                 Modulate="#FFFFFF"
                                 VAlign="Center" />
-                            <BoxContainer  Orientation="Vertical">
-                                <Button
+                            <BoxContainer Orientation="Vertical" SeparationOverride="1">
+                                <kitchen:MicrowaveCookTimeButton
                                     Name="InstantCookButton"
-                                    Access="Public"
-                                    Text="{Loc 'microwave-menu-instant-button'}"
-                                    StyleClasses="OpenLeft"
-                                    ToggleMode="True"
-                                    Margin="0 0 2 0"
-                                    TextAlign="Center" />
+                                    CookTime="0"
+                                    StyleClasses="OpenBoth"/>
                                 <GridContainer
                                     Name="CookTimeButtonVbox"
                                     HSeparationOverride="1"
@@ -71,6 +68,7 @@
                                 <BoxContainer
                                     Orientation="Vertical"
                                     Align="Center"
+                                    SeparationOverride="1"
                                     SizeFlagsStretchRatio="3">
                                     <Control MinSize="0 15" />
                                     <Button
diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
index bcb2332e8f..19d802f8b2 100644
--- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs
@@ -1,83 +1,118 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+using System.Diagnostics.CodeAnalysis;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Kitchen.UI
+namespace Content.Client.Kitchen.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class MicrowaveMenu : FancyWindow
 {
-    [GenerateTypedNameReferences]
-    public sealed partial class MicrowaveMenu : FancyWindow
+    [Dependency] private IGameTiming _timing = default!;
+
+    public event Action<string, int, uint>? OnCookTimeSelected;
+
+    public ButtonGroup CookTimeButtonGroup { get; }
+    public bool IsBusy;
+    public TimeSpan CurrentCooktimeEnd;
+
+    private readonly StyleBoxFlat _ingredientsStylebox = new();
+
+    public MicrowaveMenu()
     {
-        [Dependency] private IGameTiming _timing = default!;
+        RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
 
-        public event Action<BaseButton.ButtonEventArgs, int>? OnCookTimeSelected;
+        IngredientsPanel.PanelOverride = _ingredientsStylebox;
 
-        public ButtonGroup CookTimeButtonGroup { get; }
+        CookTimeButtonGroup = new ButtonGroup();
+        InstantCookButton.Group = CookTimeButtonGroup;
+        InstantCookButton.OnCookTimeSelected += (name, cookTime) => OnCookTimeButtonPressed(name, 0, cookTime);
 
-        public bool IsBusy;
-        public TimeSpan CurrentCooktimeEnd;
-
-        public MicrowaveMenu()
+        for (var i = 1; i <= 6; i++)
         {
-            RobustXamlLoader.Load(this);
-            IoCManager.InjectDependencies(this);
-            CookTimeButtonGroup = new ButtonGroup();
-            InstantCookButton.Group = CookTimeButtonGroup;
-            InstantCookButton.OnPressed += args =>
+            var cookTime = i * 5;
+            var newButton = new MicrowaveCookTimeButton
             {
-                OnCookTimeSelected?.Invoke(args, 0);
+                CookTime = (uint)cookTime,
+                Group = CookTimeButtonGroup
             };
 
-            for (var i = 1; i <= 6; i++)
-            {
-                var newButton = new MicrowaveCookTimeButton
-                {
-                    Text = (i * 5).ToString(),
-                    TextAlign = Label.AlignMode.Center,
-                    ToggleMode = true,
-                    CookTime = (uint) (i * 5),
-                    Group = CookTimeButtonGroup,
-                    HorizontalExpand = true,
-                };
-                if (i == 4)
-                {
-                    newButton.StyleClasses.Add("OpenRight");
-                }
-                else
-                {
-                    newButton.StyleClasses.Add("OpenBoth");
-                }
-                CookTimeButtonVbox.AddChild(newButton);
-                newButton.OnPressed += args =>
-                {
-                    OnCookTimeSelected?.Invoke(args, i);
-                };
-            }
-        }
-
-        public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
-        {
-            DisableCookingPanelOverlay.Visible = shouldDisable;
-        }
-
-        protected override void FrameUpdate(FrameEventArgs args)
-        {
-            base.FrameUpdate(args);
-
-            if (!IsBusy)
-                return;
-
-            if (CurrentCooktimeEnd > _timing.CurTime)
-            {
-                CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
-                ("time", CurrentCooktimeEnd.Subtract(_timing.CurTime).Seconds));
-            }
-        }
-
-        public sealed class MicrowaveCookTimeButton : Button
-        {
-            public uint CookTime;
+            newButton.OnCookTimeSelected += (name, cookTime) => OnCookTimeButtonPressed(name, i, cookTime);
+            CookTimeButtonVbox.AddChild(newButton);
         }
     }
+
+    private void OnCookTimeButtonPressed(string name, int index, uint cookTime)
+    {
+        OnCookTimeSelected?.Invoke(name, index, cookTime);
+    }
+
+    /// <summary>
+    /// Set the visibility of the "busy overlay panel" over the microwave's ingredients,
+    /// indicating to the player that the ingredients list cannot be interacted with
+    /// (namely while the microwave is active.)
+    /// </summary>
+    /// <param name="shouldDisable">Whether or not this microwave is "busy".</param>
+    public void ToggleBusyDisableOverlayPanel(bool shouldDisable)
+    {
+        DisableCookingPanelOverlay.Visible = shouldDisable;
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (!IsBusy)
+            return;
+
+        var remaining = CurrentCooktimeEnd - _timing.CurTime;
+        if (remaining > TimeSpan.Zero)
+        {
+            CookTimeInfoLabel.Text = Loc.GetString("microwave-bound-user-interface-cook-time-label",
+                ("time", Math.Ceiling(remaining.TotalSeconds)));
+        }
+    }
+
+    /// <summary>
+    /// Set the "color light" state of the ingredient panel's ingredient box.
+    /// </summary>
+    /// <param name="value">Wheether or not the panel is "lit" (yellow) or "unlit" (gray).</param>
+    public void SetIngredientPanelLight(bool value)
+    {
+        var panelColor = value
+            ? Color.DarkGoldenrod
+            : Color.FromHex("#1B1B1E");
+
+        _ingredientsStylebox.BackgroundColor = panelColor;
+    }
+
+    /// <summary>
+    /// Attempt to get the cook time button at the given index.
+    /// </summary>
+    /// <param name="index">The index to select.</param>
+    /// <param name="button">The cook time button, if found.</param>
+    /// <returns>Whether or not this operation was successful.</returns>
+    public bool TryGetCookTimeButton(int index,
+        [NotNullWhen(true)] out Button? button)
+    {
+        button = null;
+
+        if (index == 0)
+            button = InstantCookButton;
+        else
+        {
+            if (index <= CookTimeButtonVbox.ChildCount)
+            {
+                var control = CookTimeButtonVbox.GetChild(index - 1);
+                if (control is Button timeButton)
+                    button = timeButton;
+            }
+        }
+
+        return button != null;
+    }
 }
diff --git a/Content.IntegrationTests/Tests/Kitchen/MicrowaveRecipeTest.cs b/Content.IntegrationTests/Tests/Kitchen/MicrowaveRecipeTest.cs
new file mode 100644
index 0000000000..212aa11be3
--- /dev/null
+++ b/Content.IntegrationTests/Tests/Kitchen/MicrowaveRecipeTest.cs
@@ -0,0 +1,86 @@
+using Content.IntegrationTests.Fixtures;
+using Content.IntegrationTests.Fixtures.Attributes;
+using Content.IntegrationTests.Utility;
+using Content.Server.Kitchen.EntitySystems;
+using Content.Shared.Kitchen;
+using Content.Shared.Kitchen.Components;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests.Kitchen;
+
+/// <summary>
+/// Integration tests related to microwaves and microwave recipes.
+/// </summary>
+public sealed class MicrowaveRecipeTest : GameTest
+{
+    [SidedDependency(Side.Server)] private readonly ServerMicrowaveSystem _microwave = null!;
+
+    private static readonly string[] Recipes = GameDataScrounger.PrototypesOfKind<MicrowaveMealRecipePrototype>();
+    private static readonly EntProtoId MicrowavePrototype = "KitchenMicrowave";
+    private const uint MaxSeconds = 30;
+
+    [Test]
+    [TestOf(typeof(ServerMicrowaveSystem))]
+    [TestCaseSource(nameof(Recipes))]
+    [Description("Checks whether a microwave recipe's ingredients will create that recipe in the microwave.")]
+    public async Task AllRecipeIngredientsMakeRecipe(string protoKey)
+    {
+        var server = Pair.Server;
+
+        // Spawn the microwave we will use for our recipes.
+        var microwave = await Spawn(MicrowavePrototype);
+        var microwaveString = SEntMan.ToPrettyString(microwave);
+
+        await server.WaitAssertion(() =>
+        {
+            Assert.That(SEntMan.HasComponent<MicrowaveComponent>(microwave),
+                $"Microwave entity {microwaveString} lacks a {nameof(MicrowaveComponent)}!");
+
+            // Get the parameters we need to make this recipe.
+            var proto = SProtoMan.Index<MicrowaveMealRecipePrototype>(protoKey);
+            var maxPortions = MaxSeconds / proto.Time;
+
+            // Ensure this recipe is provided to the microwave if this is a secret recipe.
+            if (proto.SecretRecipe)
+            {
+                var recipeProvider = SEntMan.EnsureComponent<FoodRecipeProviderComponent>(microwave);
+                recipeProvider.ProvidedRecipes.Add(protoKey);
+            }
+
+            // First, test that a single portion works.
+            ValidateRecipePortions(proto, 1, microwave);
+
+            // Then, test that making multiple portions of the same recipe works.
+            if (maxPortions > 1)
+                ValidateRecipePortions(proto, maxPortions, microwave);
+        });
+    }
+
+    private void ValidateRecipePortions(MicrowaveMealRecipePrototype prototype, uint portions, EntityUid microwave)
+    {
+        var ingredients = prototype.Ingredients * portions;
+        var cookTime = prototype.Time * portions;
+        var portionedRecipe = _microwave.GetRecipe(microwave, ingredients, cookTime);
+        var microwaveString = SEntMan.ToPrettyString(microwave);
+        var recipeDebugString = $"Ingredients for {nameof(MicrowaveMealRecipePrototype)} {prototype.ID}";
+
+        using (Assert.EnterMultipleScope())
+        {
+            // Tried to get a recipe for these ingredients, but no valid recipe was found.
+            Assert.That(portionedRecipe, Is.Not.Null,
+                $"{recipeDebugString} did not resolve to a recipe in {microwaveString} in {portions} portions!");
+
+            var recipe = portionedRecipe.Value.Recipe;
+            var count = portionedRecipe.Value.Count;
+
+            // Resulted in a different recipe instead.
+            Assert.That(recipe, Is.EqualTo(prototype.ID),
+                $"{recipeDebugString} resulted in an incorrect recipe for {microwaveString} in {portions} portions!");
+
+            // Recipe portion count does not match the amount we're trying to make.
+            Assert.That(count, Is.EqualTo(portions),
+                $"{recipeDebugString} resulted in {count} recipe portions for {microwaveString}! Expected: {portions}");
+        }
+    }
+}
diff --git a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs
index 801c6c49b6..c4ac6d7990 100644
--- a/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs
+++ b/Content.IntegrationTests/Tests/WizdenContentFreeze/WizdenContentFreeze.cs
@@ -24,7 +24,7 @@ public sealed class WizdenContentFreeze : GameTest
 
         var protoMan = server.ProtoMan;
 
-        var recipesCount = protoMan.Count<FoodRecipePrototype>();
+        var recipesCount = protoMan.Count<MicrowaveMealRecipePrototype>();
         var recipesLimit = 218;
 
         if (recipesCount > recipesLimit)
diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs
index 1c3112a628..fb96fd4aaa 100644
--- a/Content.Server/Access/Systems/IdCardSystem.cs
+++ b/Content.Server/Access/Systems/IdCardSystem.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
-using Content.Server.Kitchen.Components;
 using Content.Server.Popups;
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
@@ -9,9 +8,10 @@ using Content.Shared.Access.Systems;
 using Content.Shared.Chat;
 using Content.Shared.Database;
 using Content.Shared.Kitchen;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Kitchen.EntitySystems;
 using Content.Shared.Popups;
 using Robust.Shared.Random;
-using Content.Server.Kitchen.EntitySystems;
 
 namespace Content.Server.Access.Systems;
 
diff --git a/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs b/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
deleted file mode 100644
index 1e32e039db..0000000000
--- a/Content.Server/Kitchen/Components/ActiveMicrowaveComponent.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Content.Shared.Kitchen;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-
-namespace Content.Server.Kitchen.Components;
-
-/// <summary>
-/// Attached to a microwave that is currently in the process of cooking
-/// </summary>
-[RegisterComponent, AutoGenerateComponentPause]
-public sealed partial class ActiveMicrowaveComponent : Component
-{
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float CookTimeRemaining;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    public float TotalTime;
-
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoPausedField]
-    public TimeSpan MalfunctionTime = TimeSpan.Zero;
-
-    [ViewVariables]
-    public (FoodRecipePrototype?, int) PortionedRecipe;
-}
diff --git a/Content.Server/Kitchen/Components/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
deleted file mode 100644
index df8218c7a8..0000000000
--- a/Content.Server/Kitchen/Components/MicrowaveComponent.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-using Content.Shared.Construction.Prototypes;
-using Content.Shared.DeviceLinking;
-using Content.Shared.Item;
-using Robust.Shared.Audio;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-
-namespace Content.Server.Kitchen.Components
-{
-    [RegisterComponent]
-    public sealed partial class MicrowaveComponent : Component
-    {
-        [DataField]
-        public float CookTimeMultiplier = 1;
-
-        [DataField]
-        public float BaseHeatMultiplier = 100;
-
-        [DataField]
-        public float ObjectHeatMultiplier = 100;
-
-        [DataField("failureResult")]
-        public EntProtoId BadRecipeEntityId = "FoodBadRecipe";
-
-        #region  audio
-        [DataField("beginCookingSound")]
-        public SoundSpecifier StartCookingSound = new SoundPathSpecifier("/Audio/Machines/microwave_start_beep.ogg");
-
-        [DataField]
-        public SoundSpecifier FoodDoneSound = new SoundPathSpecifier("/Audio/Machines/microwave_done_beep.ogg");
-
-        [DataField]
-        public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg");
-
-        [DataField("ItemBreakSound")]
-        public SoundSpecifier ItemBreakSound = new SoundPathSpecifier("/Audio/Effects/clang.ogg");
-
-        public EntityUid? PlayingStream;
-
-        [DataField]
-        public SoundSpecifier LoopingSound = new SoundPathSpecifier("/Audio/Machines/microwave_loop.ogg");
-        #endregion
-
-        [DataField]
-        public bool Broken;
-
-        [DataField]
-        public ProtoId<SinkPortPrototype> OnPort = "On";
-
-        /// <summary>
-        /// This is a fixed offset of 5.
-        /// The cook times for all recipes should be divisible by 5,with a minimum of 1 second.
-        /// For right now, I don't think any recipe cook time should be greater than 60 seconds.
-        /// </summary>
-        [DataField]
-        public uint CurrentCookTimerTime = 0;
-
-        /// <summary>
-        /// Tracks the elapsed time of the current cook timer.
-        /// </summary>
-        [DataField]
-        public TimeSpan CurrentCookTimeEnd = TimeSpan.Zero;
-
-        /// <summary>
-        /// The maximum number of seconds a microwave can be set to.
-        /// This is currently only used for validation and the client does not check this.
-        /// </summary>
-        [DataField]
-        public uint MaxCookTime = 30;
-
-        /// <summary>
-        ///     The max temperature that this microwave can heat objects to.
-        /// </summary>
-        [DataField]
-        public float TemperatureUpperThreshold = 373.15f;
-
-        public int CurrentCookTimeButtonIndex;
-
-        public Container Storage = default!;
-
-        [DataField]
-        public string ContainerId = "microwave_entity_container";
-
-        [DataField]
-        public int Capacity = 10;
-
-        [DataField]
-        public ProtoId<ItemSizePrototype> MaxItemSize = "Normal";
-
-        /// <summary>
-        /// How frequently the microwave can malfunction.
-        /// </summary>
-        [DataField]
-        public float MalfunctionInterval = 1.0f;
-
-        /// <summary>
-        /// Chance of an explosion occurring when we microwave a metallic object
-        /// </summary>
-        [DataField]
-        public float ExplosionChance = .1f;
-
-        /// <summary>
-        /// Chance of lightning occurring when we microwave a metallic object
-        [DataField]
-        public float LightningChance = .75f;
-
-        /// <summary>
-        /// If this microwave can give ids accesses without exploding
-        /// </summary>
-        [DataField]
-        public bool CanMicrowaveIdsSafely = true;
-    }
-}
diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
deleted file mode 100644
index ab9cc981d9..0000000000
--- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
+++ /dev/null
@@ -1,761 +0,0 @@
-using System.Linq;
-using Content.Server.Administration.Logs;
-using Content.Server.Construction;
-using Content.Server.Construction.Components;
-using Content.Server.DeviceLinking.Systems;
-using Content.Server.Explosion.EntitySystems;
-using Content.Server.Hands.Systems;
-using Content.Server.Kitchen.Components;
-using Content.Server.Lightning;
-using Content.Server.Power.Components;
-using Content.Server.Power.EntitySystems;
-using Content.Server.Temperature.Systems;
-using Content.Shared.Chemistry.EntitySystems;
-using Content.Shared.Chemistry.Reaction;
-using Content.Shared.Chemistry.Reagent;
-using Content.Shared.Construction.EntitySystems;
-using Content.Shared.Damage.Components;
-using Content.Shared.Database;
-using Content.Shared.Destructible;
-using Content.Shared.DeviceLinking.Events;
-using Content.Shared.FixedPoint;
-using Content.Shared.IdentityManagement;
-using Content.Shared.Interaction;
-using Content.Shared.Interaction.Events;
-using Content.Shared.Item;
-using Content.Shared.Kitchen;
-using Content.Shared.Kitchen.Components;
-using Content.Shared.Popups;
-using Content.Shared.Power;
-using Content.Shared.Power.EntitySystems;
-using Content.Shared.Stacks;
-using Content.Shared.Suicide;
-using Content.Shared.Tag;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Robust.Shared.Timing;
-
-namespace Content.Server.Kitchen.EntitySystems
-{
-    public sealed partial class MicrowaveSystem : EntitySystem
-    {
-        [Dependency] private DeviceLinkSystem _deviceLink = default!;
-        [Dependency] private SharedPopupSystem _popupSystem = default!;
-        [Dependency] private PowerReceiverSystem _power = default!;
-        [Dependency] private RecipeManager _recipeManager = default!;
-        [Dependency] private SharedAppearanceSystem _appearance = default!;
-        [Dependency] private SharedAudioSystem _audio = default!;
-        [Dependency] private LightningSystem _lightning = default!;
-        [Dependency] private IRobustRandom _random = default!;
-        [Dependency] private IGameTiming _gameTiming = default!;
-        [Dependency] private ExplosionSystem _explosion = default!;
-        [Dependency] private SharedContainerSystem _container = default!;
-        [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
-        [Dependency] private TagSystem _tag = default!;
-        [Dependency] private TemperatureSystem _temperature = default!;
-        [Dependency] private UserInterfaceSystem _userInterface = default!;
-        [Dependency] private HandsSystem _handsSystem = default!;
-        [Dependency] private SharedItemSystem _item = default!;
-        [Dependency] private SharedStackSystem _stack = default!;
-        [Dependency] private IAdminLogManager _adminLogger = default!;
-        [Dependency] private SharedSuicideSystem _suicide = default!;
-        [Dependency] private SharedPowerStateSystem _powerState = default!;
-
-        private static readonly EntProtoId MalfunctionSpark = "Spark";
-
-        private static readonly ProtoId<TagPrototype> MetalTag = "Metal";
-        private static readonly ProtoId<TagPrototype> PlasticTag = "Plastic";
-
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            SubscribeLocalEvent<MicrowaveComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<MicrowaveComponent, MapInitEvent>(OnMapInit);
-            SubscribeLocalEvent<MicrowaveComponent, SolutionChangedEvent>(OnSolutionChange);
-            SubscribeLocalEvent<MicrowaveComponent, EntInsertedIntoContainerMessage>(OnContentUpdate);
-            SubscribeLocalEvent<MicrowaveComponent, EntRemovedFromContainerMessage>(OnContentUpdate);
-            SubscribeLocalEvent<MicrowaveComponent, InteractUsingEvent>(OnInteractUsing, after: new[] { typeof(AnchorableSystem) });
-            SubscribeLocalEvent<MicrowaveComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
-            SubscribeLocalEvent<MicrowaveComponent, BreakageEventArgs>(OnBreak);
-            SubscribeLocalEvent<MicrowaveComponent, PowerChangedEvent>(OnPowerChanged);
-            SubscribeLocalEvent<MicrowaveComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-            SubscribeLocalEvent<MicrowaveComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
-
-            SubscribeLocalEvent<MicrowaveComponent, SignalReceivedEvent>(OnSignalReceived);
-
-            SubscribeLocalEvent<MicrowaveComponent, MicrowaveStartCookMessage>((u, c, m) => Wzhzhzh(u, c, m.Actor));
-            SubscribeLocalEvent<MicrowaveComponent, MicrowaveEjectMessage>(OnEjectMessage);
-            SubscribeLocalEvent<MicrowaveComponent, MicrowaveEjectSolidIndexedMessage>(OnEjectIndex);
-            SubscribeLocalEvent<MicrowaveComponent, MicrowaveSelectCookTimeMessage>(OnSelectTime);
-
-            SubscribeLocalEvent<ActiveMicrowaveComponent, ComponentStartup>(OnCookStart);
-            SubscribeLocalEvent<ActiveMicrowaveComponent, ComponentShutdown>(OnCookStop);
-            SubscribeLocalEvent<ActiveMicrowaveComponent, EntInsertedIntoContainerMessage>(OnActiveMicrowaveInsert);
-            SubscribeLocalEvent<ActiveMicrowaveComponent, EntRemovedFromContainerMessage>(OnActiveMicrowaveRemove);
-
-            SubscribeLocalEvent<ActivelyMicrowavedComponent, OnConstructionTemperatureEvent>(OnConstructionTemp);
-            SubscribeLocalEvent<ActivelyMicrowavedComponent, SolutionRelayEvent<ReactionAttemptEvent>>(OnReactionAttemptRelay);
-            SubscribeLocalEvent<ActivelyMicrowavedComponent, ReactionAttemptEvent>(OnReactionAttempt);
-
-            SubscribeLocalEvent<FoodRecipeProviderComponent, GetSecretRecipesEvent>(OnGetSecretRecipes);
-        }
-
-        private void OnCookStart(Entity<ActiveMicrowaveComponent> ent, ref ComponentStartup args)
-        {
-            if (!TryComp<MicrowaveComponent>(ent, out var microwaveComponent))
-                return;
-            SetAppearance(ent.Owner, MicrowaveVisualState.Cooking, microwaveComponent);
-
-            var audioParams = microwaveComponent.LoopingSound?.Params ?? AudioParams.Default;
-            audioParams = audioParams.WithLoop(true).WithMaxDistance(5);
-            microwaveComponent.PlayingStream = _audio.PlayPvs(microwaveComponent.LoopingSound, ent, audioParams)?.Entity;
-            _powerState.SetWorkingState(ent.Owner, true);
-        }
-
-        private void OnCookStop(Entity<ActiveMicrowaveComponent> ent, ref ComponentShutdown args)
-        {
-            if (!TryComp<MicrowaveComponent>(ent, out var microwaveComponent))
-                return;
-
-            SetAppearance(ent.Owner, MicrowaveVisualState.Idle, microwaveComponent);
-            microwaveComponent.PlayingStream = _audio.Stop(microwaveComponent.PlayingStream);
-            _powerState.SetWorkingState(ent.Owner, false);
-        }
-
-        private void OnActiveMicrowaveInsert(Entity<ActiveMicrowaveComponent> ent, ref EntInsertedIntoContainerMessage args)
-        {
-            var microwavedComp = AddComp<ActivelyMicrowavedComponent>(args.Entity);
-            microwavedComp.Microwave = ent.Owner;
-        }
-
-        private void OnActiveMicrowaveRemove(Entity<ActiveMicrowaveComponent> ent, ref EntRemovedFromContainerMessage args)
-        {
-            RemCompDeferred<ActivelyMicrowavedComponent>(args.Entity);
-        }
-
-        // Stop items from transforming through constructiongraphs while being microwaved.
-        // They might be reserved for a microwave recipe.
-        private void OnConstructionTemp(Entity<ActivelyMicrowavedComponent> ent, ref OnConstructionTemperatureEvent args)
-        {
-            args.Result = HandleResult.False;
-        }
-
-        private void OnReactionAttemptRelay(Entity<ActivelyMicrowavedComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
-        {
-            OnReactionAttempt(ent, ref args.Event);
-        }
-
-        // Stop reagents from reacting if they are currently reserved for a microwave recipe.
-        // For example Egg would cook into EggCooked, causing it to not being removed once we are done microwaving.
-        private void OnReactionAttempt(Entity<ActivelyMicrowavedComponent> ent, ref ReactionAttemptEvent args)
-        {
-            if (!TryComp<ActiveMicrowaveComponent>(ent.Comp.Microwave, out var activeMicrowaveComp))
-                return;
-
-            if (activeMicrowaveComp.PortionedRecipe.Item1 == null) // no recipe selected
-                return;
-
-            var recipeReagents = activeMicrowaveComp.PortionedRecipe.Item1.IngredientsReagents.Keys;
-
-            foreach (var reagent in recipeReagents)
-            {
-                if (args.Reaction.Reactants.ContainsKey(reagent))
-                {
-                    args.Cancelled = true;
-                    return;
-                }
-            }
-        }
-
-        /// <summary>
-        ///     Adds temperature to every item in the microwave,
-        ///     based on the time it took to microwave.
-        /// </summary>
-        /// <param name="component">The microwave that is heating up.</param>
-        /// <param name="time">The time on the microwave, in seconds.</param>
-        private void AddTemperature(MicrowaveComponent component, float time)
-        {
-            var heatToAdd = time * component.BaseHeatMultiplier;
-            foreach (var entity in component.Storage.ContainedEntities)
-            {
-                _temperature.ChangeHeat(entity, heatToAdd * component.ObjectHeatMultiplier, false);
-
-                foreach (var (_, soln) in _solutionContainer.EnumerateSolutions(entity))
-                {
-                    var solution = soln.Comp.Solution;
-                    if (solution.Temperature > component.TemperatureUpperThreshold)
-                        continue;
-
-                    _solutionContainer.AddThermalEnergy(soln, heatToAdd);
-                }
-            }
-        }
-
-        private void SubtractContents(MicrowaveComponent component, FoodRecipePrototype recipe)
-        {
-            // TODO Turn recipe.IngredientsReagents into a ReagentQuantity[]
-
-            var totalReagentsToRemove = new Dictionary<ProtoId<ReagentPrototype>, FixedPoint2>(recipe.IngredientsReagents);
-
-            // this is spaghetti ngl
-            foreach (var item in component.Storage.ContainedEntities)
-            {
-                // use the same reagents as when we selected the recipe
-                if (!_solutionContainer.TryGetDrainableSolution(item, out var solutionEntity, out var solution))
-                    continue;
-
-                foreach (var (reagent, _) in recipe.IngredientsReagents)
-                {
-                    // removed everything
-                    if (!totalReagentsToRemove.ContainsKey(reagent))
-                        continue;
-
-                    var quant = solution.GetTotalPrototypeQuantity(reagent);
-
-                    if (quant >= totalReagentsToRemove[reagent])
-                    {
-                        quant = totalReagentsToRemove[reagent];
-                        totalReagentsToRemove.Remove(reagent);
-                    }
-                    else
-                    {
-                        totalReagentsToRemove[reagent] -= quant;
-                    }
-
-                    _solutionContainer.RemoveReagent(solutionEntity.Value, reagent, quant);
-                }
-            }
-
-            foreach (var recipeSolid in recipe.IngredientsSolids)
-            {
-                for (var i = 0; i < recipeSolid.Value; i++)
-                {
-                    foreach (var item in component.Storage.ContainedEntities)
-                    {
-                        string? itemID = null;
-
-                        // If an entity has a stack component, use the stacktype instead of prototype id
-                        if (TryComp<StackComponent>(item, out var stackComp))
-                        {
-                            itemID = ProtoMan.Index(stackComp.StackTypeId).Spawn;
-                        }
-                        else
-                        {
-                            var metaData = MetaData(item);
-                            if (metaData.EntityPrototype == null)
-                            {
-                                continue;
-                            }
-                            itemID = metaData.EntityPrototype.ID;
-                        }
-
-                        if (itemID != recipeSolid.Key)
-                        {
-                            continue;
-                        }
-
-                        if (stackComp is not null)
-                        {
-                            if (stackComp.Count == 1)
-                            {
-                                _container.Remove(item, component.Storage);
-                            }
-                            _stack.ReduceCount((item, stackComp), 1);
-                            break;
-                        }
-                        else
-                        {
-                            _container.Remove(item, component.Storage);
-                            Del(item);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        private void OnInit(Entity<MicrowaveComponent> ent, ref ComponentInit args)
-        {
-            // this really does have to be in ComponentInit
-            ent.Comp.Storage = _container.EnsureContainer<Container>(ent, ent.Comp.ContainerId);
-        }
-
-        private void OnMapInit(Entity<MicrowaveComponent> ent, ref MapInitEvent args)
-        {
-            _deviceLink.EnsureSinkPorts(ent, ent.Comp.OnPort);
-        }
-
-        /// <summary>
-        /// Kills the user by microwaving their head
-        /// TODO: Make this not awful, it keeps any items attached to your head still on and you can revive someone and cogni them so you have some dumb headless fuck running around. I've seen it happen.
-        /// </summary>
-        private void OnSuicideByEnvironment(Entity<MicrowaveComponent> ent, ref SuicideByEnvironmentEvent args)
-        {
-            if (args.Handled)
-                return;
-
-            // The act of getting your head microwaved doesn't actually kill you
-            if (!TryComp<DamageableComponent>(args.Victim, out var damageableComponent))
-                return;
-
-            // The application of lethal damage is what kills you...
-            _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat");
-
-            var victim = args.Victim;
-
-            var selfMessage = Loc.GetString("microwave-component-suicide-message");
-            var othersMessage = Loc.GetString("microwave-component-suicide-others-message", ("victim", Identity.Entity(victim, EntityManager)));
-
-            _popupSystem.PopupEntity(selfMessage, othersMessage, victim, victim);
-
-            var audioParams = ent.Comp.ClickSound?.Params ?? AudioParams.Default;
-            audioParams = audioParams.AddVolume(-2);
-            _audio.PlayPvs(ent.Comp.ClickSound, ent.Owner, audioParams);
-            ent.Comp.CurrentCookTimerTime = 10;
-            Wzhzhzh(ent.Owner, ent.Comp, args.Victim);
-            UpdateUserInterfaceState(ent.Owner, ent.Comp);
-            args.Handled = true;
-        }
-
-        private void OnSolutionChange(Entity<MicrowaveComponent> ent, ref SolutionChangedEvent args)
-        {
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnContentUpdate(EntityUid uid, MicrowaveComponent component, ContainerModifiedMessage args) // For some reason ContainerModifiedMessage just can't be used at all with Entity<T>. TODO: replace with Entity<T> syntax once that's possible
-        {
-            if (component.Storage != args.Container)
-                return;
-
-            UpdateUserInterfaceState(uid, component);
-        }
-
-        private void OnInsertAttempt(Entity<MicrowaveComponent> ent, ref ContainerIsInsertingAttemptEvent args)
-        {
-            if (args.Container.ID != ent.Comp.ContainerId)
-                return;
-
-            if (ent.Comp.Broken)
-            {
-                args.Cancel();
-                return;
-            }
-
-            if (TryComp<ItemComponent>(args.EntityUid, out var item))
-            {
-                if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
-                {
-                    args.Cancel();
-                    return;
-                }
-            }
-            else
-            {
-                args.Cancel();
-                return;
-            }
-
-            if (ent.Comp.Storage.Count >= ent.Comp.Capacity)
-                args.Cancel();
-        }
-
-        private void OnInteractUsing(Entity<MicrowaveComponent> ent, ref InteractUsingEvent args)
-        {
-            if (args.Handled)
-                return;
-            if (!(TryComp<ApcPowerReceiverComponent>(ent, out var apc) && apc.Powered))
-            {
-                _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-using-no-power"), ent, args.User);
-                return;
-            }
-
-            if (ent.Comp.Broken)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-using-broken"), ent, args.User);
-                return;
-            }
-
-            if (TryComp<ItemComponent>(args.Used, out var item))
-            {
-                // check if size of an item you're trying to put in is too big
-                if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
-                {
-                    _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-item-too-big", ("item", args.Used)), ent, args.User);
-                    return;
-                }
-            }
-            else
-            {
-                // check if thing you're trying to put in isn't an item
-                _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-using-transfer-fail"), ent, args.User);
-                return;
-            }
-
-            if (ent.Comp.Storage.Count >= ent.Comp.Capacity)
-            {
-                _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-full"), ent, args.User);
-                return;
-            }
-
-            args.Handled = true;
-            _handsSystem.TryDropIntoContainer(args.User, args.Used, ent.Comp.Storage);
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnBreak(Entity<MicrowaveComponent> ent, ref BreakageEventArgs args)
-        {
-            ent.Comp.Broken = true;
-            SetAppearance(ent, MicrowaveVisualState.Broken, ent.Comp);
-            StopCooking(ent);
-            _container.EmptyContainer(ent.Comp.Storage);
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnPowerChanged(Entity<MicrowaveComponent> ent, ref PowerChangedEvent args)
-        {
-            if (!args.Powered)
-            {
-                SetAppearance(ent, MicrowaveVisualState.Idle, ent.Comp);
-                StopCooking(ent);
-            }
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnAnchorChanged(EntityUid uid, MicrowaveComponent component, ref AnchorStateChangedEvent args)
-        {
-            if (!args.Anchored)
-                _container.EmptyContainer(component.Storage);
-        }
-
-        private void OnSignalReceived(Entity<MicrowaveComponent> ent, ref SignalReceivedEvent args)
-        {
-            if (args.Port != ent.Comp.OnPort)
-                return;
-
-            if (ent.Comp.Broken || !_power.IsPowered(ent))
-                return;
-
-            Wzhzhzh(ent.Owner, ent.Comp, null);
-        }
-
-        public void UpdateUserInterfaceState(EntityUid uid, MicrowaveComponent component)
-        {
-            _userInterface.SetUiState(uid, MicrowaveUiKey.Key, new MicrowaveUpdateUserInterfaceState(
-                GetNetEntityArray(component.Storage.ContainedEntities.ToArray()),
-                HasComp<ActiveMicrowaveComponent>(uid),
-                component.CurrentCookTimeButtonIndex,
-                component.CurrentCookTimerTime,
-                component.CurrentCookTimeEnd
-            ));
-        }
-
-        public void SetAppearance(EntityUid uid, MicrowaveVisualState state, MicrowaveComponent? component = null, AppearanceComponent? appearanceComponent = null)
-        {
-            if (!Resolve(uid, ref component, ref appearanceComponent, false))
-                return;
-            var display = component.Broken ? MicrowaveVisualState.Broken : state;
-            _appearance.SetData(uid, PowerDeviceVisuals.VisualState, display, appearanceComponent);
-        }
-
-        public static bool HasContents(MicrowaveComponent component)
-        {
-            return component.Storage.ContainedEntities.Any();
-        }
-
-        /// <summary>
-        /// Explodes the microwave internally, turning it into a broken state, destroying its board, and spitting out its machine parts
-        /// </summary>
-        /// <param name="ent"></param>
-        public void Explode(Entity<MicrowaveComponent> ent)
-        {
-            ent.Comp.Broken = true; // Make broken so we stop processing stuff
-            _explosion.TriggerExplosive(ent);
-            if (TryComp<MachineComponent>(ent, out var machine))
-            {
-                _container.CleanContainer(machine.BoardContainer);
-                _container.EmptyContainer(machine.PartContainer);
-            }
-
-            _adminLogger.Add(LogType.Action, LogImpact.Medium,
-                $"{ToPrettyString(ent)} exploded from unsafe cooking!");
-        }
-        /// <summary>
-        /// Handles the attempted cooking of unsafe objects
-        /// </summary>
-        /// <remarks>
-        /// Returns false if the microwave didn't explode, true if it exploded.
-        /// </remarks>
-        private void RollMalfunction(Entity<ActiveMicrowaveComponent, MicrowaveComponent> ent)
-        {
-            if (ent.Comp1.MalfunctionTime == TimeSpan.Zero)
-                return;
-
-            if (ent.Comp1.MalfunctionTime > _gameTiming.CurTime)
-                return;
-
-            ent.Comp1.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(ent.Comp2.MalfunctionInterval);
-            if (_random.Prob(ent.Comp2.ExplosionChance))
-            {
-                Explode((ent, ent.Comp2));
-                return;  // microwave is fucked, stop the cooking.
-            }
-
-            if (_random.Prob(ent.Comp2.LightningChance))
-                _lightning.ShootRandomLightnings(ent, 1.0f, 2, MalfunctionSpark, triggerLightningEvents: false);
-        }
-
-        /// <summary>
-        /// Starts Cooking
-        /// </summary>
-        /// <remarks>
-        /// It does not make a "wzhzhzh" sound, it makes a "mmmmmmmm" sound!
-        /// -emo
-        /// </remarks>
-        public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user)
-        {
-            if (!HasContents(component) || HasComp<ActiveMicrowaveComponent>(uid) || !(TryComp<ApcPowerReceiverComponent>(uid, out var apc) && apc.Powered))
-                return;
-
-            var solidsDict = new Dictionary<string, int>();
-            var reagentDict = new Dictionary<string, FixedPoint2>();
-            var malfunctioning = false;
-            // TODO use lists of Reagent quantities instead of reagent prototype ids.
-            foreach (var item in component.Storage.ContainedEntities.ToArray())
-            {
-                // special behavior when being microwaved ;)
-                var ev = new BeingMicrowavedEvent(uid, user);
-                RaiseLocalEvent(item, ev);
-
-                // TODO MICROWAVE SPARKS & EFFECTS
-                // Various microwaveable entities should probably spawn a spark, play a sound, and generate a pop=up.
-                // This should probably be handled by the microwave system, with fields in BeingMicrowavedEvent.
-
-                if (ev.Handled)
-                {
-                    UpdateUserInterfaceState(uid, component);
-                    return;
-                }
-
-                if (_tag.HasTag(item, MetalTag))
-                {
-                    malfunctioning = true;
-                }
-
-                if (_tag.HasTag(item, PlasticTag))
-                {
-                    var junk = Spawn(component.BadRecipeEntityId, Transform(uid).Coordinates);
-                    _container.Insert(junk, component.Storage);
-                    Del(item);
-                    continue;
-                }
-
-                var microwavedComp = AddComp<ActivelyMicrowavedComponent>(item);
-                microwavedComp.Microwave = uid;
-
-                string? solidID = null;
-                int amountToAdd = 1;
-
-                // If a microwave recipe uses a stacked item, use the default stack prototype id instead of prototype id
-                if (TryComp<StackComponent>(item, out var stackComp))
-                {
-                    solidID = ProtoMan.Index<StackPrototype>(stackComp.StackTypeId).Spawn;
-                    amountToAdd = stackComp.Count;
-                }
-                else
-                {
-                    var metaData = MetaData(item); //this simply begs for cooking refactor
-                    if (metaData.EntityPrototype is not null)
-                        solidID = metaData.EntityPrototype.ID;
-                }
-
-                if (solidID is null)
-                    continue;
-
-                if (!solidsDict.TryAdd(solidID, amountToAdd))
-                    solidsDict[solidID] += amountToAdd;
-
-                // only use reagents we have access to
-                // you have to break the eggs before we can use them!
-                if (!_solutionContainer.TryGetDrainableSolution(item, out var _, out var solution))
-                    continue;
-
-                foreach (var (reagent, quantity) in solution.Contents)
-                {
-                    if (!reagentDict.TryAdd(reagent.Prototype, quantity))
-                        reagentDict[reagent.Prototype] += quantity;
-                }
-            }
-
-            // Check recipes
-            var getRecipesEv = new GetSecretRecipesEvent();
-            RaiseLocalEvent(uid, ref getRecipesEv);
-
-            List<FoodRecipePrototype> recipes = getRecipesEv.Recipes;
-            recipes.AddRange(_recipeManager.Recipes);
-            var portionedRecipe = recipes.Select(r =>
-                CanSatisfyRecipe(component, r, solidsDict, reagentDict)).FirstOrDefault(r => r.Item2 > 0);
-
-            _audio.PlayPvs(component.StartCookingSound, uid);
-            var activeComp = AddComp<ActiveMicrowaveComponent>(uid); //microwave is now cooking
-            activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.CookTimeMultiplier;
-            activeComp.TotalTime = component.CurrentCookTimerTime; //this doesn't scale so that we can have the "actual" time
-            activeComp.PortionedRecipe = portionedRecipe;
-            //Scale tiems with cook times
-            component.CurrentCookTimeEnd = _gameTiming.CurTime + TimeSpan.FromSeconds(component.CurrentCookTimerTime * component.CookTimeMultiplier);
-            if (malfunctioning)
-                activeComp.MalfunctionTime = _gameTiming.CurTime + TimeSpan.FromSeconds(component.MalfunctionInterval);
-            UpdateUserInterfaceState(uid, component);
-        }
-
-        private void StopCooking(Entity<MicrowaveComponent> ent)
-        {
-            RemCompDeferred<ActiveMicrowaveComponent>(ent);
-            foreach (var solid in ent.Comp.Storage.ContainedEntities)
-            {
-                RemCompDeferred<ActivelyMicrowavedComponent>(solid);
-            }
-        }
-
-        public static (FoodRecipePrototype, int) CanSatisfyRecipe(MicrowaveComponent component, FoodRecipePrototype recipe, Dictionary<string, int> solids, Dictionary<string, FixedPoint2> reagents)
-        {
-            var portions = 0;
-
-            if (component.CurrentCookTimerTime % recipe.CookTime != 0)
-            {
-                //can't be a multiple of this recipe
-                return (recipe, 0);
-            }
-
-            foreach (var solid in recipe.IngredientsSolids)
-            {
-                if (!solids.ContainsKey(solid.Key))
-                    return (recipe, 0);
-
-                if (solids[solid.Key] < solid.Value)
-                    return (recipe, 0);
-
-                portions = portions == 0
-                    ? solids[solid.Key] / solid.Value.Int()
-                    : Math.Min(portions, solids[solid.Key] / solid.Value.Int());
-            }
-
-            foreach (var reagent in recipe.IngredientsReagents)
-            {
-                // TODO Turn recipe.IngredientsReagents into a ReagentQuantity[]
-                if (!reagents.ContainsKey(reagent.Key))
-                    return (recipe, 0);
-
-                if (reagents[reagent.Key] < reagent.Value)
-                    return (recipe, 0);
-
-                portions = portions == 0
-                    ? reagents[reagent.Key].Int() / reagent.Value.Int()
-                    : Math.Min(portions, reagents[reagent.Key].Int() / reagent.Value.Int());
-            }
-
-            //cook only as many of those portions as time allows
-            return (recipe, (int) Math.Min(portions, component.CurrentCookTimerTime / recipe.CookTime));
-        }
-
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            var query = EntityQueryEnumerator<ActiveMicrowaveComponent, MicrowaveComponent>();
-            while (query.MoveNext(out var uid, out var active, out var microwave))
-            {
-
-                active.CookTimeRemaining -= frameTime;
-
-                RollMalfunction((uid, active, microwave));
-
-                //check if there's still cook time left
-                if (active.CookTimeRemaining > 0)
-                {
-                    AddTemperature(microwave, frameTime);
-                    continue;
-                }
-
-                //this means the microwave has finished cooking.
-                AddTemperature(microwave, Math.Max(frameTime + active.CookTimeRemaining, 0)); //Though there's still a little bit more heat to pump out
-
-                if (active.PortionedRecipe.Item1 != null)
-                {
-                    var coords = Transform(uid).Coordinates;
-                    for (var i = 0; i < active.PortionedRecipe.Item2; i++)
-                    {
-                        SubtractContents(microwave, active.PortionedRecipe.Item1);
-                        Spawn(active.PortionedRecipe.Item1.Result, coords);
-                    }
-                }
-
-                _container.EmptyContainer(microwave.Storage);
-                microwave.CurrentCookTimeEnd = TimeSpan.Zero;
-                UpdateUserInterfaceState(uid, microwave);
-                _audio.PlayPvs(microwave.FoodDoneSound, uid);
-                StopCooking((uid, microwave));
-            }
-        }
-
-        /// <summary>
-        /// This event tries to get secret recipes that the microwave might be capable of.
-        /// Currently, we only check the microwave itself, but in the future, the user might be able to learn recipes.
-        /// </summary>
-        private void OnGetSecretRecipes(Entity<FoodRecipeProviderComponent> ent, ref GetSecretRecipesEvent args)
-        {
-            foreach (ProtoId<FoodRecipePrototype> recipeId in ent.Comp.ProvidedRecipes)
-            {
-                if (ProtoMan.Resolve(recipeId, out var recipeProto))
-                {
-                    args.Recipes.Add(recipeProto);
-                }
-            }
-        }
-
-        #region ui
-        private void OnEjectMessage(Entity<MicrowaveComponent> ent, ref MicrowaveEjectMessage args)
-        {
-            if (!HasContents(ent.Comp) || HasComp<ActiveMicrowaveComponent>(ent))
-                return;
-
-            _container.EmptyContainer(ent.Comp.Storage);
-            var audioParams = ent.Comp.ClickSound?.Params ?? AudioParams.Default;
-            audioParams = audioParams.AddVolume(-2);
-            _audio.PlayPvs(ent.Comp.ClickSound, ent, audioParams);
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnEjectIndex(Entity<MicrowaveComponent> ent, ref MicrowaveEjectSolidIndexedMessage args)
-        {
-            if (!HasContents(ent.Comp) || HasComp<ActiveMicrowaveComponent>(ent))
-                return;
-
-            _container.Remove(GetEntity(args.EntityID), ent.Comp.Storage);
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-
-        private void OnSelectTime(Entity<MicrowaveComponent> ent, ref MicrowaveSelectCookTimeMessage args)
-        {
-            if (!HasContents(ent.Comp) || HasComp<ActiveMicrowaveComponent>(ent) || !(TryComp<ApcPowerReceiverComponent>(ent, out var apc) && apc.Powered))
-                return;
-
-            // some validation to prevent trollage
-            if (args.NewCookTime % 5 != 0 || args.NewCookTime > ent.Comp.MaxCookTime)
-                return;
-
-            ent.Comp.CurrentCookTimeButtonIndex = args.ButtonIndex;
-            ent.Comp.CurrentCookTimerTime = args.NewCookTime;
-            ent.Comp.CurrentCookTimeEnd = TimeSpan.Zero;
-            var audioParams = ent.Comp.ClickSound?.Params ?? AudioParams.Default;
-            audioParams = audioParams.AddVolume(-2);
-            _audio.PlayPvs(ent.Comp.ClickSound, ent, audioParams);
-            UpdateUserInterfaceState(ent, ent.Comp);
-        }
-        #endregion
-    }
-}
diff --git a/Content.Server/Kitchen/EntitySystems/ServerMicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/ServerMicrowaveSystem.cs
new file mode 100644
index 0000000000..c306b45dcd
--- /dev/null
+++ b/Content.Server/Kitchen/EntitySystems/ServerMicrowaveSystem.cs
@@ -0,0 +1,115 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Construction;
+using Content.Server.Construction.Components;
+using Content.Server.Explosion.EntitySystems;
+using Content.Server.Lightning;
+using Content.Shared.Damage.Components;
+using Content.Shared.Database;
+using Content.Shared.Interaction.Events;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Kitchen.EntitySystems;
+using Content.Shared.Suicide;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+
+namespace Content.Server.Kitchen.EntitySystems;
+
+/// <inheritdoc />
+public sealed partial class ServerMicrowaveSystem : MicrowaveSystem
+{
+    [Dependency] private IAdminLogManager _adminLogger = default!;
+    [Dependency] private ExplosionSystem _explosion = default!;
+    [Dependency] private LightningSystem _lightning = default!;
+    [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private SharedSuicideSystem _suicide = default!;
+
+    [Dependency] private EntityQuery<DamageableComponent> _damageableQuery;
+    [Dependency] private EntityQuery<MachineComponent> _machineQuery;
+
+    /// <summary>
+    /// Kills the user by microwaving their head.
+    /// </summary>
+    /// <remarks>
+    /// TODO: Make this not awful, it keeps any items attached to your head still on and you can
+    /// revive someone and cogni them so you have some dumb headless fuck running around. I've seen it happen.
+    /// </remarks>
+    [SubscribeLocalEvent]
+    private void OnSuicideByEnvironment(Entity<MicrowaveComponent> ent, ref SuicideByEnvironmentEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // The act of getting your head microwaved doesn't actually kill you
+        if (!_damageableQuery.TryComp(args.Victim, out var damageableComponent))
+            return;
+
+        // The application of lethal damage is what kills you...
+        _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat");
+
+        var victim = args.Victim;
+        var othersMessage = Loc.GetString("microwave-component-suicide-others-message", ("victim", victim));
+        var selfMessage = Loc.GetString("microwave-component-suicide-message");
+
+        Popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true);
+        Popup.PopupEntity(selfMessage, victim, victim);
+
+        var audioParams = ent.Comp.ClickSound.Params;
+        Audio.PlayPvs(ent.Comp.ClickSound, ent.Owner, audioParams);
+
+        ent.Comp.CurrentCookTimerTime = 10;
+        DirtyField(ent.AsNullable(), nameof(ent.Comp.CurrentCookTimeButtonIndex));
+        StartCooking(ent, args.Victim);
+        UpdateUI(ent.AsNullable());
+        args.Handled = true;
+    }
+
+    /// <summary>
+    /// Prevents construction graph operations as a result of temperature changes.
+    /// </summary>
+    /// <remarks>
+    /// For example: raw meat will not turn into steak while it is actively being microwaved.
+    /// </remarks>
+    [SubscribeLocalEvent]
+    private void OnConstructionTemp(Entity<ActivelyMicrowavedComponent> ent, ref OnConstructionTemperatureEvent args)
+    {
+        args.Result = HandleResult.False;
+    }
+
+    /// <inheritdoc />
+    protected override void RollMalfunction(Entity<MicrowaveComponent> ent)
+    {
+        base.RollMalfunction(ent);
+
+        // this microwave sploded
+        if (ent.Comp.Broken)
+            return;
+
+        var comp = ent.Comp;
+        if (_random.Prob(comp.LightningChance))
+            _lightning.ShootRandomLightnings(ent, 1.0f, 2, comp.MalfunctionSpark, triggerLightningEvents: false);
+    }
+
+    /// <summary>
+    /// Explodes the microwave internally, turning it into a broken state, destroying its board, and spitting out its machine parts
+    /// </summary>
+    /// <param name="ent">The microwave entity.</param>
+    public override void Explode(Entity<MicrowaveComponent?> ent)
+    {
+        base.Explode(ent);
+
+        if (!Resolve(ent.Owner, ref ent.Comp))
+            return;
+
+        _explosion.TriggerExplosive(ent);
+
+        if (_machineQuery.TryComp(ent, out var machine))
+        {
+            Container.CleanContainer(machine.BoardContainer);
+            Container.EmptyContainer(machine.PartContainer);
+        }
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(ent)} exploded from unsafe cooking!");
+    }
+}
diff --git a/Content.Shared/Kitchen/Components/ActiveMicrowaveComponent.cs b/Content.Shared/Kitchen/Components/ActiveMicrowaveComponent.cs
new file mode 100644
index 0000000000..430b0cfec3
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/ActiveMicrowaveComponent.cs
@@ -0,0 +1,88 @@
+using Content.Shared.Kitchen.EntitySystems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Shared.Kitchen.Components;
+
+/// <summary>
+/// Attached to a microwave that is currently in the process of cooking
+/// </summary>
+[RegisterComponent]
+[Access(typeof(MicrowaveSystem))]
+[NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), AutoGenerateComponentPause]
+public sealed partial class ActiveMicrowaveComponent : Component
+{
+    /// <summary>
+    /// Whether or not this microwave cooking process is malfunctioning.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Malfunctioning;
+
+    /// <summary>
+    /// The recipe we are currently cooking.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public PortionedRecipe? PortionedRecipe;
+
+    /// <summary>
+    /// The total cooking time of this operation.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float TotalTime;
+
+    /// <summary>
+    /// The time that this microwave will finish cooking.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan CookTimeEnd = TimeSpan.Zero;
+
+    /// <summary>
+    /// The last time that this microwave updated its cooking cycle..
+    /// </summary>
+    /// <remarks>
+    /// This is used to calculate how much heat to add to the microwave.
+    /// </remarks>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan LastCookUpdated = TimeSpan.Zero;
+
+    /// <summary>
+    /// The next time this microwave will update its cooking cycle.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextCookUpdate = TimeSpan.Zero;
+
+    /// <summary>
+    /// The next time we attempt to roll a malfunction.
+    /// </summary>
+    /// <remarks>
+    /// Malfunctions are rolled on an interval and generate random effects, like lightning or microwave destruction.
+    /// </remarks>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    [AutoNetworkedField, AutoPausedField]
+    public TimeSpan NextMalfunction = TimeSpan.Zero;
+}
+
+/// <summary>
+/// Represents a specific quantity of a recipe to cook.
+/// </summary>
+[Serializable, NetSerializable]
+[DataDefinition]
+public partial struct PortionedRecipe(ProtoId<MicrowaveMealRecipePrototype> recipe, uint count)
+{
+    /// <summary>
+    /// The recipe to make.
+    /// </summary>
+    [DataField]
+    public ProtoId<MicrowaveMealRecipePrototype> Recipe = recipe;
+
+    /// <summary>
+    /// The number of portions to make of this recipe.
+    /// </summary>
+    [DataField]
+    public uint Count = count;
+}
diff --git a/Content.Server/Kitchen/Components/ActivelyMicrowavedComponent.cs b/Content.Shared/Kitchen/Components/ActivelyMicrowavedComponent.cs
similarity index 66%
rename from Content.Server/Kitchen/Components/ActivelyMicrowavedComponent.cs
rename to Content.Shared/Kitchen/Components/ActivelyMicrowavedComponent.cs
index c7fca5a47e..7da66ba453 100644
--- a/Content.Server/Kitchen/Components/ActivelyMicrowavedComponent.cs
+++ b/Content.Shared/Kitchen/Components/ActivelyMicrowavedComponent.cs
@@ -1,14 +1,17 @@
-namespace Content.Server.Kitchen.Components;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Kitchen.Components;
 
 /// <summary>
 /// Attached to an object that's actively being microwaved
 /// </summary>
 [RegisterComponent]
+[NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ActivelyMicrowavedComponent : Component
 {
     /// <summary>
     /// The microwave this entity is actively being microwaved by.
     /// </summary>
-    [DataField]
+    [DataField, AutoNetworkedField]
     public EntityUid? Microwave;
 }
diff --git a/Content.Shared/Kitchen/Components/MicrowaveComponent.cs b/Content.Shared/Kitchen/Components/MicrowaveComponent.cs
new file mode 100644
index 0000000000..b01350e587
--- /dev/null
+++ b/Content.Shared/Kitchen/Components/MicrowaveComponent.cs
@@ -0,0 +1,231 @@
+using Content.Shared.DeviceLinking;
+using Content.Shared.Item;
+using Content.Shared.Kitchen.EntitySystems;
+using Content.Shared.Temperature.Components;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Kitchen.Components;
+
+/// <summary>
+/// A component applied to microwaves, which are used to heat entities/solutions
+/// and produce microwave recipes.
+/// </summary>
+[RegisterComponent]
+[Access(typeof(MicrowaveSystem))]
+[NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true, raiseAfterAutoHandleState: true)]
+public sealed partial class MicrowaveComponent : Component
+{
+    /// <summary>
+    /// A multiplier applied to all microwave cooking timers.
+    /// </summary>
+    /// <remarks>
+    /// If you set a microwave for 30 seconds, but have a CookTimeMultiplier of 0.5,
+    /// recipes will be processed as if you're portioning for 30 seconds, but the
+    /// microwave's timer will take 15 seconds instead. So, if you have a recipe with
+    /// a cookTime of 10 seconds, you can still make that recipe 3 at a time.
+    ///
+    /// Note that faster cooking times make the microwave less useful for actual heating
+    /// (temperature) as thermal energy added to the contents is based on elapsed time.
+    /// </remarks>
+    [DataField]
+    public float CookTimeMultiplier = 1;
+
+    /// <summary>
+    /// A multiplier for heat added to the contents of a microwave every cook cycle.
+    /// </summary>
+    /// <remarks>
+    /// The formula is (elapsed time between dt * <see cref="DeltaHeat"/>).
+    /// </remarks>
+    [DataField]
+    public float DeltaHeat = 100;
+
+    /// <summary>
+    /// A multiplier for added heat on entities with a <see cref="TemperatureComponent"/>.
+    /// </summary>
+    [DataField]
+    public float ObjectHeatMultiplier = 100;
+
+    /// <summary>
+    /// An entity that is produced when an item is melted in the microwave.
+    /// </summary>
+    /// <remarks>
+    /// The microwave will burn items that pass the <see cref="BurnWhenCookedWhitelist" />.
+    /// </remarks>
+    [DataField]
+    public EntProtoId FailureResult = "FoodBadRecipe";
+
+    #region Audio
+
+    /// <summary>
+    /// A sound that is played when the microwave is activated.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier BeginCookingSound = new SoundPathSpecifier("/Audio/Machines/microwave_start_beep.ogg");
+
+    /// <summary>
+    /// A sound that is played when the microwave finishes.
+    /// </summary>
+    /// <remarks>
+    /// Beep... beep... beep
+    /// </remarks>
+    [DataField]
+    public SoundSpecifier FoodDoneSound = new SoundPathSpecifier("/Audio/Machines/microwave_done_beep.ogg");
+
+    /// <summary>
+    /// A sound that is played when a player navigates the microwave's UI - for example, selecting
+    /// a new cooking time.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier ClickSound = new SoundPathSpecifier("/Audio/Machines/machine_switch.ogg")
+    {
+        Params = AudioParams.Default.AddVolume(-2),
+    };
+
+    /// <summary>
+    /// The humming sound played when a microwave is actively cooking.
+    /// </summary>
+    [DataField]
+    public SoundSpecifier LoopingSound = new SoundPathSpecifier("/Audio/Machines/microwave_loop.ogg");
+
+    #endregion Audio
+
+    /// <summary>
+    /// An audio stream for the microwave's "cooking" hum.
+    /// </summary>
+    [DataField]
+    public EntityUid? PlayingStream;
+
+    /// <summary>
+    /// Whether or not this microwave is broken.
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public bool Broken;
+
+    /// <summary>
+    /// A port used to activate the microwave via remote signal.
+    /// </summary>
+    [DataField]
+    public ProtoId<SinkPortPrototype> OnPort = "On";
+
+    /// <summary>
+    /// The currently-selected cook time, in seconds. This must be a multiple of 5 (or 0).
+    /// </summary>
+    /// <remarks>
+    /// The cook times for all recipes should be divisible by 5, with a minimum of 1 second.
+    /// For right now, I don't think any recipe cook time should be greater than 60 seconds.
+    /// </remarks>
+    [DataField]
+    [AutoNetworkedField]
+    [Access(typeof(MicrowaveSystem), Other = AccessPermissions.ReadExecute)]
+    public uint CurrentCookTimerTime;
+
+    /// <summary>
+    /// The index of the currently-selected "cook time" button.
+    /// </summary>
+    [DataField]
+    [AutoNetworkedField]
+    public int CurrentCookTimeButtonIndex;
+
+    /// <summary>
+    /// The maximum number of seconds a microwave can be set to.
+    /// This is currently only used for validation and the client does not check this.
+    /// </summary>
+    [DataField]
+    public uint MaxCookTime = 30;
+
+    /// <summary>
+    /// The max temperature that this microwave can heat objects to.
+    /// </summary>
+    [DataField]
+    public float TemperatureUpperThreshold = 373.15f;
+
+    /// <summary>
+    /// The microwave's contents container.
+    /// </summary>
+    public Container Storage = default!;
+
+    /// <summary>
+    /// The ID of the storage container for the microwave.
+    /// </summary>
+    [DataField]
+    public string ContainerId = "microwave_entity_container";
+
+    /// <summary>
+    /// How many items the microwave can hold.
+    /// </summary>
+    [DataField]
+    public int Capacity = 10;
+
+    /// <summary>
+    /// The largest item size that can fit in the microwave.
+    /// </summary>
+    [DataField]
+    public ProtoId<ItemSizePrototype> MaxItemSize = "Normal";
+
+    /// <summary>
+    /// How frequently the microwave can malfunction while active.
+    /// </summary>
+    [DataField]
+    public TimeSpan MalfunctionInterval = TimeSpan.FromSeconds(1.0f);
+
+    /// <summary>
+    /// How frequently the microwave can update (process cooking cycle) while active.
+    /// </summary>
+    [DataField]
+    public TimeSpan UpdateInterval = TimeSpan.FromSeconds(1.0f);
+
+    /// <summary>
+    /// Chance of an explosion occurring when we microwave a metallic object.
+    /// </summary>
+    /// <remarks>
+    /// This is rolled every <see cref="MalfunctionInterval"/>.
+    /// </remarks>
+    [DataField]
+    public float ExplosionChance = 0.1f;
+
+    /// <summary>
+    /// Chance of lightning occurring when we microwave a metallic object.
+    /// </summary>
+    /// <remarks>
+    /// This is rolled every <see cref="MalfunctionInterval"/>.
+    /// </remarks>
+    [DataField]
+    public float LightningChance = 0.75f;
+
+    /// <summary>
+    /// If this microwave can give ID cards new accesses without exploding.
+    /// </summary>
+    [DataField]
+    public bool CanMicrowaveIdsSafely = true;
+
+    /// <summary>
+    /// Entities that fulfill this whitelist will cause the microwave to malfunction
+    /// on activation. By default, this is metal objects.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? MalfunctionWhenCookedWhitelist = new()
+    {
+        Tags = new() { "Metal" }
+    };
+
+    /// <summary>
+    /// Entities that fulfill this whitelist will create a burned mess when microwaved.
+    /// By default, this is plastic objects.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? BurnWhenCookedWhitelist = new()
+    {
+        Tags = new() { "Plastic" }
+    };
+
+    /// <summary>
+    /// A "spark" entity spawned when this microwave malfunctions.
+    /// </summary>
+    [DataField]
+    public EntProtoId MalfunctionSpark = "Spark";
+}
diff --git a/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs b/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
index d677e42674..fe44f66dd0 100644
--- a/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
+++ b/Content.Shared/Kitchen/Components/RecipeProviderComponent.cs
@@ -2,6 +2,10 @@ using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Kitchen.Components;
 
+/// <summary>
+/// Applied to entities that have access to secret microwave recipes.
+/// See: <see cref="MicrowaveMealRecipePrototype.SecretRecipe"/>
+/// </summary>
 [RegisterComponent]
 public sealed partial class FoodRecipeProviderComponent : Component
 {
@@ -9,5 +13,5 @@ public sealed partial class FoodRecipeProviderComponent : Component
     /// These are additional recipes that the entity is capable of cooking.
     /// </summary>
     [DataField, ViewVariables]
-    public List<ProtoId<FoodRecipePrototype>> ProvidedRecipes = new();
+    public List<ProtoId<MicrowaveMealRecipePrototype>> ProvidedRecipes = new();
 }
diff --git a/Content.Shared/Kitchen/Components/SharedMicrowave.cs b/Content.Shared/Kitchen/Components/SharedMicrowave.cs
deleted file mode 100644
index fa12368984..0000000000
--- a/Content.Shared/Kitchen/Components/SharedMicrowave.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Kitchen.Components
-{
-    [Serializable, NetSerializable]
-    public sealed class MicrowaveStartCookMessage : BoundUserInterfaceMessage
-    {
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class MicrowaveEjectMessage : BoundUserInterfaceMessage
-    {
-
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class MicrowaveEjectSolidIndexedMessage : BoundUserInterfaceMessage
-    {
-        public NetEntity EntityID;
-        public MicrowaveEjectSolidIndexedMessage(NetEntity entityId)
-        {
-            EntityID = entityId;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class MicrowaveVaporizeReagentIndexedMessage : BoundUserInterfaceMessage
-    {
-        public ReagentQuantity ReagentQuantity;
-        public MicrowaveVaporizeReagentIndexedMessage(ReagentQuantity reagentQuantity)
-        {
-            ReagentQuantity = reagentQuantity;
-        }
-    }
-
-    [Serializable, NetSerializable]
-    public sealed class MicrowaveSelectCookTimeMessage : BoundUserInterfaceMessage
-    {
-        public int ButtonIndex;
-        public uint NewCookTime;
-        public MicrowaveSelectCookTimeMessage(int buttonIndex, uint inputTime)
-        {
-            ButtonIndex = buttonIndex;
-            NewCookTime = inputTime;
-        }
-    }
-
-    [NetSerializable, Serializable]
-    public sealed class MicrowaveUpdateUserInterfaceState : BoundUserInterfaceState
-    {
-        public NetEntity[] ContainedSolids;
-        public bool IsMicrowaveBusy;
-        public int ActiveButtonIndex;
-        public uint CurrentCookTime;
-
-        public TimeSpan CurrentCookTimeEnd;
-
-        public MicrowaveUpdateUserInterfaceState(NetEntity[] containedSolids,
-            bool isMicrowaveBusy, int activeButtonIndex, uint currentCookTime, TimeSpan currentCookTimeEnd)
-        {
-            ContainedSolids = containedSolids;
-            IsMicrowaveBusy = isMicrowaveBusy;
-            ActiveButtonIndex = activeButtonIndex;
-            CurrentCookTime = currentCookTime;
-            CurrentCookTimeEnd = currentCookTimeEnd;
-        }
-
-    }
-
-    [Serializable, NetSerializable]
-    public enum MicrowaveVisualState
-    {
-        Idle,
-        Cooking,
-        Broken,
-        Bloody
-    }
-
-    [NetSerializable, Serializable]
-    public enum MicrowaveUiKey
-    {
-        Key
-    }
-
-}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.API.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.API.cs
new file mode 100644
index 0000000000..c9f46df809
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.API.cs
@@ -0,0 +1,154 @@
+using System.Linq;
+using Content.Shared.Kitchen.Components;
+using JetBrains.Annotations;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// Helper function to get if an entity is an active microwave.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <returns>Whether or not this entity is an active microwave.</returns>
+    [PublicAPI]
+    public bool IsActiveMicrowave(Entity<MicrowaveComponent?> microwave)
+    {
+        return MicrowaveQuery.Resolve(microwave.Owner, ref microwave.Comp)
+            && ActiveMicrowaveQuery.HasComp(microwave.Owner);
+    }
+
+    /// <summary>
+    /// Helper function to get the contents of a microwave.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <returns>A list of microwave contents.</returns>
+    [PublicAPI]
+    public IReadOnlyList<EntityUid> GetMicrowaveContents(Entity<MicrowaveComponent?> microwave)
+    {
+        if (!MicrowaveQuery.Resolve(microwave.Owner, ref microwave.Comp))
+            return new List<EntityUid>();
+
+        return microwave.Comp.Storage.ContainedEntities;
+    }
+
+    /// <summary>
+    /// Helper function to check if a microwave has ingredient contents.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <returns>Whether or not this microwave contains anything.</returns>
+    [PublicAPI]
+    public bool HasContents(Entity<MicrowaveComponent?> microwave)
+    {
+        return GetMicrowaveContents(microwave).Any();
+    }
+
+    /// <summary>
+    /// Gets a complete ordered list of usable recipes for this appliance.
+    /// </summary>
+    /// <remarks>
+    /// Note that the order of recipes is meaningful. When a valid recipe is chosen, the first item
+    /// in the list that satisfies the conditions of the recipe is selected.
+    ///
+    /// Recipe prototypes in the recipe manager are pre-sorted based on complexity, so more "specific"
+    /// recipes will be selected first. Secret recipes come before all non-secret prototype recipes.
+    /// Do not sort the result of this function!
+    /// </remarks>
+    /// <param name="uid">The appliance to get recipes for.</param>
+    /// <returns>A complete list of usable recipe prototypes.</returns>
+    [PublicAPI]
+    public IReadOnlyList<MicrowaveMealRecipePrototype> GetAvailableRecipes(EntityUid uid)
+    {
+        var getRecipesEv = new GetSecretRecipesEvent();
+        RaiseLocalEvent(uid, ref getRecipesEv);
+
+        var recipes = getRecipesEv.Recipes
+            .OrderByDescending(recipe => recipe.Priority)
+            .ThenByDescending(recipe => recipe.Ingredients.Count())
+            .ToList();
+        recipes.AddRange(_recipes.Recipes);
+
+        return recipes;
+    }
+
+    /// <summary>
+    /// Given a recipe, a list of available ingredients, and a cooking time, this functions
+    /// gets how many times we can make this given recipe.
+    /// </summary>
+    /// <param name="recipe">A cooking recipe.</param>
+    /// <param name="ingredients">The ingredients we have available.</param>
+    /// <param name="cookTime">How long we are cooking for.</param>
+    /// <returns>How many portions of the recipe can be made.</returns>
+    [PublicAPI]
+    public static uint GetRecipePortions(MicrowaveMealRecipePrototype recipe,
+        CookingIngredients ingredients,
+        uint cookTime)
+    {
+        // Our cooking time must be a multiple of the recipe's cooking time.
+        // For example: If a recipe takes 10 seconds to cook, then you can't make it with a 15 second timer.
+        // However, if you use a 30 second timer, you could make three of that recipe on one timer.
+        if (cookTime % recipe.Time != 0)
+            return 0;
+
+        // TODO: there's actually a kind of nasty edge case microwave economics issue here,
+        // all reagents / stacks / solids will be included, but when the recipe is actually made,
+        // solids are used first, then stacks, then reagents.
+        // thus, recipe detection might thing you have "more" ingredients than you actually do.
+        //
+        // moral of the story: I hate microwaves
+        var portionCount = cookTime / recipe.Time;
+        var ingredientPortions = ingredients.PortionForRecipe(recipe.Ingredients);
+        portionCount = Math.Min(portionCount, ingredientPortions);
+
+        return portionCount;
+    }
+
+    /// <summary>
+    /// Given an appliance entity and a list of available ingredients, this function gets the first valid
+    /// usable recipe for cooking.
+    /// </summary>
+    /// <remarks>
+    /// The appliance entity itself is used to get secret recipes.
+    /// </remarks>
+    /// <param name="uid">An appliance to fetch a recipe for.</param>
+    /// <param name="ingredients">A list of available ingredients.</param>
+    /// <param name="cookTime">How long we plan to cook for.</param>
+    /// <returns>
+    /// The first valid recipe we can use. If there is none, this is (null, 0).
+    /// </returns>
+    [PublicAPI]
+    public PortionedRecipe? GetRecipe(EntityUid uid,
+        CookingIngredients ingredients,
+        uint cookTime)
+    {
+        var recipes = GetAvailableRecipes(uid);
+        var recipePortions = recipes.Select(recipe =>
+            {
+                var portions = GetRecipePortions(recipe, ingredients, cookTime);
+                return new PortionedRecipe(recipe.ID, portions);
+            });
+
+        return recipePortions.FirstOrNull(r => r.Count > 0)
+            ?? null;
+    }
+
+    /// <summary>
+    /// Gets a complete list of recipe-usable ingredients from a list of items, including solids,
+    /// stacks, and reagents.
+    /// </summary>
+    /// <param name="items">The list of items to use as ingredients.</param>
+    /// <returns>Cooking ingredient quantities representing the total usable ingredient list.</returns>
+    [PublicAPI]
+    public CookingIngredients GetTotalIngredients(List<EntityUid> items)
+    {
+        var ingredients = new CookingIngredients();
+
+        foreach (var item in items)
+        {
+            AddItemIngredients(item, ref ingredients);
+        }
+
+        return ingredients;
+    }
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Active.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Active.cs
new file mode 100644
index 0000000000..a730713911
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Active.cs
@@ -0,0 +1,123 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Kitchen.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// Adjusts a microwave's visuals, audio, and power draw when activated.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnCookStart(Entity<ActiveMicrowaveComponent> ent, ref ComponentStartup args)
+    {
+        if (!MicrowaveQuery.TryComp(ent, out var microwaveComponent))
+            return;
+
+        ent.Comp.NextCookUpdate = Timing.CurTime + microwaveComponent.UpdateInterval;
+        ent.Comp.LastCookUpdated = Timing.CurTime;
+        DirtyFields(ent.AsNullable(), null, nameof(ent.Comp.NextCookUpdate), nameof(ent.Comp.LastCookUpdated));
+        ActivateMicrowaveCycle((ent, microwaveComponent));
+    }
+
+    /// <summary>
+    /// Adjusts a microwave's visuals, audio, and power draw when activated.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnCookEnd(Entity<ActiveMicrowaveComponent> ent, ref ComponentShutdown args)
+    {
+        if (!MicrowaveQuery.TryComp(ent, out var microwaveComponent))
+            return;
+
+        DeactivateMicrowaveCycle((ent, microwaveComponent));
+    }
+
+    /// <summary>
+    /// Adds ActivelyMicrowavedComponent to entities inserted into an active microwave.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnActiveMicrowaveInsert(Entity<ActiveMicrowaveComponent> ent, ref EntInsertedIntoContainerMessage args)
+    {
+        if (Timing.ApplyingState)
+            return;
+
+        BeginActivelyMicrowaving(args.Entity, ent.Owner);
+    }
+
+    /// <summary>
+    /// Removes ActivelyMicrowavedComponent from entities removed from an active microwave.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnActiveMicrowaveRemove(Entity<ActiveMicrowaveComponent> ent, ref EntRemovedFromContainerMessage args)
+    {
+        if (Timing.ApplyingState)
+            return;
+
+        RemCompDeferred<ActivelyMicrowavedComponent>(args.Entity);
+    }
+
+    /// <summary>
+    /// Prevents reagent reactions in entitites that are actively being microwaved.
+    /// </summary>
+    /// <remarks>
+    /// For example, raw egg would otherwise turn into cooked egg during the process, preventing it from being
+    /// "spent" when the microwave is finished cooking.
+    /// </remarks>
+    [SubscribeLocalEvent]
+    private void OnReactionAttempt(Entity<ActivelyMicrowavedComponent> ent, ref SolutionRelayEvent<ReactionAttemptEvent> args)
+    {
+        if (!ActiveMicrowaveQuery.TryComp(ent.Comp.Microwave, out var activeMicrowaveComp))
+            return;
+
+        var portionedRecipe = activeMicrowaveComp.PortionedRecipe;
+        if (portionedRecipe == null // no recipe selected
+            || !ProtoMan.TryIndex(portionedRecipe.Value.Recipe, out var recipe))
+            return;
+
+        var recipeReagents = recipe.Ingredients.Reagents.Keys;
+
+        foreach (var reagent in recipeReagents)
+        {
+            if (args.Event.Reaction.Reactants.ContainsKey(reagent))
+            {
+                args.Event.Cancelled = true;
+                return;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Adjusts a microwave's visuals, audio, and power draw when activated.
+    /// </summary>
+    protected virtual void ActivateMicrowaveCycle(Entity<MicrowaveComponent> ent)
+    {
+        SetAppearance(ent, MicrowaveVisualState.Cooking);
+        _powerState.SetWorkingState(ent.Owner, true);
+    }
+
+    /// <summary>
+    /// Adjusts a microwave's visuals, audio, and power draw when deactivated.
+    /// </summary>
+    protected virtual void DeactivateMicrowaveCycle(Entity<MicrowaveComponent> ent)
+    {
+        SetAppearance(ent, MicrowaveVisualState.Idle);
+        _powerState.SetWorkingState(ent.Owner, false);
+        foreach (var uid in GetMicrowaveContents(ent.AsNullable()))
+        {
+            RemCompDeferred<ActivelyMicrowavedComponent>(uid);
+        }
+    }
+
+    /// <summary>
+    /// Add ActivelyMicrowavedComponent to items that are being actively microwaved.
+    /// </summary>
+    /// <param name="uid">The entity being microwaved.</param>
+    /// <param name="microwave">That dastardly microwave</param>
+    private void BeginActivelyMicrowaving(EntityUid uid, EntityUid microwave)
+    {
+        var comp = new ActivelyMicrowavedComponent { Microwave = microwave };
+        AddComp(uid, comp);
+    }
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Container.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Container.cs
new file mode 100644
index 0000000000..fb30c41282
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Container.cs
@@ -0,0 +1,136 @@
+using Content.Shared.Construction.EntitySystems;
+using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.Kitchen.Components;
+using Robust.Shared.Containers;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// Initializes the microwave's storage container.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnComponentInit(Entity<MicrowaveComponent> ent, ref ComponentInit args)
+    {
+        // this really does have to be in ComponentInit
+        ent.Comp.Storage = Container.EnsureContainer<Container>(ent, ent.Comp.ContainerId);
+    }
+
+    /// <summary>
+    /// Prevents inserting entities into the microwave if the microwave is broken, active,
+    /// or the item is invalid.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnInsertAttempt(Entity<MicrowaveComponent> ent, ref ContainerIsInsertingAttemptEvent args)
+    {
+        if (Timing.ApplyingState)
+            return;
+
+        if (args.Container.ID != ent.Comp.ContainerId)
+            return;
+
+        if (ent.Comp.Broken
+            || IsActiveMicrowave(ent.AsNullable())
+            || !CanFitInMicrowave(ent.AsNullable(), args.EntityUid))
+        {
+            args.Cancel();
+        }
+    }
+
+    /// <summary>
+    /// Attempt to insert an entity into the microwave, resulting in a pop-up message if this is not possible.
+    /// </summary>
+    [SubscribeLocalEvent(after:[typeof(AnchorableSystem)])]
+    private void OnInteractUsing(Entity<MicrowaveComponent> ent, ref InteractUsingEvent args)
+    {
+        if (args.Handled)
+            return;
+
+        // Power is turned off
+        if (!_power.IsPowered(ent.Owner))
+        {
+            var message = Loc.GetString("microwave-component-interact-using-no-power");
+            Popup.PopupEntity(message, ent, args.User);
+            return;
+        }
+
+        // Microwave is broken
+        if (ent.Comp.Broken)
+        {
+            var message = Loc.GetString("microwave-component-interact-using-broken");
+            Popup.PopupEntity(message, ent, args.User);
+            return;
+        }
+
+        // Only items can be inserted into the microwave
+        if (!ItemQuery.TryComp(args.Used, out var item))
+        {
+            var message = Loc.GetString("microwave-component-interact-using-transfer-fail");
+            Popup.PopupEntity(message, ent, args.User);
+            return;
+        }
+
+        // Item is too big for the microwave
+        if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize))
+        {
+            var message = Loc.GetString("microwave-component-interact-item-too-big", ("item", args.Used));
+            Popup.PopupEntity(message, ent, args.User);
+            return;
+        }
+
+        // The microwave is full
+        if (ent.Comp.Storage.Count >= ent.Comp.Capacity)
+        {
+            var message = Loc.GetString("microwave-component-interact-full");
+            Popup.PopupEntity(message, ent, args.User);
+            return;
+        }
+
+        _hands.TryDropIntoContainer(args.User, args.Used, ent.Comp.Storage);
+        args.Handled = true;
+    }
+    [SubscribeLocalEvent]
+    private void OnContentsAdded(Entity<MicrowaveComponent> entity, ref EntInsertedIntoContainerMessage args)
+        => OnContentsUpdated(entity, ref args);
+
+    [SubscribeLocalEvent]
+    private void OnContentsRemoved(Entity<MicrowaveComponent> entity, ref EntRemovedFromContainerMessage args)
+        => OnContentsUpdated(entity, ref args);
+
+    /// <summary>
+    /// Updates the microwave UI when entities are added/removed from the microwave.
+    /// </summary>
+    // For some reason ContainerModifiedMessage just can't be used at all with Entity<T>.
+    private void OnContentsUpdated<T>(Entity<MicrowaveComponent> entity, ref T args) where T : ContainerModifiedMessage
+    {
+        if (entity.Comp.Storage != args.Container)
+            return;
+
+        UpdateUI(entity.AsNullable());
+    }
+
+    /// <summary>
+    /// Check whether or not this microwave has space for the item, in both capacity and item size.
+    /// </summary>
+    /// <param name="ent">The microwave entity.</param>
+    /// <param name="item">The item to attempt to insert.</param>
+    /// <returns>Whether or not the item fits in the microwave. False if the item is too big or the microwave is full.</returns>
+    private bool CanFitInMicrowave(Entity<MicrowaveComponent?> ent, Entity<ItemComponent?> item)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp) || !Resolve(item.Owner, ref item.Comp))
+            return false;
+
+        var microwave = ent.Comp;
+        if (microwave.Storage.Count >= microwave.Capacity)
+            return false;
+
+        var maxSize = _item.GetSizePrototype(microwave.MaxItemSize);
+        var itemSize = _item.GetSizePrototype(item.Comp.Size);
+        if (itemSize > maxSize)
+            return false;
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Cooking.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Cooking.cs
new file mode 100644
index 0000000000..34a74547a1
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Cooking.cs
@@ -0,0 +1,285 @@
+using System.Linq;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Random.Helpers;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// Adds temperature to every item in the microwave based on the time it took to microwave.
+    /// </summary>
+    /// <param name="ent">The microwave entity.</param>
+    /// <param name="time">The heating time that has elapsed, in seconds.</param>
+    private void AddTemperature(Entity<MicrowaveComponent> ent, float time)
+    {
+        var component = ent.Comp;
+        var heatToAdd = time * component.DeltaHeat;
+        var objHeatToAdd = heatToAdd * component.ObjectHeatMultiplier;
+
+        // TODO: Divide heat amongst contents?
+        foreach (var entity in GetMicrowaveContents(ent.AsNullable()))
+        {
+            _temperature.ChangeHeat(entity, objHeatToAdd);
+
+            foreach (var (_, soln) in Solution.EnumerateSolutions(entity))
+            {
+                var solution = soln.Comp.Solution;
+                if (solution.Temperature > component.TemperatureUpperThreshold)
+                    continue;
+
+                Solution.AddThermalEnergy(soln, heatToAdd);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Attempts to roll random "malfunction" events on a malfunctioning microwave.
+    /// </summary>
+    protected virtual void RollMalfunction(Entity<MicrowaveComponent> ent)
+    {
+        if (SharedRandomExtensions.PredictedProb(Timing, ent.Comp.ExplosionChance, GetNetEntity(ent)))
+            Explode(ent.AsNullable());
+    }
+
+    public virtual void Explode(Entity<MicrowaveComponent?> ent)
+    {
+        if (!MicrowaveQuery.Resolve(ent.Owner, ref ent.Comp))
+            return;
+
+        ent.Comp.Broken = true;
+        DirtyField(ent.AsNullable(), nameof(ent.Comp.Broken));
+    }
+
+    /// <summary>
+    /// Start up the microwave. This processes each item in the microwave to experience microwave "on-cooking"
+    /// effects, attempts to retrieve a microwave recipe with its valid ingredients, and activates the
+    /// microwave visually.
+    /// </summary>
+    public void StartCooking(Entity<MicrowaveComponent> microwave, EntityUid? user)
+    {
+        if (!HasContents(microwave.AsNullable())
+            || IsActiveMicrowave(microwave.AsNullable())
+            || !_power.IsPowered(microwave.Owner))
+            return;
+
+        var contents = GetMicrowaveContents(microwave.AsNullable());
+        var malfunctioning = false;
+        var shouldContinue = TryStartMicrowavingContents(microwave,
+            contents,
+            user,
+            ref malfunctioning,
+            out var ingredientContents);
+
+        if (!shouldContinue)
+            return;
+
+        var ingredients = GetTotalIngredients(ingredientContents);
+        var cookTime = microwave.Comp.CurrentCookTimerTime;
+        var recipe = GetRecipe(microwave, ingredients, cookTime);
+
+        ActivateMicrowave(microwave, recipe, malfunctioning, user);
+    }
+
+    /// <summary>
+    /// Starts up the microwave cooking operation, setting the starting time and recipe of the microwave.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <param name="recipe">The recipe and portion count associated with this operaton.</param>
+    /// <param name="malfunctioning">Whether or not this microwave is malfunctioning.</param>
+    /// <param name="user">The entity that is activating the microwave.</param>
+    private void ActivateMicrowave(Entity<MicrowaveComponent> microwave,
+        PortionedRecipe? recipe,
+        bool malfunctioning,
+        EntityUid? user)
+    {
+        var uid = microwave.Owner;
+        var component = microwave.Comp;
+        var curTime = Timing.CurTime;
+        var cookTime = component.CurrentCookTimerTime * component.CookTimeMultiplier;
+
+        Audio.PlayPredicted(component.BeginCookingSound, uid, user);
+
+        var activeComp = new ActiveMicrowaveComponent
+        {
+            PortionedRecipe = recipe,
+            TotalTime = component.CurrentCookTimerTime,
+            CookTimeEnd = curTime + TimeSpan.FromSeconds(cookTime),
+            Malfunctioning = malfunctioning,
+            NextMalfunction = malfunctioning
+                ? curTime + component.MalfunctionInterval
+                : TimeSpan.Zero,
+        };
+
+        AddComp(uid, activeComp);
+        UpdateUI(microwave.AsNullable());
+    }
+
+    /// <summary>
+    /// Iterates over the contents of a microwave and performs some on-microwaved effects.
+    /// Plastic items will melt and turn into burned messes.
+    /// Metal items will cause the microwave to malfunction.
+    /// </summary>
+    /// <remarks>
+    /// This also raises a BeingMicrowavedEvent on each item in the microwave. The result of
+    /// this event may cause us to exit early and proceed with cooking - for example, an
+    /// entity that causes the microwave to explode when microwaved.
+    ///
+    /// If cooking is not cancelled, the items inside will gain `ActiveMicrowaveComponent.`.
+    /// </remarks>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <param name="contents">The contents of the microwave.</param>
+    /// <param name="user">The entity that is activating the microwave.</param>
+    /// <param name="malfunctioning">Whether or not the microwave is malfunctioning.</param>
+    /// <param name="ingredientContents">A list of entities usable as ingredients.</param>
+    /// <returns>Wheteher or not we can proceed to use the microwave.</returns>
+    private bool TryStartMicrowavingContents(Entity<MicrowaveComponent> microwave,
+        IReadOnlyList<EntityUid> contents,
+        EntityUid? user,
+        ref bool malfunctioning,
+        out List<EntityUid> ingredientContents)
+    {
+        ingredientContents = contents.ToList();
+        foreach (var item in contents)
+        {
+            MicrowaveItem(microwave,
+                item,
+                user,
+                ref malfunctioning,
+                out var shouldExit,
+                out var shouldRemoveFromIngredients);
+
+            if (shouldExit)
+                return false;
+
+            if (shouldRemoveFromIngredients)
+                ingredientContents.Remove(item);
+        }
+
+        foreach (var item in ingredientContents)
+        {
+            BeginActivelyMicrowaving(item, microwave.Owner);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Processes a single entity in the microwave. This modifies / results in three
+    /// different parameters related to the operation: if the microwave should malfunction,
+    /// if the microwave should stop, and if the entity is still usable as an ingredient.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <param name="item">The entity being microwaved.</param>
+    /// <param name="user">The entity activating the microwave.</param>
+    /// <param name="malfunctioning">Whether or not this microwave is malfunctioning.</param>
+    /// <param name="shouldStopMicrowave">Whether or not this microwave should stop.</param>
+    /// <param name="shouldRemoveFromIngredients">Whether or not this entity remains a valid ingredient.</param>
+    private void MicrowaveItem(Entity<MicrowaveComponent> microwave,
+        EntityUid item,
+        EntityUid? user,
+        ref bool malfunctioning,
+        out bool shouldStopMicrowave,
+        out bool shouldRemoveFromIngredients)
+    {
+        shouldStopMicrowave = false;
+        shouldRemoveFromIngredients = false;
+
+        // Special item-in-microwave interactions. Certain "being microwaved' interactions
+        // may cancel out any actual cooking, so this may early exit.
+        var beingMicrowaved = new BeingMicrowavedEvent(microwave.Owner, user);
+        RaiseLocalEvent(item, beingMicrowaved);
+
+        if (beingMicrowaved.Handled)
+        {
+            UpdateUI(microwave.AsNullable());
+            shouldStopMicrowave = true;
+            return;
+        }
+
+        if (_whitelist.IsWhitelistPass(microwave.Comp.MalfunctionWhenCookedWhitelist, item))
+            malfunctioning = true;
+
+        if (_whitelist.IsWhitelistPass(microwave.Comp.BurnWhenCookedWhitelist, item))
+        {
+            shouldRemoveFromIngredients = true;
+            CreateBurnedMess(microwave, item);
+        }
+    }
+
+    /// <summary>
+    /// Turns a single entity in the microwave into a failed "burned mess" recipe.
+    /// </summary>
+    /// <remarks>
+    /// This happens to entities that pass <see cref="MicrowaveComponent.BurnWhenCookedWhitelist"/>
+    /// when microwaved.
+    /// </remarks>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <param name="item">The entity to burn.</param>
+    private void CreateBurnedMess(Entity<MicrowaveComponent> microwave, EntityUid item)
+    {
+        var entProto = microwave.Comp.FailureResult;
+        var coords = Transform(microwave).Coordinates;
+        var junk = PredictedSpawnAtPosition(entProto, coords);
+        Container.Insert(junk, microwave.Comp.Storage);
+
+        PredictedDel(item);
+    }
+
+    /// <summary>
+    /// Completes a recipe in a microwave, removing its relevant ingredient contents
+    /// from the microwave and producing finished dish entities in their place.
+    /// </summary>
+    /// <param name="microwave">The microwave entity.</param>
+    /// <param name="portionedRecipe">The recipe we are using.</param>
+    private void SpawnFinishedRecipe(Entity<MicrowaveComponent> microwave, PortionedRecipe portionedRecipe)
+    {
+        SubtractContents(microwave, portionedRecipe);
+
+        var coords = Transform(microwave).Coordinates;
+        for (var i = 0; i < portionedRecipe.Count; i++)
+        {
+            if (!ProtoMan.Resolve(portionedRecipe.Recipe, out var recipe))
+                continue;
+
+            PredictedSpawnAtPosition(recipe.Result, coords);
+        }
+    }
+
+    /// <summary>
+    /// Finishes a cooking operation in the microwave, resulting in a finished food recipe,
+    /// the ejection of all remaining ingredients, and a sound cue.
+    /// </summary>
+    /// <param name="ent">The micorawve entity.</param>
+    private void CompleteCooking(Entity<ActiveMicrowaveComponent, MicrowaveComponent> ent)
+    {
+        var active = ent.Comp1;
+        var microwave = ent.Comp2;
+        var microwaveEnt = (ent.Owner, microwave);
+
+        // Spawn a finished recipe, if there is one.
+        if (active.PortionedRecipe != null)
+            SpawnFinishedRecipe(microwaveEnt, active.PortionedRecipe.Value);
+
+        // TODO: Audio prediction sucks. Predict this properly when audio prediction is less broken
+        // https://github.com/space-wizards/RobustToolbox/issues/6436
+        if (_net.IsServer)
+            Audio.PlayPvs(microwave.FoodDoneSound, ent); // beep... beep... beep
+
+        // Clean up the microwave.
+        Container.EmptyContainer(microwave.Storage);
+        StopCooking(microwaveEnt);
+    }
+
+    /// <summary>
+    /// Removes components from a microwave and its contents related to active microwave use.
+    /// </summary>
+    /// <remarks>
+    /// When the ActiveMicrowaveComponent is removed, it will trigger <see cref="OnCookEnd"/> on shutdown.
+    /// </remarks>
+    /// <param name="ent">The microwave entity.</param>
+    private void StopCooking(Entity<MicrowaveComponent> ent)
+    {
+        RemComp<ActiveMicrowaveComponent>(ent);
+    }
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Recipes.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Recipes.cs
new file mode 100644
index 0000000000..8379c88d5c
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.Recipes.cs
@@ -0,0 +1,282 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Stacks;
+using Robust.Shared.Containers;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// This event tries to get secret recipes that the microwave might be capable of.
+    /// Currently, we only check the microwave itself, but in the future, the user might be able to learn recipes.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnGetSecretRecipes(Entity<FoodRecipeProviderComponent> ent, ref GetSecretRecipesEvent args)
+    {
+        foreach (var recipeId in ent.Comp.ProvidedRecipes)
+        {
+            if (ProtoMan.Resolve(recipeId, out var recipeProto))
+                args.Recipes.Add(recipeProto);
+        }
+    }
+
+    /// <summary>
+    /// Adds all usable ingredients from a given entity to an ingredient list.
+    /// </summary>
+    /// <remarks>
+    /// The entity itself is a "solid".
+    /// If it's a stack, then that stack is its "stacks".
+    /// If it has a usable ingredient solution, then the solution's contents are "reagents".
+    /// </remarks>
+    /// <param name="item">The entity to use as ingredients.</param>
+    /// <param name="ingredients">A dictionary of available ingredients to add to.</param>
+    private void AddItemIngredients(EntityUid item, ref CookingIngredients ingredients)
+    {
+        if (TryGetSolidId(item, out var solidId))
+            ingredients.AddSolid(solidId.Value);
+
+        if (StackQuery.TryComp(item, out var stack) && TryGetStackId(item, out var stackId))
+            ingredients.AddStack(stackId.Value, stack.Count);
+
+        if (TryGetUsableIngredientSolution(item, out _, out var solution))
+        {
+            foreach (var (reagent, quantity) in solution.Contents)
+            {
+                ingredients.AddReagent(reagent.Prototype, quantity);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Attempts to get a solution from an entity that can be used as viable ingredients in a recipe.
+    /// </summary>
+    /// <remarks>
+    /// For example, a beaker's contents will work, but not the contents of an uncracked egg.
+    /// </remarks>
+    /// <param name="uid">The entity to attempt to get a usable ingredient solution for.</param>
+    /// <param name="solutionEntity">A usable solution entity, if available.</param>
+    /// <param name="solution">A usable solution, if available.</param>
+    /// <returns>Whether or not a usable ingredient solution was successfully retrieved.</returns>
+    private bool TryGetUsableIngredientSolution(EntityUid uid,
+        [NotNullWhen(true)] out Entity<SolutionComponent>? solutionEntity,
+        [NotNullWhen(true)] out Solution? solution)
+    {
+        return Solution.TryGetDrainableSolution(uid, out solutionEntity, out solution);
+    }
+
+    /// <summary>
+    /// Given a dictionary of stacks that need to be spent in a recipe, and the amount of stacks
+    /// of a stack we have available, this function gets the number of stacks we need to remove
+    /// from the stack entity. It also removes this amount from the remaining stacks dictionary.
+    /// </summary>
+    /// <param name="availableStacks">How many stacks we have available.</param>
+    /// <param name="stackId">The stack ID associated with the stack.</param>
+    /// <param name="ingredientsToSpend">How many stacks  still need to be spent in the recipe.</param>
+    /// <returns>How many stacks we should remove from the available stack entity.</returns>
+    private static int SpendStackQuantity(int availableStacks,
+        ProtoId<StackPrototype> stackId,
+        CookingIngredients ingredientsToSpend)
+    {
+        if (!ingredientsToSpend.Stacks.TryGetValue(stackId, out var remaining))
+            return 0;
+
+        var spent = Math.Min(availableStacks, remaining);
+        ingredientsToSpend.AddStack(stackId, -spent);
+
+        return spent;
+    }
+
+    /// <summary>
+    /// Given a dictionary of reagents that need to be spent in a recipe, and a quantity of a reagent
+    /// that we have available in a solution, this function gets the amount of reagents we need to
+    /// remove from the solution. This also removes that amount from the "reagents to spend" dictionary.
+    /// </summary>
+    /// <param name="availableQuantity">How much reagent we have available.</param>
+    /// <param name="reagent">The ID of the reagent we are spending.</param>
+    /// <param name="ingredientsToSpend">A dictionary of reagents that still need to be spent.</param>
+    /// <returns>How much we should reduce the available reagent volume by.</returns>
+    private static FixedPoint2 SpendReagentQuantity(FixedPoint2 availableQuantity,
+        ProtoId<ReagentPrototype> reagent,
+        CookingIngredients ingredientsToSpend)
+    {
+        if (!ingredientsToSpend.Reagents.TryGetValue(reagent, out var remaining))
+            return 0;
+
+        var spent = FixedPoint2.Min(availableQuantity, remaining);
+        ingredientsToSpend.AddReagent(reagent, -spent);
+
+        return spent;
+    }
+
+    /// <summary>
+    /// Removes a solid ingredient that is used in a recipe, removing it from the dictionary of
+    /// remaining solids that still need to be spent in the recipe.
+    /// </summary>
+    /// <param name="item">The entity to remove.</param>
+    /// <param name="itemProto">The solid ID of the ingredient.</param>
+    /// <param name="container">The microwave's ingredient storage container.</param>
+    /// <param name="ingredientsToSpend">The struct representing ingredients we still need to spend.</param>
+    private void SubtractSolidContents(EntityUid item,
+        EntProtoId itemProto,
+        Container container,
+        CookingIngredients ingredientsToSpend)
+    {
+        if (!ingredientsToSpend.Solids.ContainsKey(itemProto))
+            return;
+
+        ingredientsToSpend.AddSolid(itemProto, -1);
+        Container.Remove(item, container);
+        PredictedQueueDel(item);
+    }
+
+    /// <summary>
+    /// Given a dictionary of remaining stacks that need to be spent in a recipe, this function
+    /// reduces a stack entity's count by however many stacks need to be spent. This also removes the
+    /// stack count from our remaining ingredients.
+    /// </summary>
+    /// <remarks>
+    /// If a recipe calls for two stacks of plasma sheets, and you put 5 sheets in the microwave, then
+    /// the plasma sheet stack would reduce by 2 (leaving you with 3 remaining), and plasma will
+    /// be removed from the remaining stacks dictionary.
+    /// </remarks>
+    /// <param name="ent">The stack entity.</param>
+    /// <param name="ingredientsToSpend">The struct representing ingredients we still need to spend.</param>
+    private void SubtractStackContents(Entity<StackComponent?> ent,
+        CookingIngredients ingredientsToSpend)
+    {
+        if (!Resolve(ent.Owner, ref ent.Comp))
+            return;
+
+        var stack = ent.Comp;
+        var stackId = stack.StackTypeId;
+        var startingQuantity = stack.Count;
+        var quantityToRemove = SpendStackQuantity(startingQuantity, stackId, ingredientsToSpend);
+
+        _stack.ReduceCount(ent.AsNullable(), quantityToRemove);
+    }
+
+    /// <summary>
+    /// Given a dictionary of remaining reagents that still need to be spent in a recipe, this function iterates
+    /// over a solution's contents and subtracts reagents according to the reagents to spend. This also removes
+    /// it from our remaining ingredients.
+    /// </summary>
+    /// <remarks>
+    /// Say you still have 6u mayonnaise remaining, and the solution has 10u mayonnaise, then 6u of
+    /// mayonnaise would be removed from the solution, leaving you with 4u left over. Then, mayonnaise
+    /// is removed from the dictionary of remaining reagents.
+    /// </remarks>
+    /// <param name="solutionEntity">The solution entity.</param>
+    /// <param name="solution">The solution itself.</param>
+    /// <param name="ingredientsToSpend">The struct representing ingredients we still need to spend.</param>
+    private void SubtractReagentContents(Entity<SolutionComponent> solutionEntity,
+        Solution solution,
+        CookingIngredients ingredientsToSpend)
+    {
+        var reagentsToProcess = ingredientsToSpend.Reagents.Keys.ToList();
+
+        foreach (var reagent in reagentsToProcess)
+        {
+            var availableQuantity = solution.GetTotalPrototypeQuantity(reagent);
+            if (availableQuantity == 0)
+                continue;
+
+            var quantityToRemove = SpendReagentQuantity(availableQuantity, reagent, ingredientsToSpend);
+            Solution.RemoveReagent(solutionEntity, reagent, quantityToRemove);
+        }
+    }
+
+    /// <summary>
+    /// Attempt to get the solid ID of a given entity.
+    /// </summary>
+    /// <param name="item">The entity to retrieve a solid ID for.</param>
+    /// <param name="solidId">The solid ID of the entity, if any.</param>
+    /// <returns>
+    /// Whether or not the solid ID was successfully retrieved. False if entity lacks an entity prototype ID.
+    /// </returns>
+    // TODO: Solids should be tag-based, or something like that. Not prototype-based.
+    private bool TryGetSolidId(EntityUid item,
+        [NotNullWhen(true)] out EntProtoId? solidId)
+    {
+        solidId = MetaData(item).EntityPrototype?.ID;
+        return solidId != null;
+    }
+
+    /// <summary>
+    /// Attempt to get the stack ID of a given entity.
+    /// </summary>
+    /// <param name="ent">The stack entity.</param>
+    /// <param name="stack">The stack prototype associated with this entity, if any.</param>
+    /// <returns>
+    /// Whether or not a stack ID is successfully retrieved. False if this entity is not a stack.
+    /// </returns>
+    private bool TryGetStackId(Entity<StackComponent?> ent,
+        [NotNullWhen(true)] out ProtoId<StackPrototype>? stack)
+    {
+        stack = null;
+
+        if (!Resolve(ent.Owner, ref ent.Comp, logMissing: false))
+            return false;
+
+        stack = ent.Comp.StackTypeId;
+        return true;
+    }
+
+    /// <summary>
+    /// Spend ingredients in the microwave based on a given recipe. This deletes ingredient entities (solids),
+    /// subtracts respective stack counts, and removes reagents from ingredient containers (reagents).
+    /// </summary>
+    /// <remarks>
+    /// This function does not check whether or not the contents have *enough* ingredients to
+    /// subtract - it simply performs the subtraction.
+    /// </remarks>
+    /// <param name="ent">The microwave entity.</param>
+    /// <param name="portionedRecipe">The recipe used to spend ingredients.</param>
+    private void SubtractContents(Entity<MicrowaveComponent> ent, PortionedRecipe portionedRecipe)
+    {
+        if (!ProtoMan.Resolve(portionedRecipe.Recipe, out var recipe))
+            return;
+
+        var ingredientsToSpend = recipe.Ingredients * portionedRecipe.Count;
+        var solidsToSpend = ingredientsToSpend.Solids;
+        var stacksToSpend = ingredientsToSpend.Stacks;
+        var reagentsToSpend = ingredientsToSpend.Reagents;
+        var microwave = ent.Comp;
+        var microwaveItems = GetMicrowaveContents(ent.AsNullable()).ToArray();
+
+        foreach (var item in microwaveItems)
+        {
+            if (solidsToSpend.Count > 0
+                && TryGetSolidId(item, out var solidId)
+                && solidsToSpend.ContainsKey(solidId.Value))
+            {
+                SubtractSolidContents(item, solidId.Value, microwave.Storage, ingredientsToSpend);
+                continue;
+                // We're exiting early here; if the solid ingredient is removed from the container,
+                // then we shouldn't be attempting to use its stack or reagents.
+            }
+
+            if (stacksToSpend.Count > 0
+                && StackQuery.TryComp(item, out var stack)
+                && TryGetStackId((item, stack), out var stackId)
+                && stacksToSpend.ContainsKey(stackId.Value))
+            {
+                SubtractStackContents((item, stack), ingredientsToSpend);
+                if (Deleted(item) || stack.Count <= 0)
+                    continue;
+                // We're exiting early here - if the stack is empty, then the stack entity
+                // is gonna be deleted. Which means we shouldn't be using its reagents.
+            }
+
+            if (reagentsToSpend.Count > 0
+                && TryGetUsableIngredientSolution(item, out var solutionEntity, out var solution)
+                && solution.Volume > 0)
+                SubtractReagentContents(solutionEntity.Value, solution, ingredientsToSpend);
+        }
+    }
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.UI.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.UI.cs
new file mode 100644
index 0000000000..41651db5a5
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.UI.cs
@@ -0,0 +1,120 @@
+using Content.Shared.Kitchen.Components;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+public abstract partial class MicrowaveSystem
+{
+    /// <summary>
+    /// Subscribe to UI-related events for microwaves.
+    /// </summary>
+    private void InitializeUI()
+    {
+        SubscribeLocalEvent<MicrowaveComponent, MicrowaveStartCookMessage>((e, ref m) => StartCooking(e, m.Actor));
+    }
+
+    /// <summary>
+    /// Ejects all ingredients from the microwave.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnEjectAll(Entity<MicrowaveComponent> ent, ref MicrowaveEjectMessage args)
+    {
+        if (!HasContents(ent.AsNullable()) || IsActiveMicrowave(ent.AsNullable()))
+            return;
+
+        Container.EmptyContainer(ent.Comp.Storage);
+
+        var audioParams = ent.Comp.ClickSound.Params;
+        audioParams = audioParams.AddVolume(-2);
+        Audio.PlayPredicted(ent.Comp.ClickSound, ent, args.Actor, audioParams);
+    }
+
+    /// <summary>
+    /// Ejects an ingredient entity from the microwave.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnEjectSolidIndexed(Entity<MicrowaveComponent> ent, ref MicrowaveEjectSolidIndexedMessage args)
+    {
+        if (!HasContents(ent.AsNullable()) || IsActiveMicrowave(ent.AsNullable()))
+            return;
+
+        Container.Remove(GetEntity(args.EntityId), ent.Comp.Storage);
+
+        var audioParams = ent.Comp.ClickSound.Params;
+        Audio.PlayPredicted(ent.Comp.ClickSound, ent, args.Actor, audioParams);
+    }
+
+    /// <summary>
+    /// Change the cook time of the microwave by selecting a new button index.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnSelectCookTime(Entity<MicrowaveComponent> ent, ref MicrowaveSelectCookTimeMessage args)
+    {
+        if (IsActiveMicrowave(ent.AsNullable())
+            || !_power.IsPowered(ent.Owner))
+            return;
+
+        // some validation to prevent trollage
+        if (args.NewCookTime % 5 != 0 || args.NewCookTime > ent.Comp.MaxCookTime)
+            return;
+
+        ent.Comp.CurrentCookTimeButtonIndex = args.ButtonIndex;
+        ent.Comp.CurrentCookTimerTime = args.NewCookTime;
+        Dirty(ent);
+
+        var audioParams = ent.Comp.ClickSound.Params;
+        Audio.PlayPredicted(ent.Comp.ClickSound, ent, args.Actor, audioParams);
+        UpdateUI(ent.AsNullable());
+    }
+
+    /// <summary>
+    /// Update the UI state of the microwave, including the microwave's current contents, cook time,
+    /// and whether or not it is actively cooking.
+    /// </summary>
+    /// <param name="microwave">The microwave to update.</param>
+    public virtual void UpdateUI(Entity<MicrowaveComponent?> microwave)
+    {
+
+    }
+}
+
+/// <summary>
+/// Sent from client to server to request the microwave to start cooking.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class MicrowaveStartCookMessage : BoundUserInterfaceMessage;
+
+/// <summary>
+/// Sent from client to server to request ejecting all contents of the microwave.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class MicrowaveEjectMessage : BoundUserInterfaceMessage;
+
+/// <summary>
+/// Sent from client to server to request ejecting an entity from the microwave.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class MicrowaveEjectSolidIndexedMessage(NetEntity entityId) : BoundUserInterfaceMessage
+{
+    /// <summary>
+    /// The entity to eject from the microwave.
+    /// </summary>
+    public NetEntity EntityId = entityId;
+}
+
+/// <summary>
+/// Sent from client to server to request changing the selected cook time button of the microwave.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class MicrowaveSelectCookTimeMessage(int buttonIndex, uint inputTime) : BoundUserInterfaceMessage
+{
+    /// <summary>
+    /// The index of the cook time button to select.
+    /// </summary>
+    public int ButtonIndex = buttonIndex;
+
+    /// <summary>
+    /// The cooking time associated with the newly-selected button.
+    /// </summary>
+    public uint NewCookTime = inputTime;
+}
diff --git a/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.cs
new file mode 100644
index 0000000000..c8cded4141
--- /dev/null
+++ b/Content.Shared/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -0,0 +1,191 @@
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Destructible;
+using Content.Shared.DeviceLinking;
+using Content.Shared.DeviceLinking.Events;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Item;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Popups;
+using Content.Shared.Power;
+using Content.Shared.Power.EntitySystems;
+using Content.Shared.Stacks;
+using Content.Shared.Temperature.Systems;
+using Content.Shared.Whitelist;
+using Robust.Shared.Audio.Systems;
+using Robust.Shared.Containers;
+using Robust.Shared.Network;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Kitchen.EntitySystems;
+
+/// <summary>
+/// A system that handles microwave logic, such as activation, malfunctions, and producing cooked recipes.
+/// TODO: Replace with a more sophisticated(?) cooking system.
+/// </summary>
+public abstract partial class MicrowaveSystem : EntitySystem
+{
+    [Dependency] protected IGameTiming Timing = default!;
+    [Dependency] protected SharedAppearanceSystem Appearance = default!;
+    [Dependency] protected SharedAudioSystem Audio = default!;
+    [Dependency] protected SharedContainerSystem Container = default!;
+    [Dependency] protected SharedPopupSystem Popup = default!;
+    [Dependency] protected SharedSolutionContainerSystem Solution = default!;
+
+    [Dependency] private INetManager _net = default!;
+    [Dependency] private EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private RecipeSystem _recipes = default!;
+    [Dependency] private SharedDeviceLinkSystem _deviceLink = default!;
+    [Dependency] private SharedHandsSystem _hands = default!;
+    [Dependency] private SharedItemSystem _item = default!;
+    [Dependency] private SharedPowerReceiverSystem _power = default!;
+    [Dependency] private SharedPowerStateSystem _powerState = default!;
+    [Dependency] private SharedStackSystem _stack = default!;
+    [Dependency] private SharedTemperatureSystem _temperature = default!;
+
+    [Dependency] protected EntityQuery<MicrowaveComponent> MicrowaveQuery;
+    [Dependency] protected EntityQuery<ActiveMicrowaveComponent> ActiveMicrowaveQuery;
+    [Dependency] protected EntityQuery<ItemComponent> ItemQuery;
+    [Dependency] protected EntityQuery<StackComponent> StackQuery;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        InitializeUI();
+    }
+
+    /// <summary>
+    /// Processes every active microwave's ongoing cooking operation.
+    /// </summary>
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+        var curTime = Timing.CurTime;
+
+        var query = EntityQueryEnumerator<ActiveMicrowaveComponent, MicrowaveComponent>();
+        while (query.MoveNext(out var uid, out var active, out var microwave))
+        {
+            // Roll malfunctions
+            if (active.Malfunctioning && active.NextMalfunction < curTime)
+            {
+                active.NextMalfunction += microwave.MalfunctionInterval;
+                DirtyField(uid, active, nameof(active.NextMalfunction));
+
+                RollMalfunction((uid, microwave));
+            }
+
+            var timeSinceUpdate = curTime - active.LastCookUpdated;
+            var timeElapsed = (float)timeSinceUpdate.TotalSeconds;
+
+            // Finish cooking
+            if (active.CookTimeEnd < curTime)
+            {
+                AddTemperature((uid, microwave), timeElapsed);
+                CompleteCooking((uid, active, microwave));
+                continue;
+            }
+
+            // Otherwise, process the cooking cycle
+            if (active.NextCookUpdate > curTime)
+                continue;
+
+            active.NextCookUpdate += microwave.UpdateInterval;
+            active.LastCookUpdated = curTime;
+            DirtyFields(uid, active, null, nameof(active.NextCookUpdate), nameof(active.LastCookUpdated));
+            AddTemperature((uid, microwave), timeElapsed);
+        }
+    }
+
+    /// <summary>
+    /// Adds an "on" port to this microwave.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<MicrowaveComponent> ent, ref MapInitEvent args)
+    {
+        _deviceLink.EnsureSinkPorts(ent, ent.Comp.OnPort);
+    }
+
+    /// <summary>
+    /// When a microwave is broken, its appearance changes and it stops being usable for cooking.
+    /// It will stop any ongoing cooking operations and empty its contents.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnBreak(Entity<MicrowaveComponent> ent, ref BreakageEventArgs args)
+    {
+        ent.Comp.Broken = true;
+        DirtyField(ent.AsNullable(), nameof(ent.Comp.Broken));
+        SetAppearance(ent, MicrowaveVisualState.Broken);
+
+        StopCooking(ent);
+        Container.EmptyContainer(ent.Comp.Storage);
+        UpdateUI(ent.AsNullable());
+    }
+
+    /// <summary>
+    /// Stop cooking if the microwave loses power.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnPowerChanged(Entity<MicrowaveComponent> ent, ref PowerChangedEvent args)
+    {
+        if (!args.Powered)
+        {
+            SetAppearance(ent, MicrowaveVisualState.Idle);
+            StopCooking(ent);
+        }
+
+        UpdateUI(ent.AsNullable());
+    }
+
+    /// <summary>
+    /// Empty the microwave if it is unanchored.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnAnchorChanged(Entity<MicrowaveComponent> ent, ref AnchorStateChangedEvent args)
+    {
+        if (!args.Anchored)
+            Container.EmptyContainer(ent.Comp.Storage);
+    }
+
+    /// <summary>
+    /// Turns the microwave on if its "on" port is activated.
+    /// </summary>
+    [SubscribeLocalEvent]
+    private void OnSignalReceived(Entity<MicrowaveComponent> ent, ref SignalReceivedEvent args)
+    {
+        if (ent.Comp.Broken || !_power.IsPowered(ent.Owner))
+            return;
+
+        if (args.Port == ent.Comp.OnPort)
+            StartCooking(ent, null);
+    }
+
+    /// <summary>
+    /// Updates the microwave's appearance state.
+    /// </summary>
+    /// <param name="ent">The microwave entity.</param>
+    /// <param name="state">The visual state of the microwave.</param>
+    private void SetAppearance(Entity<MicrowaveComponent> ent,
+        MicrowaveVisualState state)
+    {
+        var display = ent.Comp.Broken ? MicrowaveVisualState.Broken : state;
+        Appearance.SetData(ent.Owner,
+            PowerDeviceVisuals.VisualState,
+            display);
+    }
+}
+
+[Serializable, NetSerializable]
+public enum MicrowaveVisualState
+{
+    Idle,
+    Cooking,
+    Broken,
+    Bloody
+}
+
+[NetSerializable, Serializable]
+public enum MicrowaveUiKey
+{
+    Key
+}
diff --git a/Content.Shared/Kitchen/GetSecretRecipesEvent.cs b/Content.Shared/Kitchen/GetSecretRecipesEvent.cs
index cf5416dfaa..c7d28211be 100644
--- a/Content.Shared/Kitchen/GetSecretRecipesEvent.cs
+++ b/Content.Shared/Kitchen/GetSecretRecipesEvent.cs
@@ -6,5 +6,5 @@ namespace Content.Shared.Kitchen;
 [ByRefEvent]
 public struct GetSecretRecipesEvent()
 {
-    public List<FoodRecipePrototype> Recipes = new();
+    public List<MicrowaveMealRecipePrototype> Recipes = new();
 }
diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
index ae8f0e69a4..7104a68078 100644
--- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -1,63 +1,274 @@
+using System.Linq;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
+using Content.Shared.Stacks;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Kitchen
+namespace Content.Shared.Kitchen;
+
+/// <summary>
+///    A microwave-based cooking recipe to produce an entity.
+/// </summary>
+[Prototype]
+public sealed partial class MicrowaveMealRecipePrototype : IPrototype
 {
+    /// <inheritdoc />
+    [ViewVariables]
+    [IdDataField]
+    public string ID { get; private set; } = default!;
+
     /// <summary>
-    ///    A recipe for space microwaves.
+    /// The name of the recipe.
     /// </summary>
-    [Prototype("microwaveMealRecipe")]
-    public sealed partial class FoodRecipePrototype : IPrototype
+    /// <remarks>
+    /// This is used to sort recipes in alphabetical order in the guidebook.
+    /// </remarks>
+    [DataField("name")]
+    private LocId _name = string.Empty;
+
+    public string Name => Loc.GetString(_name);
+
+    /// <summary>
+    /// The guidebook grouping for this recipe.
+    /// </summary>
+    [DataField]
+    public string Group = "Other";
+
+    /// <summary>
+    /// The cooking ingredients used in this recipe.
+    /// </summary>
+    [IncludeDataField]
+    public CookingIngredients Ingredients;
+
+    /// <summary>
+    /// The resulting entity made from this recipe.
+    /// </summary>
+    [DataField]
+    public EntProtoId Result { get; private set; } = string.Empty;
+
+    /// <summary>
+    /// The cooking time of this recipe.
+    /// </summary>
+    [DataField]
+    public uint Time { get; private set; } = 5;
+
+    /// <summary>
+    /// Is this recipe unavailable in normal circumstances?
+    /// </summary>
+    [DataField]
+    public bool SecretRecipe;
+
+    /// <summary>
+    /// Manual priority field for recipes that take precedent over others. Higher number = picked over others.
+    /// </summary>
+    /// <remarks>
+    /// Secret recipes always have higher priority over non-secret recipes. Only needed when a recipe's
+    /// ingredients may overlap with another in a way that'll cause that recipe to be chosen over this one
+    /// erroneously. This field should be used as minimally as possible.
+    /// </remarks>
+    [DataField]
+    public int Priority;
+}
+
+/// <summary>
+/// A data value representing ingredients for an appliance recipe.
+/// </summary>
+[DataDefinition]
+public partial record struct CookingIngredients
+{
+    public CookingIngredients(Dictionary<EntProtoId, int> solids,
+        Dictionary<ProtoId<StackPrototype>, int> stacks,
+        Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> reagents)
     {
-        [ViewVariables]
-        [IdDataField]
-        public string ID { get; private set; } = default!;
+        Solids = solids;
+        Stacks = stacks;
+        Reagents = reagents;
+    }
 
-        [DataField("name")]
-        private string _name = string.Empty;
+    /// <summary>
+    /// A dictionary of solid item ingredient quantities - actual items used in a recipe.
+    /// </summary>
+    // TODO: This should use tags or whitelists instead of entity prototype IDs
+    [DataField]
+    public Dictionary<EntProtoId, int> Solids { get; private set; } = new();
 
-        [DataField]
-        public string Group = "Other";
+    /// <summary>
+    /// A dictionary of stack quantities, such as plastic sheets or cloth rolls.
+    /// </summary>
+    [DataField]
+    public Dictionary<ProtoId<StackPrototype>, int> Stacks { get; private set; } = new();
 
-        [DataField("reagents")]
-        private Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> _ingsReagents = new();
+    /// <summary>
+    /// A dictionary of reagent quantities.
+    /// </summary>
+    [DataField]
+    // TODO: Use ReagentQuantity[]
+    public Dictionary<ProtoId<ReagentPrototype>, FixedPoint2> Reagents { get; private set; } = new();
 
-        [DataField("solids")]
-        private Dictionary<EntProtoId, FixedPoint2> _ingsSolids = new();
+    /// <summary>
+    /// Adds a quantity of a solid ingredient to this ingredients list.
+    /// </summary>
+    /// <param name="solidId">The ID of the solid to add.</param>
+    /// <param name="count">How much of the solid to add. 1 by default.</param>
+    public readonly void AddSolid(EntProtoId solidId, int count = 1)
+    {
+        if (count == 0)
+            return;
 
-        [DataField(required: true)]
-        public EntProtoId Result;
+        var newCount = Solids.GetValueOrDefault(solidId) + count;
+        if (newCount > 0)
+            Solids[solidId] = newCount;
+        else
+            Solids.Remove(solidId);
+    }
 
-        [DataField("time")]
-        public uint CookTime { get; private set; } = 5;
+    /// <summary>
+    /// Adds a quantity of a stack to this ingredients list.
+    /// </summary>
+    /// <param name="stackId">The ID of the stack to add.</param>
+    /// <param name="count">How many stacks to add.</param>
+    public readonly void AddStack(ProtoId<StackPrototype> stackId, int count)
+    {
+        if (count == 0)
+            return;
 
-        public string Name => Loc.GetString(_name);
+        var newCount = Stacks.GetValueOrDefault(stackId) + count;
+        if (newCount > 0)
+            Stacks[stackId] = newCount;
+        else
+            Stacks.Remove(stackId);
+    }
 
-        // TODO Turn this into a ReagentQuantity[]
-        public IReadOnlyDictionary<ProtoId<ReagentPrototype>, FixedPoint2> IngredientsReagents => _ingsReagents;
-        public IReadOnlyDictionary<EntProtoId, FixedPoint2> IngredientsSolids => _ingsSolids;
+    /// <summary>
+    /// Adds a quantity of a reagent to this ingredients list.
+    /// </summary>
+    /// <param name="reagentId">The ID of the reagent to add.</param>
+    /// <param name="quantity">The volume of the reagent to add.</param>
+    public readonly void AddReagent(ProtoId<ReagentPrototype> reagentId, FixedPoint2 quantity)
+    {
+        if (quantity == 0)
+            return;
 
-        /// <summary>
-        /// Is this recipe unavailable in normal circumstances?
-        /// </summary>
-        [DataField]
-        public bool SecretRecipe = false;
+        var newQuantity = Reagents.GetValueOrDefault(reagentId) + quantity;
+        if (newQuantity > 0)
+            Reagents[reagentId] = newQuantity;
+        else
+            Reagents.Remove(reagentId);
+    }
 
-        /// <summary>
-        ///    Count the number of ingredients in a recipe for sorting the recipe list.
-        ///    This makes sure that where ingredient lists overlap, the more complex
-        ///    recipe is picked first.
-        /// </summary>
-        public FixedPoint2 IngredientCount()
+    /// <summary>
+    ///    Count the number of ingredients in a recipe for sorting the recipe list.
+    ///    This makes sure that where ingredient lists overlap, the more complex
+    ///    recipe is picked first.
+    /// </summary>
+    public readonly FixedPoint2 Count()
+    {
+        var solidCount = Solids.Sum(s => s.Value);
+        var reagentCount = Reagents.Count;
+        var stackCount = Stacks.Sum(s => s.Value);
+
+        return solidCount + reagentCount + stackCount;
+    }
+
+    /// <summary>
+    /// Get the number of times a given recipe can be made with this struct's ingredients.
+    /// </summary>
+    /// <param name="recipe">The recipe to attempt to make with these ingredients.</param>
+    /// <returns>How many times the given recipe can be made.</returns>
+    public readonly uint PortionForRecipe(CookingIngredients recipe)
+    {
+        var solidPortions = GetTimesFulfilled(Solids, recipe.Solids,
+            (available, count) => (uint)(available / count));
+        if (solidPortions == 0)
+            return 0;
+
+        var stackPortions = GetTimesFulfilled(Stacks, recipe.Stacks,
+            (available, count) => (uint)(available / count));
+        if (stackPortions == 0)
+            return 0;
+
+        var reagentPortions = GetTimesFulfilled(Reagents, recipe.Reagents,
+            (available, count) => (uint)(available / count).Int());
+        if (reagentPortions == 0)
+            return 0;
+
+        return new[] { solidPortions, stackPortions, reagentPortions }.Min();
+    }
+
+    /// <summary>
+    /// Given an ingredient dictionary, and a recipe's ingredient dictionary, gets the maximum
+    /// amount of times the recipe can be fulfilled with our available ingredients.
+    /// </summary>
+    /// <typeparam name="T">The key of the ingredient dictionary.</typeparam>
+    /// <typeparam name="TCount">A numerical quantity of the ingredient in the dictionary.</typeparam>
+    /// <param name="ingredients">A dictionary of available ingredients.</param>
+    /// <param name="recipe">A recipe's dictionary of required ingredients.</param>
+    /// <param name="divide">Function to divide the recipe's ingredient count by our ingredient count.</param>
+    /// <returns>How many times the given recipe's ingredients can be fulfilled.</returns>
+    private static uint GetTimesFulfilled<T, TCount>(Dictionary<T, TCount> ingredients,
+        Dictionary<T, TCount> recipe,
+        Func<TCount, TCount, uint> divide)
+        where T : notnull
+    {
+        var portions = uint.MaxValue;
+
+        foreach (var (ingredient, count) in recipe)
         {
-            FixedPoint2 n = 0;
-            n += _ingsReagents.Count; // number of distinct reagents
-            foreach (FixedPoint2 i in _ingsSolids.Values) // sum the number of solid ingredients
-            {
-                n += i;
-            }
-            return n;
+            if (!ingredients.TryGetValue(ingredient, out var available))
+                return 0;
+
+            var ingredientPortions = divide(available, count);
+            portions = Math.Min(portions, ingredientPortions);
         }
+
+        return portions;
+    }
+
+    /// <summary>
+    /// Sum the ingredient counts of two ingredient structs and return the result.
+    /// </summary>
+    public static CookingIngredients operator +(CookingIngredients c1, CookingIngredients c2)
+    {
+        var newIngredients = c1;
+
+        foreach (var (key, count) in c2.Solids)
+        {
+            newIngredients.AddSolid(key, count);
+        }
+
+        foreach (var (key, count) in c2.Stacks)
+        {
+            newIngredients.AddStack(key, count);
+        }
+
+        foreach (var (key, quantity) in c2.Reagents)
+        {
+            newIngredients.AddReagent(key, quantity);
+        }
+
+        return newIngredients;
+    }
+
+    /// <summary>
+    /// Multiply the amount of ingredients by a scalar and return the result.
+    /// </summary>
+    public static CookingIngredients operator *(CookingIngredients c1, int scalar)
+    {
+        var scaledSolids = c1.Solids.ToDictionary(kvp => kvp.Key,
+            kvp => kvp.Value * scalar);
+        var scaledStacks = c1.Stacks.ToDictionary(kvp => kvp.Key,
+            kvp => kvp.Value * scalar);
+        var scaledReagents = c1.Reagents.ToDictionary(kvp => kvp.Key,
+            kvp => kvp.Value * scalar);
+
+        return new(scaledSolids, scaledStacks, scaledReagents);
+    }
+
+    /// <summary>
+    /// Multiply the amount of ingredients by a scalar and return the result.
+    /// </summary>
+    public static CookingIngredients operator *(CookingIngredients c1, uint scalar)
+    {
+        return c1 * (int)scalar;
     }
 }
diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs
deleted file mode 100644
index ac549ee74a..0000000000
--- a/Content.Shared/Kitchen/RecipeManager.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Linq;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Kitchen;
-
-public sealed partial class RecipeManager : EntitySystem
-{
-    public List<FoodRecipePrototype> Recipes { get; private set; } = new();
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        ReloadRecipes();
-        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
-    }
-
-    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
-    {
-        if (args.WasModified<FoodRecipePrototype>())
-            ReloadRecipes();
-    }
-
-    private void ReloadRecipes()
-    {
-        Recipes = ProtoMan
-            .EnumeratePrototypes<FoodRecipePrototype>()
-            .Where(x => !x.SecretRecipe)
-            .OrderByDescending(x => x.IngredientCount())
-            .ToList();
-    }
-}
diff --git a/Content.Shared/Kitchen/RecipeSystem.cs b/Content.Shared/Kitchen/RecipeSystem.cs
new file mode 100644
index 0000000000..ab56e964ac
--- /dev/null
+++ b/Content.Shared/Kitchen/RecipeSystem.cs
@@ -0,0 +1,45 @@
+using System.Linq;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Kitchen;
+
+/// <summary>
+/// A system that caches all available non-secret microwave recipes.
+/// </summary>
+public sealed partial class RecipeSystem : EntitySystem
+{
+    /// <summary>
+    /// A list of all recipes available to the recipe manager.
+    /// </summary>
+    /// <remarks>
+    /// Order matters! The microwave system will use the *first* valid recipe.
+    /// For this reason, this list gets sorted by "complexity" - recipes with more ingredients
+    /// are sorted first. We make the assumption that more complex recipes are more "specific"
+    /// than less complex recipes whose requirements are also fulfilled.
+    /// </remarks>
+    public List<MicrowaveMealRecipePrototype> Recipes { get; private set; } = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        ReloadRecipes();
+        SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypesReloaded);
+    }
+
+    private void OnPrototypesReloaded(PrototypesReloadedEventArgs args)
+    {
+        if (args.WasModified<MicrowaveMealRecipePrototype>())
+            ReloadRecipes();
+    }
+
+    private void ReloadRecipes()
+    {
+        Recipes = ProtoMan
+            .EnumeratePrototypes<MicrowaveMealRecipePrototype>()
+            .Where(x => !x.SecretRecipe)
+            .OrderByDescending(x => x.Priority)
+            .ThenByDescending(x => x.Ingredients.Count())
+            .ToList();
+    }
+}
diff --git a/Resources/Locale/en-US/guidebook/cooking.ftl b/Resources/Locale/en-US/guidebook/cooking.ftl
index 14b95253b3..e3a6a44091 100644
--- a/Resources/Locale/en-US/guidebook/cooking.ftl
+++ b/Resources/Locale/en-US/guidebook/cooking.ftl
@@ -13,3 +13,6 @@ guidebook-microwave-reagent-quantity-display = × {$amount}u
 
 guidebook-microwave-solid-name-display = [bold]{$ingredient}[/bold]
 guidebook-microwave-solid-quantity-display = × {$amount}
+
+guidebook-microwave-stack-name-display = [bold]{$stack}[/bold]
+guidebook-microwave-stack-quantity-display = × {$amount}
diff --git a/Resources/Locale/en-US/kitchen/prototypes/microwave-meal-recipe-prototype.ftl b/Resources/Locale/en-US/kitchen/prototypes/microwave-meal-recipe-prototype.ftl
new file mode 100644
index 0000000000..ba41e33452
--- /dev/null
+++ b/Resources/Locale/en-US/kitchen/prototypes/microwave-meal-recipe-prototype.ftl
@@ -0,0 +1,221 @@
+microwave-meal-recipe-bun-name = bun recipe
+microwave-meal-recipe-cotton-bun-name = cotton bun recipe
+microwave-meal-recipe-bagel-name = bagel recipe
+microwave-meal-recipe-bagel-poppy-name = poppyseed bagel recipe
+microwave-meal-recipe-bagel-cotton-name = cotton bagel recipe
+microwave-meal-recipe-appendix-burger-name = appendix burger recipe
+microwave-meal-recipe-bacon-burger-name = bacon burger recipe
+microwave-meal-recipe-baseball-burger-name = baseball burger recipe
+microwave-meal-recipe-bearger-name = bearger recipe
+microwave-meal-recipe-big-bite-burger-name = big bite burger recipe
+microwave-meal-recipe-brain-burger-name = brain burger recipe
+microwave-meal-recipe-cat-burger-name = cat burger recipe
+microwave-meal-recipe-cheeseburger-name = cheeseburger recipe
+microwave-meal-recipe-chicken-sandiwch-name = chicken sandwich recipe
+microwave-meal-recipe-clown-burger-name = clownburger recipe
+microwave-meal-recipe-corgi-burger-name = corgi burger recipe
+microwave-meal-recipe-crab-burger-name = crab burger recipe
+microwave-meal-recipe-crazy-hamburger-name = crazy hamburger recipe
+microwave-meal-recipe-duck-burger-name = duck sandwich recipe
+microwave-meal-recipe-empowered-burger-name = empowered burger recipe
+microwave-meal-recipe-carp-burger-name = fillet-o-carp burger recipe
+microwave-meal-recipe-five-burger-name = five alarm burger recipe
+microwave-meal-recipe-ghost-burger-name = ghost burger recipe
+microwave-meal-recipe-human-burger-name = human burger recipe
+microwave-meal-recipe-jelly-burger-name = jelly burger recipe
+microwave-meal-recipe-burger-mcguffin-name = McGuffin recipe
+microwave-meal-recipe-burger-mcrib-name = BBQ rib sandwich recipe
+microwave-meal-recipe-mime-burger-name = mime burger recipe
+microwave-meal-recipe-plain-burger-name = plain burger recipe
+microwave-meal-recipe-rat-burger-name = rat burger recipe
+microwave-meal-recipe-robot-burger-name = roburger recipe
+microwave-meal-recipe-soylent-burger-name = soylent burger recipe
+microwave-meal-recipe-spell-burger-name = spell burger recipe
+microwave-meal-recipe-super-bite-burger-name = super bite burger recipe
+microwave-meal-recipe-tofu-burger-name = tofu burger recipe
+microwave-meal-recipe-xenoburger-name = xenoburger recipe
+microwave-meal-recipe-moth-roachburger-name = mothroachburger recipe
+microwave-meal-recipe-banana-bread-name = banana bread recipe
+microwave-meal-recipe-cornbread-name = cornbread recipe
+microwave-meal-recipe-cream-cheese-bread-name = cream cheese bread recipe
+microwave-meal-recipe-meat-bread-name = meat bread recipe
+microwave-meal-recipe-mimana-bread-name = mimana bread recipe
+microwave-meal-recipe-bread-name = bread recipe
+microwave-meal-recipe-bread-cotton-name = cotton bread recipe
+microwave-meal-recipe-sausage-bread-name = sausage bread recipe
+microwave-meal-recipe-spider-meat-bread-name = spider meat bread recipe
+microwave-meal-recipe-tofu-bread-name = tofu bread recipe
+microwave-meal-recipe-xeno-meat-bread-name = xeno meat bread recipe
+microwave-meal-recipe-baguette-name = baguette recipe
+microwave-meal-recipe-baguette-cotton-name = baguette recipe
+microwave-meal-recipe-baguette-sword-name = baguette sword recipe
+microwave-meal-recipe-buttered-toast-name = buttered toast recipe
+microwave-meal-recipe-french-toast-name = french toast recipe
+microwave-meal-recipe-garlic-bread-name = garlic bread slice recipe
+microwave-meal-recipe-jelly-toast-name = jelly toast recipe
+microwave-meal-recipe-moldy-bread-slice-name = moldy bread slice recipe
+microwave-meal-recipe-two-bread-slice-name = two slice recipe
+microwave-meal-recipe-onion-rings-name = onion rings recipe
+microwave-meal-recipe-margherita-pizza-name = margherita pizza recipe
+microwave-meal-recipe-mushroom-pizza-name = mushroom pizza recipe
+microwave-meal-recipe-meat-pizza-name = meat pizza recipe
+microwave-meal-recipe-vegetable-pizza-name = vegetable pizza recipe
+microwave-meal-recipe-hawaiian-pizza-name = Hawaiian pizza recipe
+microwave-meal-recipe-dank-pizza-name = dank pizza recipe
+microwave-meal-recipe-donkpocket-pizza-name = donk-pocket pizza recipe
+microwave-meal-recipe-uranium-pizza-name = spicy rock pizza recipe
+microwave-meal-recipe-cotton-pizza-name = cotton pizza recipe
+microwave-meal-recipe-worldpeas-pizza-name = world peazza recipe
+microwave-meal-recipe-boiled-spaghetti-name = boiled spaghetti recipe
+microwave-meal-recipe-pasta-tomato-name = pasta tomato recipe
+microwave-meal-recipe-meatball-spaghetti-name = spaghetti & meatballs recipe
+microwave-meal-recipe-butter-noodles-name = butter noodles recipe
+microwave-meal-recipe-chow-mein-name = chow mein recipe
+microwave-meal-recipe-oatmeal-name = oatmeal recipe
+microwave-meal-recipe-boiled-rice-name = boiled rice recipe
+microwave-meal-recipe-rice-pudding-name = rice pudding recipe
+microwave-meal-recipe-rice-pork-name = rice and pork recipe
+microwave-meal-recipe-rice-gumbo-name = black-eyed gumbo recipe
+microwave-meal-recipe-egg-rice-name = egg-fried rice recipe
+microwave-meal-recipe-copypasta-name = copypasta recipe
+microwave-meal-recipe-bisque-name = bisque recipe
+microwave-meal-recipe-meatball-soup-name = meatball soup recipe
+microwave-meal-recipe-nettle-soup-name = nettle soup recipe
+microwave-meal-recipe-eyeball-soup-name = eyeball soup recipe
+microwave-meal-recipe-amanita-jelly-name = amanita jelly recipe
+microwave-meal-recipe-onion-soup-name = onion soup recipe
+microwave-meal-recipe-mushroom-soup-name = mushroom soup recipe
+microwave-meal-recipe-stew-soup-name = stew recipe
+microwave-meal-recipe-tomato-soup-name = tomato soup recipe
+microwave-meal-recipe-tomato-blood-soup-name = tomato blood soup recipe
+microwave-meal-recipe-wing-fang-chu-soup-name = wing fang chu recipe
+microwave-meal-recipe-wing-fang-chu-soup-spider-name = wing fang chu recipe
+microwave-meal-recipe-vegetable-soup-name = vegetable soup recipe
+microwave-meal-recipe-clown-tears-soup-name = clown tears soup recipe
+microwave-meal-recipe-monkeys-delight-soup-name = monkeys delight recipe
+microwave-meal-recipe-bungo-soup-name = bungo soup recipe
+microwave-meal-recipe-boiled-snail-name = boiled snail recipe
+microwave-meal-recipe-escargot-soup-name = escargot recipe
+microwave-meal-recipe-amanita-pie-name = amanita pie recipe
+microwave-meal-recipe-apple-pie-name = apple pie recipe
+microwave-meal-recipe-baklava-name = baklava recipe
+microwave-meal-recipe-banana-cream-pie-name = banana cream pie recipe
+microwave-meal-recipe-berry-clafoutis-name = berry clafoutis recipe
+microwave-meal-recipe-cherry-pie-name = cherry pie recipe
+microwave-meal-recipe-frosty-pie-name = frosty pie recipe
+microwave-meal-recipe-meat-pie-name = meat pie recipe
+microwave-meal-recipe-pumpkin-pie-name = pumpkin pie recipe
+microwave-meal-recipe-xeno-pie-name = xeno pie recipe
+microwave-meal-recipe-coco-tart-name = chocolate lava tart recipe
+microwave-meal-recipe-gapple-tart-name = golden apple streusel tart recipe
+microwave-meal-recipe-grape-tart-name = grape tart recipe
+microwave-meal-recipe-mime-tart-name = mime tart recipe
+microwave-meal-recipe-cuban-carp-name = Cuban carp recipe
+microwave-meal-recipe-sashimi-name = sashimi recipe
+microwave-meal-recipe-miso-cola-soup-name = salty sweet misocola soup recipe
+microwave-meal-recipe-loaded-baked-potato-name = loaded baked potato recipe
+microwave-meal-recipe-fries-name = space fries recipe
+microwave-meal-recipe-cheesy-fries-name = cheesy fries recipe
+microwave-meal-recipe-carrot-fries-name = carrot fries recipe
+microwave-meal-recipe-nachos-name = nachos recipe
+microwave-meal-recipe-nachos-cheesy-name = cheesy nachos recipe
+microwave-meal-recipe-nachos-cuban-name = cuban nachos recipe
+microwave-meal-recipe-popcorn-name = popcorn recipe
+microwave-meal-recipe-pancake-name = pancake recipe
+microwave-meal-recipe-blueberry-pancake-name = blueberry pancake recipe
+microwave-meal-recipe-waffles-name = waffle recipe
+microwave-meal-recipe-waffle-soy-name = soy waffle recipe
+microwave-meal-recipe-cookie-name = cookie recipe
+microwave-meal-recipe-sugar-cookie-name = sugar cookie recipe
+microwave-meal-recipe-raisin-cookie-name = raisin cookie recipe
+microwave-meal-recipe-cookie-oatmeal-name = oatmeal cookie recipe
+microwave-meal-recipe-chocolate-chip-pancake-name = chocolate chip pancake recipe
+microwave-meal-recipe-apple-cake-name = apple cake recipe
+microwave-meal-recipe-carrot-cake-name = carrot cake recipe
+microwave-meal-recipe-lemon-cake-name = lemon cake recipe
+microwave-meal-recipe-lemoon-cake-name = lemoon cake recipe
+microwave-meal-recipe-orange-cake-name = orange cake recipe
+microwave-meal-recipe-blueberry-cake-name = blueberry cake recipe
+microwave-meal-recipe-lime-cake-name = lime cake recipe
+microwave-meal-recipe-cheese-cake-name = cheese cake recipe
+microwave-meal-recipe-pumpkin-cake-name = pumpkin cake recipe
+microwave-meal-recipe-clown-cake-name = clown cake recipe
+microwave-meal-recipe-cake-name = cake recipe
+microwave-meal-recipe-birthday-cake-name = birthday cake recipe
+microwave-meal-recipe-chocolate-cake-name = chocolate cake recipe
+microwave-meal-recipe-brain-cake-name = brain cake recipe
+microwave-meal-recipe-slime-cake-name = slime cake recipe
+microwave-meal-recipe-cat-cake-name = cat cake recipe
+microwave-meal-recipe-berry-delight-name = berry delight recipe
+microwave-meal-recipe-bread-dog-name = bread dog recipe
+microwave-meal-recipe-dumplings-name = dumplings recipe
+microwave-meal-recipe-brownies-name = brownie recipe
+microwave-meal-recipe-warm-donkpocket-name = warm donk pocket recipe
+microwave-meal-recipe-warm-dankpocket-name = warm dank pocket recipe
+microwave-meal-recipe-warm-donkpocket-spicy-name = warm spicy donk-pocket recipe
+microwave-meal-recipe-warm-donkpocket-teriyaki-name = warm teriyaki-pocket recipe
+microwave-meal-recipe-warm-donkpocket-pizza-name = warm pizza-pocket recipe
+microwave-meal-recipe-donkpocket-honk-name = warm honk-pocket recipe
+microwave-meal-recipe-donkpocket-berry-name = warm berry-pocket recipe
+microwave-meal-recipe-donkpocket-stonk-name = warm stonk-pocket recipe
+microwave-meal-recipe-donkpocket-carp-name = warm carp-pocket recipe
+microwave-meal-recipe-donkpocket-moth-name = warm moth-pocket recipe
+microwave-meal-recipe-hot-chili-name = hot chili recipe
+microwave-meal-recipe-cold-chili-name = cold chili recipe
+microwave-meal-recipe-clown-tears-name = clown's tears recipe
+microwave-meal-recipe-chili-clown-name = chili con carnival recipe
+microwave-meal-recipe-queso-name = queso recipe
+microwave-meal-recipe-ribs-name = BBQ ribs recipe
+microwave-meal-recipe-enchiladas-name = enchiladas recipe
+microwave-meal-recipe-herb-salad-name = herb salad recipe
+microwave-meal-recipe-valid-salad-name = valid salad recipe
+microwave-meal-recipe-coleslaw-name = coleslaw recipe
+microwave-meal-recipe-caesar-salad-name = caesar salad recipe
+microwave-meal-recipe-citrus-salad-name = citrus salad recipe
+microwave-meal-recipe-kimchi-salad-name = kimchi salad recipe
+microwave-meal-recipe-fruit-salad-name = fruit salad recipe
+microwave-meal-recipe-jungle-salad-name = jungle salad recipe
+microwave-meal-recipe-watermelon-fruit-bowl-salad-name = watermelon fruit bowl recipe
+microwave-meal-recipe-muffin-name = muffin recipe
+microwave-meal-recipe-muffin-chocolate-name = chocolate muffin recipe
+microwave-meal-recipe-muffin-berry-name = berry muffin recipe
+microwave-meal-recipe-muffin-banana-name = banana muffin recipe
+microwave-meal-recipe-muffin-cherry-name = cherry muffin recipe
+microwave-meal-recipe-dried-tea-leaves-name = dried tea leaves recipe
+microwave-meal-recipe-dried-tobacco-name = dried tobacco leaves recipe
+microwave-meal-recipe-dried-cannabis-name = dried cannabis leaves recipe
+microwave-meal-recipe-dried-cannabis-rainbow-name = dried rainbow cannabis leaves recipe
+microwave-meal-recipe-trash-baked-banana-peel-name = baked banana peel recipe
+microwave-meal-recipe-suppermatter-name = suppermatter recipe
+microwave-meal-recipe-food-baked-chevre-chaud-name = chevre chaud recipe
+microwave-meal-recipe-food-baked-chevre-chaud-cotton-name = cotton chevre chaud recipe
+microwave-meal-recipe-cannabis-butter-name = cannabis butter recipe
+microwave-meal-recipe-cannabis-brownies-name = cannabis brownie recipe
+microwave-meal-recipe-corn-in-butter-name = corn in butter recipe
+microwave-meal-recipe-pea-soup-name = pea soup recipe
+microwave-meal-recipe-taco-shell-name = taco shell recipe
+microwave-meal-recipe-taco-beef-name = beef taco recipe
+microwave-meal-recipe-taco-chicken-name = chicken taco recipe
+microwave-meal-recipe-taco-fish-name = fish taco recipe
+microwave-meal-recipe-taco-rat-name = rat taco recipe
+microwave-meal-recipe-taco-beef-supreme-name = beef taco supreme recipe
+microwave-meal-recipe-taco-chicken-supreme-name = beef taco supreme recipe
+microwave-meal-recipe-taco-dragon-name = draco recipe
+microwave-meal-recipe-croissant-name = croissant recipe
+microwave-meal-recipe-croissant-cotton-name = cotton croissant recipe
+microwave-meal-recipe-throwing-croissant-name = throwing croissant recipe
+microwave-meal-recipe-inert-anomaly-meat-name = inert meat anomaly recipe
+microwave-meal-recipe-anomaly-meat-name = meat anomaly recipe
+microwave-meal-recipe-anomaly-meat-cooked-name = cooked meat anomaly recipe
+microwave-meal-recipe-grilled-cheese-sandwich-name = grilled cheese sandwich recipe
+microwave-meal-recipe-grilled-cheese-sandwich-cotton-name = cotton grilled cheese sandwich recipe
+microwave-meal-recipe-breakfast-american-name = full american breakfast recipe
+microwave-meal-recipe-breakfast-english-name = full english breakfast recipe
+microwave-meal-recipe-moproach-name = moproach recipe
+microwave-meal-recipe-cotton-cake-name = cotton cake recipe
+
+# medical recipes
+
+microwave-meal-recipe-aloe-cream-name = aloe cream recipe
+microwave-meal-recipe-medicated-suture-name = medicated suture recipe
+microwave-meal-recipe-regenerative-mesh-name = regenerative mesh recipe
diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 8a0c2909d8..6bcf13a955 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -160,7 +160,7 @@
   components:
   - type: Microwave
     cookTimeMultiplier: 0.5
-    baseHeatMultiplier: 200
+    objectHeatMultiplier: 200
     capacity: 10
     canMicrowaveIdsSafely: false
     explosionChance: 0.3
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index b41403a9f0..44fce9ede6 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1,6 +1,6 @@
 - type: microwaveMealRecipe
   id: RecipeBun
-  name: bun recipe
+  name: microwave-meal-recipe-bun-name
   result: FoodBreadBun
   time: 5
   group: Breads
@@ -9,7 +9,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCottonBun
-  name: cotton bun recipe
+  name: microwave-meal-recipe-cotton-bun-name
   result: FoodCottonBun
   time: 5
   group: Moth
@@ -19,7 +19,7 @@
 #Bagels
 - type: microwaveMealRecipe
   id: RecipeBagel
-  name: bagel recipe
+  name: microwave-meal-recipe-bagel-name
   result: FoodBagel
   time: 5
   group: Breads
@@ -28,7 +28,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBagelPoppy
-  name: poppyseed bagel recipe
+  name: microwave-meal-recipe-bagel-poppy-name
   result: FoodBagelPoppy
   time: 5
   group: Breads
@@ -38,7 +38,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBagelCotton
-  name: cotton bagel recipe
+  name: microwave-meal-recipe-bagel-cotton-name
   result: FoodBagelCotton
   time: 5
   group: Moth
@@ -49,7 +49,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAppendixBurger
-  name: appendix burger recipe
+  name: microwave-meal-recipe-appendix-burger-name
   result: FoodBurgerAppendix
   time: 10
   group: Savory
@@ -59,7 +59,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaconBurger
-  name: bacon burger recipe
+  name: microwave-meal-recipe-bacon-burger-name
   result: FoodBurgerBacon
   time: 10
   group: Savory
@@ -70,7 +70,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaseballBurger
-  name: baseball burger recipe
+  name: microwave-meal-recipe-baseball-burger-name
   result: FoodBurgerBaseball
   time: 10
   group: Savory
@@ -80,7 +80,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBearger
-  name: bearger recipe
+  name: microwave-meal-recipe-bearger-name
   result: FoodBurgerBear
   time: 10
   group: Savory
@@ -90,7 +90,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBigBiteBurger
-  name: big bite burger recipe
+  name: microwave-meal-recipe-big-bite-burger-name
   result: FoodBurgerBig
   time: 15
   group: Savory
@@ -103,7 +103,7 @@
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeBrainBurger
-  name: brain burger recipe
+  name: microwave-meal-recipe-brain-burger-name
   result: FoodBurgerBrain
   time: 10
   group: Savory
@@ -113,7 +113,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCatBurger
-  name: cat burger recipe
+  name: microwave-meal-recipe-cat-burger-name
   result: FoodBurgerCat
   time: 10
   group: Savory
@@ -124,7 +124,7 @@
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCheeseburger
-  name: cheeseburger recipe
+  name: microwave-meal-recipe-cheeseburger-name
   result: FoodBurgerCheese
   time: 10
   group: Savory
@@ -135,7 +135,7 @@
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeChickenSandwich
-  name: chicken sandwich recipe
+  name: microwave-meal-recipe-chicken-sandiwch-name
   result: FoodBurgerChicken
   time: 10
   group: Savory
@@ -147,7 +147,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeClownBurger
-  name: clownburger recipe
+  name: microwave-meal-recipe-clown-burger-name
   result: FoodBurgerClown
   time: 10
   group: Savory
@@ -157,7 +157,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCorgiBurger
-  name: corgi burger recipe
+  name: microwave-meal-recipe-corgi-burger-name
   result: FoodBurgerCorgi
   time: 10
   group: Savory
@@ -167,7 +167,7 @@
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeCrabBurger
-  name: crab burger recipe
+  name: microwave-meal-recipe-crab-burger-name
   result: FoodBurgerCrab
   time: 10
   group: Savory
@@ -177,7 +177,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCrazyHamburger
-  name: crazy hamburger recipe
+  name: microwave-meal-recipe-crazy-hamburger-name
   result: FoodBurgerCrazy
   time: 15
   group: Savory
@@ -194,7 +194,7 @@
 
 - type: microwaveMealRecipe #Added to metamorph recipes
   id: RecipeDuckBurger
-  name: duck sandwich recipe
+  name: microwave-meal-recipe-duck-burger-name
   result: FoodBurgerDuck
   time: 10
   group: Savory
@@ -205,17 +205,18 @@
 
 - type: microwaveMealRecipe
   id: RecipeEmpoweredBurger
-  name: empowered burger recipe
+  name: microwave-meal-recipe-empowered-burger-name
   result: FoodBurgerEmpowered
   time: 10
   group: Savory
   solids:
     FoodBreadBun: 1
-    SheetPlasma1: 2
+  stacks:
+    Plasma: 2
 
 - type: microwaveMealRecipe
   id: RecipeCarpBurger
-  name: fillet-o-carp burger recipe
+  name: microwave-meal-recipe-carp-burger-name
   result: FoodBurgerCarp
   time: 10
   group: Savory
@@ -226,7 +227,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFiveBurger
-  name: five alarm burger recipe
+  name: microwave-meal-recipe-five-burger-name
   result: FoodBurgerFive
   time: 10
   group: Savory
@@ -237,7 +238,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGhostBurger
-  name: ghost burger recipe
+  name: microwave-meal-recipe-ghost-burger-name
   result: FoodBurgerGhost
   time: 10
   group: Savory
@@ -247,7 +248,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeHumanBurger
-  name: human burger recipe
+  name: microwave-meal-recipe-human-burger-name
   result: FoodBurgerHuman
   time: 10
   group: Savory
@@ -257,7 +258,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeJellyBurger
-  name: jelly burger recipe
+  name: microwave-meal-recipe-jelly-burger-name
   result: FoodBurgerJelly
   time: 10
   group: Savory
@@ -267,7 +268,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBurgerMcguffin
-  name: McGuffin recipe
+  name: microwave-meal-recipe-burger-mcguffin-name
   result: FoodBurgerMcguffin
   time: 10
   group: Savory
@@ -279,7 +280,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBurgerMcrib
-  name: BBQ rib sandwich recipe
+  name: microwave-meal-recipe-burger-mcrib-name
   result: FoodBurgerMcrib
   time: 10
   group: Savory
@@ -290,7 +291,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMimeBurger
-  name: mime burger recipe
+  name: microwave-meal-recipe-mime-burger-name
   result: FoodBurgerMime
   time: 10
   group: Savory
@@ -300,7 +301,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePlainBurger
-  name: plain burger recipe
+  name: microwave-meal-recipe-plain-burger-name
   result: FoodBurgerPlain
   time: 10
   group: Savory
@@ -310,7 +311,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRatBurger
-  name: rat burger recipe
+  name: microwave-meal-recipe-rat-burger-name
   result: FoodBurgerRat
   time: 10
   group: Savory
@@ -320,7 +321,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRobotBurger
-  name: roburger recipe
+  name: microwave-meal-recipe-robot-burger-name
   result: FoodBurgerRobot
   time: 10
   group: Savory
@@ -331,7 +332,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSoylentBurger
-  name: soylent burger recipe
+  name: microwave-meal-recipe-soylent-burger-name
   result: FoodBurgerSoy
   time: 10
   group: Savory
@@ -342,7 +343,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSpellBurger
-  name: spell burger recipe
+  name: microwave-meal-recipe-spell-burger-name
   result: FoodBurgerSpell
   time: 10
   group: Savory
@@ -352,7 +353,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSuperBiteBurger
-  name: super bite burger recipe
+  name: microwave-meal-recipe-super-bite-burger-name
   result: FoodBurgerSuper
   time: 25
   group: Savory
@@ -368,7 +369,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTofuBurger
-  name: tofu burger recipe
+  name: microwave-meal-recipe-tofu-burger-name
   result: FoodBurgerTofu
   time: 10
   group: Savory
@@ -378,7 +379,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeXenoburger
-  name: xenoburger recipe
+  name: microwave-meal-recipe-xenoburger-name
   result: FoodBurgerXeno
   time: 10
   group: Savory
@@ -388,7 +389,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMothRoachburger
-  name: mothroachburger recipe
+  name: microwave-meal-recipe-moth-roachburger-name
   result: FoodBurgerMothRoach
   group: Savory
   solids:
@@ -399,7 +400,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBananaBread
-  name: banana bread recipe
+  name: microwave-meal-recipe-banana-bread-name
   result: FoodBreadBanana
   time: 15
   group: Breads
@@ -409,7 +410,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCornbread
-  name: cornbread recipe
+  name: microwave-meal-recipe-cornbread-name
   result: FoodBreadCorn
   time: 10
   group: Breads
@@ -418,7 +419,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCreamCheeseBread
-  name: cream cheese bread recipe
+  name: microwave-meal-recipe-cream-cheese-bread-name
   result: FoodBreadCreamcheese
   time: 15
   group: Breads
@@ -430,7 +431,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMeatBread
-  name: meat bread recipe
+  name: microwave-meal-recipe-meat-bread-name
   result: FoodBreadMeat
   time: 15
   group: Breads
@@ -441,7 +442,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMimanaBread
-  name: mimana bread recipe
+  name: microwave-meal-recipe-mimana-bread-name
   result: FoodBreadMimana
   time: 15
   group: Breads
@@ -453,7 +454,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBread
-  name: bread recipe
+  name: microwave-meal-recipe-bread-name
   result: FoodBreadPlain
   time: 10
   group: Breads
@@ -462,7 +463,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBreadCotton
-  name: cotton bread recipe
+  name: microwave-meal-recipe-bread-cotton-name
   result: FoodBreadCotton
   time: 10
   group: Moth
@@ -471,7 +472,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSausageBread
-  name: sausage bread recipe
+  name: microwave-meal-recipe-sausage-bread-name
   result: FoodBreadSausage
   time: 15
   group: Breads
@@ -481,7 +482,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSpiderMeatBread
-  name: spider meat bread recipe
+  name: microwave-meal-recipe-spider-meat-bread-name
   result: FoodBreadMeatSpider
   time: 15
   group: Breads
@@ -492,7 +493,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTofuBread
-  name: tofu bread recipe
+  name: microwave-meal-recipe-tofu-bread-name
   result: FoodBreadTofu
   time: 15
   group: Breads
@@ -502,7 +503,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeXenoMeatBread
-  name: xeno meat bread recipe
+  name: microwave-meal-recipe-xeno-meat-bread-name
   result: FoodBreadMeatXeno
   time: 15
   group: Breads
@@ -515,7 +516,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaguette
-  name: baguette recipe
+  name: microwave-meal-recipe-baguette-name
   result: FoodBreadBaguette
   time: 15
   group: Breads
@@ -527,7 +528,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaguetteCotton
-  name: baguette recipe
+  name: microwave-meal-recipe-baguette-cotton-name
   result: FoodBreadBaguetteCotton
   time: 15
   group: Moth
@@ -539,7 +540,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaguetteSword
-  name: baguette sword recipe
+  name: microwave-meal-recipe-baguette-sword-name
   result: WeaponBaguette
   secretRecipe: true
   time: 15
@@ -547,13 +548,14 @@
   reagents:
     TableSalt: 1
     Blackpepper: 1
+  stacks:
+    MetalRod: 1
   solids:
     FoodDough: 1
-    PartRodMetal1: 1
 
 - type: microwaveMealRecipe
   id: RecipeButteredToast
-  name: buttered toast recipe
+  name: microwave-meal-recipe-buttered-toast-name
   result: FoodBreadButteredToast
   time: 5
   group: Breads
@@ -563,7 +565,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFrenchToast
-  name: french toast recipe
+  name: microwave-meal-recipe-french-toast-name
   result: FoodBreadFrenchToast
   time: 5
   group: Breakfast
@@ -575,7 +577,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGarlicBread
-  name: garlic bread slice recipe
+  name: microwave-meal-recipe-garlic-bread-name
   result: FoodBreadGarlicSlice
   time: 5
   group: Breads
@@ -586,7 +588,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeJellyToast
-  name: jelly toast recipe
+  name: microwave-meal-recipe-jelly-toast-name
   result: FoodBreadJellySlice
   time: 5
   group: Breads
@@ -596,7 +598,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMoldyBreadSlice
-  name: moldy bread slice recipe
+  name: microwave-meal-recipe-moldy-bread-slice-name
   result: FoodBreadMoldySlice
   time: 5
   group: Breads
@@ -606,7 +608,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTwoBreadSlice
-  name: two slice recipe
+  name: microwave-meal-recipe-two-bread-slice-name
   result: FoodBreadTwoSlice
   time: 5
   group: Breads
@@ -617,7 +619,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeOnionRings
-  name: onion rings recipe
+  name: microwave-meal-recipe-onion-rings-name
   result: FoodOnionRings
   time: 15
   group: Savory
@@ -627,7 +629,7 @@
 #Pizzas TODO: contruction graph based pizza
 - type: microwaveMealRecipe
   id: RecipeMargheritaPizza
-  name: margherita pizza recipe
+  name: microwave-meal-recipe-margherita-pizza-name
   result: FoodPizzaMargherita
   time: 30
   group: Pizza
@@ -638,7 +640,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMushroomPizza
-  name: mushroom pizza recipe
+  name: microwave-meal-recipe-mushroom-pizza-name
   result: FoodPizzaMushroom
   time: 30
   group: Pizza
@@ -648,7 +650,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMeatPizza
-  name: meat pizza recipe
+  name: microwave-meal-recipe-meat-pizza-name
   result: FoodPizzaMeat
   time: 30
   group: Pizza
@@ -660,7 +662,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeVegetablePizza
-  name: vegetable pizza recipe
+  name: microwave-meal-recipe-vegetable-pizza-name
   result: FoodPizzaVegetable
   time: 30
   group: Pizza
@@ -673,7 +675,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeHawaiianPizza
-  name: Hawaiian pizza recipe
+  name: microwave-meal-recipe-hawaiian-pizza-name
   result: FoodPizzaPineapple
   time: 30
   group: Pizza
@@ -684,7 +686,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDankPizza
-  name: dank pizza recipe
+  name: microwave-meal-recipe-dank-pizza-name
   result: FoodPizzaDank
   time: 30
   group: Pizza
@@ -696,7 +698,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketPizza
-  name: donk-pocket pizza recipe
+  name: microwave-meal-recipe-donkpocket-pizza-name
   result: FoodPizzaDonkpocket
   time: 30
   group: Pizza
@@ -708,7 +710,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeUraniumPizza
-  name: spicy rock pizza recipe
+  name: microwave-meal-recipe-uranium-pizza-name
   result: FoodPizzaUranium
   time: 30
   group: Pizza
@@ -716,11 +718,12 @@
     FoodDoughFlat: 1
     FoodChiliPepper: 2
     FoodTomato: 2
-    SheetUranium1: 2
+  stacks:
+    Uranium: 2
 
 - type: microwaveMealRecipe
   id: RecipeCottonPizza
-  name: cotton pizza recipe
+  name: microwave-meal-recipe-cotton-pizza-name
   result: FoodPizzaCotton
   time: 30
   group: Moth
@@ -730,7 +733,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWorldpeasPizza
-  name: world peazza recipe
+  name: microwave-meal-recipe-worldpeas-pizza-name
   result: FoodPizzaWorldpeas
   time: 30
   solids:
@@ -740,7 +743,7 @@
 #Italian
 - type: microwaveMealRecipe
   id: RecipeBoiledSpaghetti
-  name: boiled spaghetti recipe
+  name: microwave-meal-recipe-boiled-spaghetti-name
   result: FoodNoodlesBoiled
   time: 15
   group: Pasta
@@ -751,7 +754,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePastaTomato
-  name: pasta tomato recipe
+  name: microwave-meal-recipe-pasta-tomato-name
   result: FoodNoodles
   time: 10
   group: Pasta
@@ -761,7 +764,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMeatballSpaghetti
-  name: spaghetti & meatballs recipe
+  name: microwave-meal-recipe-meatball-spaghetti-name
   result: FoodNoodlesMeatball
   time: 10
   group: Pasta
@@ -771,7 +774,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeButterNoodles
-  name: butter noodles recipe
+  name: microwave-meal-recipe-butter-noodles-name
   result: FoodNoodlesButter
   time: 10
   group: Pasta
@@ -781,7 +784,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeChowMein
-  name: chow mein recipe
+  name: microwave-meal-recipe-chow-mein-name
   result: FoodNoodlesChowmein
   time: 10
   group: Pasta
@@ -795,7 +798,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeOatmeal
-  name: oatmeal recipe
+  name: microwave-meal-recipe-oatmeal-name
   result: FoodOatmeal
   time: 15
   group: Savory
@@ -807,7 +810,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBoiledRice
-  name: boiled rice recipe
+  name: microwave-meal-recipe-boiled-rice-name
   result: FoodRiceBoiled
   time: 15
   group: Savory
@@ -819,7 +822,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRicePudding
-  name: rice pudding recipe
+  name: microwave-meal-recipe-rice-pudding-name
   result: FoodRicePudding
   time: 15
   group: Dessert
@@ -833,7 +836,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRicePork
-  name: rice and pork recipe
+  name: microwave-meal-recipe-rice-pork-name
   result: FoodRicePork
   time: 15
   group: Savory
@@ -843,7 +846,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRiceGumbo
-  name: black-eyed gumbo recipe
+  name: microwave-meal-recipe-rice-gumbo-name
   result: FoodRiceGumbo
   time: 15
   group: Savory
@@ -854,7 +857,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeEggRice
-  name: egg-fried rice recipe
+  name: microwave-meal-recipe-egg-rice-name
   result: FoodRiceEgg
   time: 15
   group: Savory
@@ -866,7 +869,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCopypasta
-  name: copypasta recipe
+  name: microwave-meal-recipe-copypasta-name
   result: FoodNoodlesCopy
   time: 10
   group: Pasta
@@ -877,7 +880,7 @@
 #Soups & Stew
 - type: microwaveMealRecipe
   id: RecipeBisque
-  name: bisque recipe
+  name: microwave-meal-recipe-bisque-name
   result: FoodSoupBisque
   time: 10
   group: Soup
@@ -891,7 +894,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMeatballSoup
-  name: meatball soup recipe
+  name: microwave-meal-recipe-meatball-soup-name
   result: FoodSoupMeatball
   time: 10
   group: Soup
@@ -905,7 +908,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeNettleSoup
-  name: nettle soup recipe
+  name: microwave-meal-recipe-nettle-soup-name
   result: FoodSoupNettle
   time: 10
   group: Soup
@@ -920,7 +923,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeEyeballSoup
-  name: eyeball soup recipe
+  name: microwave-meal-recipe-eyeball-soup-name
   result: FoodSoupEyeball
   time: 10
   group: Soup
@@ -934,7 +937,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAmanitaJelly
-  name: amanita jelly recipe
+  name: microwave-meal-recipe-amanita-jelly-name
   result: FoodJellyAmanita
   time: 10
   group: Savory
@@ -946,7 +949,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeOnionSoup
-  name: onion soup recipe
+  name: microwave-meal-recipe-onion-soup-name
   result: FoodSoupOnion
   time: 10
   group: Soup
@@ -959,7 +962,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMushroomSoup
-  name: mushroom soup recipe
+  name: microwave-meal-recipe-mushroom-soup-name
   result: FoodSoupMushroom
   time: 10
   group: Soup
@@ -972,7 +975,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeStewSoup
-  name: stew recipe
+  name: microwave-meal-recipe-stew-soup-name
   result: FoodSoupStew
   time: 10
   group: Soup
@@ -989,7 +992,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTomatoSoup
-  name: tomato soup recipe
+  name: microwave-meal-recipe-tomato-soup-name
   result: FoodSoupTomato
   time: 10
   group: Soup
@@ -1001,7 +1004,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTomatoBloodSoup
-  name: tomato blood soup recipe
+  name: microwave-meal-recipe-tomato-blood-soup-name
   result: FoodSoupTomatoBlood
   time: 10
   group: Soup
@@ -1013,7 +1016,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWingFangChuSoup
-  name: wing fang chu recipe
+  name: microwave-meal-recipe-wing-fang-chu-soup-name
   result: FoodSoupWingFangChu
   time: 10
   group: Soup
@@ -1025,7 +1028,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWingFangChuSoupSpider
-  name: wing fang chu recipe
+  name: microwave-meal-recipe-wing-fang-chu-soup-spider-name
   result: FoodSoupWingFangChu
   time: 10
   group: Soup
@@ -1037,7 +1040,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeVegetableSoup
-  name: vegetable soup recipe
+  name: microwave-meal-recipe-vegetable-soup-name
   result: FoodSoupVegetable
   time: 10
   group: Soup
@@ -1052,7 +1055,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeClownTearsSoup
-  name: clown tears soup recipe
+  name: microwave-meal-recipe-clown-tears-soup-name
   result: FoodSoupClown
   time: 10
   group: Soup
@@ -1061,13 +1064,13 @@
   solids:
     FoodBowlBig: 1
     FoodBanana: 1
-    MaterialBananium: 1
     ShardGlass: 1
-    #idk probably replace shard with someting bananium when #14663 merged
+  stacks:
+    Bananium: 1
 
 - type: microwaveMealRecipe
   id: RecipeMonkeysDelightSoup
-  name: monkeys delight recipe
+  name: microwave-meal-recipe-monkeys-delight-soup-name
   result: FoodSoupMonkey
   time: 10
   group: Soup
@@ -1082,7 +1085,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBungoSoup
-  name: bungo soup recipe
+  name: microwave-meal-recipe-bungo-soup-name
   result: FoodSoupBungo
   time: 10
   group: Soup
@@ -1095,7 +1098,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBoiledSnail
-  name: boiled snail recipe
+  name: microwave-meal-recipe-boiled-snail-name
   result: FoodMeatSnailCooked
   time: 5
   group: Savory
@@ -1106,7 +1109,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeEscargotSoup
-  name: escargot recipe
+  name: microwave-meal-recipe-escargot-soup-name
   result: FoodSoupEscargot
   time: 10
   group: Soup
@@ -1123,7 +1126,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAmanitaPie
-  name: amanita pie recipe
+  name: microwave-meal-recipe-amanita-pie-name
   result: FoodPieAmanita
   time: 15
   group: Pie
@@ -1134,7 +1137,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeApplePie
-  name: apple pie recipe
+  name: microwave-meal-recipe-apple-pie-name
   result: FoodPieApple
   time: 15
   group: Pie
@@ -1145,7 +1148,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBaklava
-  name: baklava recipe
+  name: microwave-meal-recipe-baklava-name
   result: FoodPieBaklava
   time: 15
   group: BarsAndCookies
@@ -1156,7 +1159,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBananaCreamPie
-  name: banana cream pie recipe
+  name: microwave-meal-recipe-banana-cream-pie-name
   result: FoodPieBananaCream
   time: 15
   group: Pie
@@ -1167,7 +1170,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBerryClafoutis
-  name: berry clafoutis recipe
+  name: microwave-meal-recipe-berry-clafoutis-name
   result: FoodPieClafoutis
   time: 15
   group: Pie
@@ -1178,7 +1181,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCherryPie
-  name: cherry pie recipe
+  name: microwave-meal-recipe-cherry-pie-name
   result: FoodPieCherry
   time: 15
   group: Pie
@@ -1189,7 +1192,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFrostyPie
-  name: frosty pie recipe
+  name: microwave-meal-recipe-frosty-pie-name
   result: FoodPieFrosty
   time: 15
   group: Pie
@@ -1200,7 +1203,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMeatPie
-  name: meat pie recipe
+  name: microwave-meal-recipe-meat-pie-name
   result: FoodPieMeat
   time: 15
   group: Pie
@@ -1211,7 +1214,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePumpkinPie
-  name: pumpkin pie recipe
+  name: microwave-meal-recipe-pumpkin-pie-name
   result: FoodPiePumpkin
   time: 15
   group: Pie
@@ -1226,13 +1229,13 @@
 #  result: FoodPiePlump
 #  time: 15
 #  solids:
-#    FoodDoughPie: 1
-#    FoodPlumpHelmet: 3 #a big part of me wants to veto this because the item description is a dick joke but i'll write the placeholder anyway
-#    FoodPlateTin: 1
+#  FoodDoughPie: 1
+#  FoodPlumpHelmet: 3 #a big part of me wants to veto this because the item description is a dick joke but i'll write the placeholder anyway
+#  FoodPlateTin: 1
 
 - type: microwaveMealRecipe
   id: RecipeXenoPie
-  name: xeno pie recipe
+  name: microwave-meal-recipe-xeno-pie-name
   result: FoodPieXeno
   time: 15
   group: Pie
@@ -1245,7 +1248,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCocoTart
-  name: chocolate lava tart recipe
+  name: microwave-meal-recipe-coco-tart-name
   result: FoodTartCoco
   time: 15
   group: Pie
@@ -1259,7 +1262,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGappleTart
-  name: golden apple streusel tart recipe
+  name: microwave-meal-recipe-gapple-tart-name
   result: FoodTartGapple
   time: 15
   group: Pie
@@ -1274,7 +1277,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGrapeTart
-  name: grape tart recipe
+  name: microwave-meal-recipe-grape-tart-name
   result: FoodTartGrape
   time: 15
   group: Pie
@@ -1288,7 +1291,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMimeTart
-  name: mime tart recipe
+  name: microwave-meal-recipe-mime-tart-name
   result: FoodTartMime
   time: 15
   group: Pie
@@ -1304,7 +1307,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCubanCarp
-  name: Cuban carp recipe
+  name: microwave-meal-recipe-cuban-carp-name
   result: FoodMealCubancarp
   time: 15
   group: Savory
@@ -1316,7 +1319,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSashimi
-  name: sashimi recipe
+  name: microwave-meal-recipe-sashimi-name
   result: FoodMealSashimi
   time: 15
   group: Savory
@@ -1327,7 +1330,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMisoColaSoup
-  name: salty sweet misocola soup recipe
+  name: microwave-meal-recipe-miso-cola-soup-name
   result: DisgustingSweptSoup
   time: 15
   group: Savory
@@ -1338,7 +1341,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeLoadedBakedPotato
-  name: loaded baked potato recipe
+  name: microwave-meal-recipe-loaded-baked-potato-name
   result: FoodMealPotatoLoaded
   time: 15
   group: Savory
@@ -1348,7 +1351,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFries
-  name: space fries recipe
+  name: microwave-meal-recipe-fries-name
   result: FoodMealFries
   time: 15
   group: Savory
@@ -1359,7 +1362,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCheesyFries
-  name: cheesy fries recipe
+  name: microwave-meal-recipe-cheesy-fries-name
   result: FoodMealFriesCheesy
   time: 15
   group: Savory
@@ -1371,7 +1374,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCarrotFries
-  name: carrot fries recipe
+  name: microwave-meal-recipe-carrot-fries-name
   result: FoodMealFriesCarrot
   time: 15
   group: Savory
@@ -1382,7 +1385,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeNachos
-  name: nachos recipe
+  name: microwave-meal-recipe-nachos-name
   result: FoodMealNachos
   time: 10
   group: Savory
@@ -1394,7 +1397,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeNachosCheesy
-  name: cheesy nachos recipe
+  name: microwave-meal-recipe-nachos-cheesy-name
   result: FoodMealNachosCheesy
   time: 10
   group: Savory
@@ -1407,7 +1410,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeNachosCuban
-  name: cuban nachos recipe
+  name: microwave-meal-recipe-nachos-cuban-name
   result: FoodMealNachosCuban
   time: 10
   group: Savory
@@ -1420,7 +1423,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePopcorn
-  name: popcorn recipe
+  name: microwave-meal-recipe-popcorn-name
   result: FoodSnackPopcorn
   time: 20
   group: Savory
@@ -1429,7 +1432,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePancake
-  name: pancake recipe
+  name: microwave-meal-recipe-pancake-name
   result: FoodBakedPancake
   time: 5
   group: Breakfast
@@ -1440,7 +1443,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBlueberryPancake
-  name: blueberry pancake recipe
+  name: microwave-meal-recipe-blueberry-pancake-name
   result: FoodBakedPancakeBb
   time: 5
   group: Breakfast
@@ -1453,7 +1456,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWaffles
-  name: waffle recipe
+  name: microwave-meal-recipe-waffles-name
   result: FoodBakedWaffle
   time: 10
   group: Breakfast
@@ -1465,7 +1468,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWaffleSoy
-  name: soy waffle recipe
+  name: microwave-meal-recipe-waffle-soy-name
   result: FoodBakedWaffleSoy
   time: 10
   group: Breakfast
@@ -1477,7 +1480,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCookie
-  name: cookie recipe
+  name: microwave-meal-recipe-cookie-name
   result: FoodBakedCookie
   time: 5
   group: BarsAndCookies
@@ -1490,7 +1493,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSugarCookie
-  name: sugar cookie recipe
+  name: microwave-meal-recipe-sugar-cookie-name
   result: FoodBakedCookieSugar
   time: 5
   group: BarsAndCookies
@@ -1502,7 +1505,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeRaisinCookie
-  name: raisin cookie recipe
+  name: microwave-meal-recipe-raisin-cookie-name
   result: FoodBakedCookieRaisin
   time: 5
   group: BarsAndCookies
@@ -1514,7 +1517,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCookieOatmeal
-  name: oatmeal cookie recipe
+  name: microwave-meal-recipe-cookie-oatmeal-name
   result: FoodBakedCookieOatmeal
   time: 5
   group: BarsAndCookies
@@ -1526,7 +1529,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeChocolateChipPancake
-  name: chocolate chip pancake recipe
+  name: microwave-meal-recipe-chocolate-chip-pancake-name
   result: FoodBakedPancakeCc
   time: 5
   group: BarsAndCookies
@@ -1539,7 +1542,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAppleCake
-  name: apple cake recipe
+  name: microwave-meal-recipe-apple-cake-name
   result: FoodCakeApple
   time: 5
   group: Cake
@@ -1549,7 +1552,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCarrotCake
-  name: carrot cake recipe
+  name: microwave-meal-recipe-carrot-cake-name
   result: FoodCakeCarrot
   time: 5
   group: Cake
@@ -1559,7 +1562,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeLemonCake
-  name: lemon cake recipe
+  name: microwave-meal-recipe-lemon-cake-name
   result: FoodCakeLemon
   time: 5
   group: Cake
@@ -1569,10 +1572,11 @@
 
 - type: microwaveMealRecipe
   id: RecipeLemoonCake
-  name: lemoon cake recipe
+  name: microwave-meal-recipe-lemoon-cake-name
   result: FoodCakeLemoon
   time: 5
   group: Cake
+  priority: 1 # Otherwise it breaks because of the berry cake recipe at higher portion counts
   solids:
     FoodCakePlain: 1
     FoodLemoon: 1
@@ -1580,7 +1584,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeOrangeCake
-  name: orange cake recipe
+  name: microwave-meal-recipe-orange-cake-name
   result: FoodCakeOrange
   time: 5
   group: Cake
@@ -1590,7 +1594,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBlueberryCake
-  name: blueberry cake recipe
+  name: microwave-meal-recipe-blueberry-cake-name
   result: FoodCakeBlueberry
   time: 5
   group: Cake
@@ -1600,7 +1604,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeLimeCake
-  name: lime cake recipe
+  name: microwave-meal-recipe-lime-cake-name
   result: FoodCakeLime
   time: 5
   group: Cake
@@ -1610,7 +1614,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCheeseCake
-  name: cheese cake recipe
+  name: microwave-meal-recipe-cheese-cake-name
   result: FoodCakeCheese
   time: 5
   group: Cake
@@ -1622,7 +1626,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePumpkinCake
-  name: pumpkin cake recipe
+  name: microwave-meal-recipe-pumpkin-cake-name
   result: FoodCakePumpkin
   time: 5
   group: Cake
@@ -1632,7 +1636,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeClownCake
-  name: clown cake recipe
+  name: microwave-meal-recipe-clown-cake-name
   result: FoodCakeClown
   time: 5
   group: Cake
@@ -1642,7 +1646,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCake
-  name: cake recipe
+  name: microwave-meal-recipe-cake-name
   result: FoodCakePlain
   time: 15
   group: Cake
@@ -1651,7 +1655,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBirthdayCake
-  name: birthday cake recipe
+  name: microwave-meal-recipe-birthday-cake-name
   result: FoodCakeBirthday
   time: 5
   group: Cake
@@ -1662,7 +1666,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeChocolateCake
-  name: chocolate cake recipe
+  name: microwave-meal-recipe-chocolate-cake-name
   result: FoodCakeChocolate
   time: 5
   group: Cake
@@ -1672,7 +1676,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBrainCake
-  name: brain cake recipe
+  name: microwave-meal-recipe-brain-cake-name
   result: FoodCakeBrain
   time: 15
   group: Cake
@@ -1682,7 +1686,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeSlimeCake
-  name: slime cake recipe
+  name: microwave-meal-recipe-slime-cake-name
   result: FoodCakeSlime
   time: 5
   group: Cake
@@ -1693,7 +1697,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCatCake
-  name: cat cake recipe
+  name: microwave-meal-recipe-cat-cake-name
   result: MobCatCake
   time: 15
   group: Cake
@@ -1707,7 +1711,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBerryDelight
-  name: berry delight recipe
+  name: microwave-meal-recipe-berry-delight-name
   result: FoodCakeBerryDelight
   time: 5
   group: Cake
@@ -1719,7 +1723,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBreadDog
-  name: bread dog recipe
+  name: microwave-meal-recipe-bread-dog-name
   result: MobBreadDog
   time: 15
   group: Breads
@@ -1732,7 +1736,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDumplings
-  name: dumplings recipe
+  name: microwave-meal-recipe-dumplings-name
   result: FoodBakedDumplings
   time: 15
   group: Savory
@@ -1744,7 +1748,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBrownies
-  name: brownie recipe
+  name: microwave-meal-recipe-brownies-name
   result: FoodBakedBrownieBatch
   time: 25
   group: BarsAndCookies
@@ -1759,7 +1763,7 @@
 #Donks i guess
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocket
-  name: warm donk pocket recipe
+  name: microwave-meal-recipe-warm-donkpocket-name
   result: FoodDonkpocketWarm
   time: 5
   group: Savory
@@ -1768,7 +1772,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWarmDankpocket
-  name: warm dank pocket recipe
+  name: microwave-meal-recipe-warm-dankpocket-name
   result: FoodDonkpocketDankWarm
   time: 5
   group: Savory
@@ -1777,7 +1781,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketSpicy
-  name: warm spicy donk-pocket recipe
+  name: microwave-meal-recipe-warm-donkpocket-spicy-name
   result: FoodDonkpocketSpicyWarm
   time: 5
   group: Savory
@@ -1786,7 +1790,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketTeriyaki
-  name: warm teriyaki-pocket recipe
+  name: microwave-meal-recipe-warm-donkpocket-teriyaki-name
   result: FoodDonkpocketTeriyakiWarm
   time: 5
   group: Savory
@@ -1795,7 +1799,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWarmDonkpocketPizza
-  name: warm pizza-pocket recipe
+  name: microwave-meal-recipe-warm-donkpocket-pizza-name
   result: FoodDonkpocketPizzaWarm
   time: 5
   group: Savory
@@ -1804,7 +1808,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketHonk
-  name: warm honk-pocket recipe
+  name: microwave-meal-recipe-donkpocket-honk-name
   result: FoodDonkpocketHonkWarm
   time: 5
   group: Savory
@@ -1813,7 +1817,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketBerry
-  name: warm berry-pocket recipe
+  name: microwave-meal-recipe-donkpocket-berry-name
   result: FoodDonkpocketBerryWarm
   time: 5
   group: Savory
@@ -1822,7 +1826,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketStonk
-  name: warm stonk-pocket recipe
+  name: microwave-meal-recipe-donkpocket-stonk-name
   result: FoodDonkpocketStonkWarm
   time: 5
   group: Savory
@@ -1831,7 +1835,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketCarp
-  name: warm carp-pocket recipe
+  name: microwave-meal-recipe-donkpocket-carp-name
   result: FoodDonkpocketCarpWarm
   time: 5
   group: Savory
@@ -1840,7 +1844,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDonkpocketMoth
-  name: warm moth-pocket recipe
+  name: microwave-meal-recipe-donkpocket-moth-name
   result: FoodDonkpocketMothWarm
   time: 5
   solids:
@@ -1848,7 +1852,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeHotChili
-  name: hot chili recipe
+  name: microwave-meal-recipe-hot-chili-name
   result: FoodSoupChiliHot
   time: 20
   group: Soup
@@ -1861,7 +1865,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeColdChili
-  name: cold chili recipe
+  name: microwave-meal-recipe-cold-chili-name
   result: FoodSoupChiliCold
   time: 5
   group: Soup
@@ -1872,7 +1876,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeClownTears
-  name: clown's tears recipe
+  name: microwave-meal-recipe-clown-tears-name
   result: FoodSoupClown
   time: 15
   group: Soup
@@ -1884,7 +1888,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeChiliClown
-  name: chili con carnival recipe
+  name: microwave-meal-recipe-chili-clown-name
   result: FoodSoupChiliClown
   time: 30
   group: Soup
@@ -1898,20 +1902,19 @@
 
 - type: microwaveMealRecipe
   id: RecipeQueso
-  name: queso recipe
+  name: microwave-meal-recipe-queso-name
   result: FoodMealQueso
   time: 15
   group: Soup
-  #todo Add blackpepper
-  #reagents:
-    #blackpepper: 5
+  reagents:
+    Blackpepper: 5
   solids:
     FoodChiliPepper: 1
     FoodCheeseSlice: 2
 
 - type: microwaveMealRecipe
   id: RecipeRibs
-  name: BBQ ribs recipe
+  name: microwave-meal-recipe-ribs-name
   result: FoodMealRibs
   time: 15
   group: Savory
@@ -1923,7 +1926,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeEnchiladas
-  name: enchiladas recipe
+  name: microwave-meal-recipe-enchiladas-name
   result: FoodMealEnchiladas
   time: 20
   group: Savory
@@ -1935,7 +1938,7 @@
 # SALADS: These should be moved out of the microwave as soon as possible
 - type: microwaveMealRecipe
   id: RecipeHerbSalad
-  name: herb salad recipe
+  name: microwave-meal-recipe-herb-salad-name
   result: FoodSaladHerb
   time: 5
   group: Salad
@@ -1946,7 +1949,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeValidSalad
-  name: valid salad recipe
+  name: microwave-meal-recipe-valid-salad-name
   result: FoodSaladValid
   time: 5
   group: Salad
@@ -1958,7 +1961,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeColeslaw
-  name: coleslaw recipe
+  name: microwave-meal-recipe-coleslaw-name
   result: FoodSaladColeslaw
   time: 5
   group: Salad
@@ -1971,7 +1974,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCaesarSalad
-  name: caesar salad recipe
+  name: microwave-meal-recipe-caesar-salad-name
   result: FoodSaladCaesar
   time: 5
   group: Salad
@@ -1986,7 +1989,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCitrusSalad
-  name: citrus salad recipe
+  name: microwave-meal-recipe-citrus-salad-name
   result: FoodSaladCitrus
   time: 5
   group: Salad
@@ -1998,7 +2001,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeKimchiSalad
-  name: kimchi salad recipe
+  name: microwave-meal-recipe-kimchi-salad-name
   result: FoodSaladKimchi
   time: 5
   group: Salad
@@ -2012,7 +2015,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFruitSalad
-  name: fruit salad recipe
+  name: microwave-meal-recipe-fruit-salad-name
   result: FoodSaladFruit
   time: 5
   group: Salad
@@ -2025,7 +2028,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeJungleSalad
-  name: jungle salad recipe
+  name: microwave-meal-recipe-jungle-salad-name
   result: FoodSaladJungle
   time: 5
   group: Salad
@@ -2038,7 +2041,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeWatermelonFruitBowlSalad
-  name: watermelon fruit bowl recipe
+  name: microwave-meal-recipe-watermelon-fruit-bowl-salad-name
   result: FoodSaladWatermelonFruitBowl
   time: 5
   group: Salad
@@ -2054,7 +2057,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMuffin
-  name: muffin recipe
+  name: microwave-meal-recipe-muffin-name
   result: FoodBakedMuffin
   time: 15
   group: Dessert
@@ -2066,7 +2069,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMuffinChocolate
-  name: chocolate muffin recipe
+  name: microwave-meal-recipe-muffin-chocolate-name
   result: FoodBakedMuffinChocolate
   time: 15
   group: Dessert
@@ -2079,7 +2082,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMuffinBerry
-  name: berry muffin recipe
+  name: microwave-meal-recipe-muffin-berry-name
   result: FoodBakedMuffinBerry
   time: 15
   group: Dessert
@@ -2092,7 +2095,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMuffinBanana
-  name: banana muffin recipe
+  name: microwave-meal-recipe-muffin-banana-name
   result: FoodBakedMuffinBanana
   time: 15
   group: Dessert
@@ -2105,7 +2108,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMuffinCherry
-  name: cherry muffin recipe
+  name: microwave-meal-recipe-muffin-cherry-name
   result: FoodBakedMuffinCherry
   time: 15
   group: Dessert
@@ -2120,7 +2123,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDriedTeaLeaves
-  name: dried tea leaves recipe
+  name: microwave-meal-recipe-dried-tea-leaves-name
   result: LeavesTeaDried
   time: 10
   solids:
@@ -2128,7 +2131,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDriedTobacco
-  name: dried tobacco leaves recipe
+  name: microwave-meal-recipe-dried-tobacco-name
   result: LeavesTobaccoDried
   time: 10
   group: Medicinal
@@ -2137,7 +2140,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDriedCannabis
-  name: dried cannabis leaves recipe
+  name: microwave-meal-recipe-dried-cannabis-name
   result: LeavesCannabisDried
   time: 10
   group: Medicinal
@@ -2146,7 +2149,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeDriedCannabisRainbow
-  name: dried rainbow cannabis leaves recipe
+  name: microwave-meal-recipe-dried-cannabis-rainbow-name
   result: LeavesCannabisRainbowDried
   time: 10
   group: Medicinal
@@ -2155,7 +2158,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTrashBakedBananaPeel
-  name: baked banana peel recipe
+  name: microwave-meal-recipe-trash-baked-banana-peel-name
   result: TrashBakedBananaPeel
   time: 5
   solids:
@@ -2164,7 +2167,7 @@
 # Suppermatter
 - type: microwaveMealRecipe
   id: RecipeSuppermatter
-  name: suppermatter recipe
+  name: microwave-meal-recipe-suppermatter-name
   result: FoodCakeSuppermatter
   time: 30
   solids:
@@ -2176,7 +2179,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFoodBakedChevreChaud
-  name: chevre chaud recipe
+  name: microwave-meal-recipe-food-baked-chevre-chaud-name
   result: FoodBakedChevreChaud
   time: 5
   group: Savory
@@ -2186,7 +2189,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeFoodBakedChevreChaudCotton
-  name: cotton chevre chaud recipe
+  name: microwave-meal-recipe-food-baked-chevre-chaud-cotton-name
   result: FoodBakedChevreChaudCotton
   time: 5
   group: Moth
@@ -2196,7 +2199,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCannabisButter
-  name: cannabis butter recipe
+  name: microwave-meal-recipe-cannabis-butter-name
   result: FoodCannabisButter
   time: 15
   solids:
@@ -2205,7 +2208,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCannabisBrownies
-  name: cannabis brownie recipe
+  name: microwave-meal-recipe-cannabis-brownies-name
   result: FoodBakedCannabisBrownieBatch
   time: 25
   group: BarsAndCookies
@@ -2219,7 +2222,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCornInButter
-  name: corn in butter recipe
+  name: microwave-meal-recipe-corn-in-butter-name
   result: FoodMealCornInButter
   time: 10
   group: Savory
@@ -2230,7 +2233,7 @@
 
 - type: microwaveMealRecipe
   id: RecipePeaSoup
-  name: pea soup recipe
+  name: microwave-meal-recipe-pea-soup-name
   result: FoodSoupPea
   time: 10
   group: Soup
@@ -2242,16 +2245,16 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoShell
-  name: taco shell recipe
+  name: microwave-meal-recipe-taco-shell-name
   result: FoodTacoShell
   time: 5
   group: Breads
   solids:
-    FoodDoughTortillaFlat: 1 # one eighth a standard bread dough recipe
+    FoodDoughTortillaFlat: 1 # one eighth of a standard bread dough recipe
 
 - type: microwaveMealRecipe
   id: RecipeTacoBeef
-  name: beef taco recipe
+  name: microwave-meal-recipe-taco-beef-name
   result: FoodTacoBeef
   time: 10
   group: Savory
@@ -2262,7 +2265,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoChicken
-  name: chicken taco recipe
+  name: microwave-meal-recipe-taco-chicken-name
   result: FoodTacoChicken
   time: 10
   group: Savory
@@ -2273,7 +2276,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoFish
-  name: fish taco recipe
+  name: microwave-meal-recipe-taco-fish-name
   result: FoodTacoFish
   time: 10
   group: Savory
@@ -2286,7 +2289,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoRat
-  name: rat taco recipe
+  name: microwave-meal-recipe-taco-rat-name
   result: FoodTacoRat
   time: 10
   group: Savory
@@ -2297,7 +2300,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoBeefSupreme
-  name: beef taco supreme recipe
+  name: microwave-meal-recipe-taco-beef-supreme-name
   result: FoodTacoBeefSupreme
   time: 10
   group: Savory
@@ -2311,7 +2314,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoChickenSupreme
-  name: beef taco supreme recipe
+  name: microwave-meal-recipe-taco-chicken-supreme-name
   result: FoodTacoChickenSupreme
   time: 10
   group: Savory
@@ -2325,7 +2328,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeTacoDragon
-  name: draco recipe
+  name: microwave-meal-recipe-taco-dragon-name
   result: FoodTacoDragon
   time: 10
   group: Savory
@@ -2336,7 +2339,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCroissant
-  name: croissant recipe
+  name: microwave-meal-recipe-croissant-name
   result: FoodBakedCroissant
   time: 5
   group: Dessert
@@ -2346,7 +2349,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCroissantCotton
-  name: cotton croissant recipe
+  name: microwave-meal-recipe-croissant-cotton-name
   result: FoodBakedCroissantCotton
   time: 5
   group: Moth
@@ -2356,7 +2359,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeThrowingCroissant
-  name: throwing croissant recipe
+  name: microwave-meal-recipe-throwing-croissant-name
   result: WeaponCroissant
   secretRecipe: true
   time: 5
@@ -2368,7 +2371,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeInertAnomalyMeat
-  name: inert meat anomaly recipe
+  name: microwave-meal-recipe-inert-anomaly-meat-name
   result: FoodMeatAnomaly
   time: 5
   group: Savory
@@ -2377,7 +2380,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAnomalyMeat
-  name: meat anomaly recipe
+  name: microwave-meal-recipe-anomaly-meat-name
   result: FoodMeatAnomaly
   time: 5
   group: Savory
@@ -2386,7 +2389,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeAnomalyMeatCooked
-  name: cooked meat anomaly recipe
+  name: microwave-meal-recipe-anomaly-meat-cooked-name
   result: FoodMeatAnomalyCooked
   time: 5
   group: Savory
@@ -2395,7 +2398,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGrilledCheeseSandwich
-  name: grilled cheese sandwich recipe
+  name: microwave-meal-recipe-grilled-cheese-sandwich-name
   result: FoodBakedGrilledCheeseSandwich
   time: 10
   group: Savory
@@ -2406,7 +2409,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeGrilledCheeseSandwichCotton
-  name: cotton grilled cheese sandwich recipe
+  name: microwave-meal-recipe-grilled-cheese-sandwich-cotton-name
   result: FoodBakedGrilledCheeseSandwichCotton
   time: 10
   group: Moth
@@ -2417,7 +2420,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBreakfastAmerican
-  name: full american breakfast recipe
+  name: microwave-meal-recipe-breakfast-american-name
   result: FoodBreakfastAmerican
   time: 30
   group: Savory
@@ -2430,7 +2433,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBreakfastEnglish
-  name: full english breakfast recipe
+  name: microwave-meal-recipe-breakfast-english-name
   result: FoodBreakfastEnglish
   time: 30
   group: Savory
@@ -2444,7 +2447,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeMoproach # TODO: Move this to be an actual surgery instead, once surgery gets implemented.
-  name: moproach recipe
+  name: microwave-meal-recipe-moproach-name
   result: MobMoproach
   time: 30
   group: Other
@@ -2457,7 +2460,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeCottonCake
-  name: cotton cake recipe
+  name: microwave-meal-recipe-cotton-cake-name
   result: FoodCakeCotton
   time: 5
   group: Moth
diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
index 206ab848f6..f24f3bd96f 100644
--- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -1,6 +1,6 @@
 - type: microwaveMealRecipe
   id: RecipeAloeCream
-  name: aloe cream recipe
+  name: microwave-meal-recipe-aloe-cream-name
   result: AloeCream
   time: 10
   group: Medicinal
@@ -9,28 +9,30 @@
 
 - type: microwaveMealRecipe
   id: RecipeMedicatedSuture
-  name: medicated suture recipe
+  name: microwave-meal-recipe-medicated-suture-name
   result: MedicatedSuture
   time: 10
   group: Medicinal
   solids:
     FoodPoppy: 1
-    Brutepack: 1
-    MaterialCloth1: 1
+  stacks:
+    Brutepack: 10
+    Cloth: 1
   reagents:
     TranexamicAcid: 20
     Cryptobiolin: 20
 
 - type: microwaveMealRecipe
   id: RecipeRegenerativeMesh
-  name: regenerative mesh recipe
+  name: microwave-meal-recipe-regenerative-mesh-name
   result: RegenerativeMesh
   time: 10
   group: Medicinal
   solids:
     FoodAloe: 1
-    Ointment: 1
-    MaterialCloth1: 1
+  stacks:
+    Ointment: 10
+    Cloth: 1
   reagents:
     Sigynate: 20
     Dermaline: 20

From e79071dd584fca220b247e2629d1398521027eb5 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:07:47 +0000
Subject: [PATCH 48/69] Cleanup surveillance camera viewer lifecycle (bugfix
 for mothership core console) (#45928)

* SurveillanceCameraMonitorSystem: add on BUIOpen

* AfterOpenUserInterface is kill
---
 .../SurveillanceCameraMonitorSystem.cs        | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
index ce3bb5aba0..1a022b4ff9 100644
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
@@ -4,10 +4,8 @@ using Content.Shared.DeviceNetwork;
 using Content.Shared.DeviceNetwork.Events;
 using Content.Shared.DeviceNetwork.Systems;
 using Content.Shared.Power;
-using Content.Shared.UserInterface;
 using Content.Shared.SurveillanceCamera;
 using Robust.Server.GameObjects;
-using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.SurveillanceCamera;
@@ -26,7 +24,6 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<SurveillanceCameraMonitorComponent, ComponentStartup>(OnComponentStartup);
-        SubscribeLocalEvent<SurveillanceCameraMonitorComponent, AfterActivatableUIOpenEvent>(OnToggleInterface);
         Subs.BuiEvents<SurveillanceCameraMonitorComponent>(SurveillanceCameraMonitorUiKey.Key, subs =>
         {
             subs.Event<SurveillanceCameraRefreshCamerasMessage>(OnRefreshCamerasMessage);
@@ -35,6 +32,7 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
             subs.Event<SurveillanceCameraMonitorSubnetRequestMessage>(OnSubnetRequest);
             subs.Event<SurveillanceCameraMonitorSwitchMessage>(OnSwitchMessage);
             subs.Event<BoundUIClosedEvent>(OnBoundUiClose);
+            subs.Event<BoundUIOpenedEvent>(OnBoundUiOpen);
         });
     }
 
@@ -183,19 +181,17 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         RemoveActiveCamera(uid, component);
     }
 
-
-    private void OnToggleInterface(EntityUid uid, SurveillanceCameraMonitorComponent component,
-        AfterActivatableUIOpenEvent args)
-    {
-        AfterOpenUserInterface(uid, args.User, component);
-    }
-
     // This is to ensure that there's no delay in ensuring that a camera is deactivated.
     private void OnSurveillanceCameraDeactivate(EntityUid uid, SurveillanceCameraMonitorComponent monitor, SurveillanceCameraDeactivateEvent args)
     {
         DisconnectCamera(uid, false, monitor);
     }
 
+    private void OnBoundUiOpen(EntityUid uid, SurveillanceCameraMonitorComponent component, BoundUIOpenedEvent args)
+    {
+        AddViewer(uid, args.Actor, component);
+    }
+
     private void OnBoundUiClose(EntityUid uid, SurveillanceCameraMonitorComponent component, BoundUIClosedEvent args)
     {
         RemoveViewer(uid, args.Actor, component);
@@ -445,19 +441,6 @@ public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem
         UpdateUserInterface(uid, monitor);
     }
 
-    // This is public primarily because it might be useful to have the ability to
-    // have this component added to any entity, and have them open the BUI (somehow).
-    public void AfterOpenUserInterface(EntityUid uid, EntityUid player, SurveillanceCameraMonitorComponent? monitor = null, ActorComponent? actor = null)
-    {
-        if (!Resolve(uid, ref monitor)
-            || !Resolve(player, ref actor))
-        {
-            return;
-        }
-
-        AddViewer(uid, player);
-    }
-
     private void UpdateUserInterface(EntityUid uid, SurveillanceCameraMonitorComponent? monitor = null, EntityUid? player = null)
     {
         if (!Resolve(uid, ref monitor))

From 39bb4f68376f55e5c83ea90851a715b30b1e2e79 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:15:22 +0000
Subject: [PATCH 49/69] Cleanup tesla coil & grounding rod (#45968)

---
 .../Power/Generation/Tesla/coil.yml           | 44 +++++--------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
index aed8746e78..8cbf2ff3ca 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml
@@ -1,15 +1,9 @@
 - type: entity
-  parent: BaseStructureHealth
+  parent: [BaseStructure, BaseStructureHealth]
   id: TeslaCoil
   name: tesla coil
   description: A machine that converts lightning strikes into an electric current.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
   - type: Fixtures
     fixtures:
       fix1:
@@ -23,14 +17,13 @@
         - MachineLayer
   - type: Sprite
     sprite: Structures/Power/Generation/Tesla/coil.rsi
-    snapCardinals: true
     noRot: true
     layers:
-      - state: coil
-        map: ["enabled"]
-      - state: coilhit
-        visible: false
-        map: ["hit"]
+    - state: coil
+      map: ["enabled"]
+    - state: coilhit
+      visible: false
+      map: ["hit"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -82,9 +75,6 @@
     usesApcPower: false
     highVoltageNode: input
   - type: Anchorable
-  - type: Rotatable
-  - type: Pullable
-  - type: Clickable
   - type: InteractionOutline
   - type: ExaminableDamage
     messages: WindowMessages
@@ -117,17 +107,11 @@
     - SingularityTeslaEngine
 
 - type: entity
-  parent: BaseStructureHealth
+  parent: [BaseStructure, BaseStructureHealth]
   id: TeslaGroundingRod
   name: grounding rod
   description: A machine that keeps lightning from striking too far away.
-  placement:
-    mode: SnapgridCenter
   components:
-  - type: Transform
-    anchored: true
-  - type: Physics
-    bodyType: Static
   - type: Fixtures
     fixtures:
       fix1:
@@ -142,13 +126,12 @@
   - type: Sprite
     sprite: Structures/Power/Generation/Tesla/coil.rsi
     noRot: true
-    snapCardinals: true
     layers:
-      - state: grounding_rod
-        map: ["power"]
-      - state: grounding_rodhit
-        visible: false
-        map: ["hit"]
+    - state: grounding_rod
+      map: ["power"]
+    - state: grounding_rodhit
+      visible: false
+      map: ["hit"]
   - type: Appearance
   - type: GenericVisualizer
     visuals:
@@ -167,9 +150,6 @@
     lightningExplode: false
     damageFromLightning: 0
   - type: Anchorable
-  - type: Rotatable
-  - type: Pullable
-  - type: Clickable
   - type: InteractionOutline
   - type: ExaminableDamage
     messages: WindowMessages

From 601cf7928f11f0136eec53154582c218e3bb7cb8 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:41:18 +0000
Subject: [PATCH 50/69] Bugfix: Direction in SandboxSystem copy is grid-local
 if possible. (#45982)

* Fix SandboxSystem rotation

* format

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 Content.Client/Sandbox/SandboxSystem.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index 18bcc51f2f..5c5bb6d848 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -103,7 +103,13 @@ namespace Content.Client.Sandbox
                 if (_placement.Eraser)
                     _placement.ToggleEraser();
 
-                _placement.Direction = _transform.GetWorldRotation(uid).GetCardinalDir();
+                // Get the rotation of the object to copy relative to its grid (if it exists) or the map.
+                var xform = Transform(uid);
+                var targetRotation = _transform.GetWorldRotation(xform);
+                if (TryComp<TransformComponent>(xform.GridUid, out var gridXform))
+                    targetRotation -= gridXform.LocalRotation;
+
+                _placement.Direction = targetRotation.GetCardinalDir();
 
                 _placement.BeginPlacing(new()
                 {

From d9ffbf1d0306ed055ec2999df1938f778b6937a3 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:45:37 +0000
Subject: [PATCH 51/69] Cleanup: AppearanceSystem.TryGetData to
 AppearanceChangeEvent.TryGetData (#45373)

* First impl. of appearance TryGetData cleanup

* Handful of fixes

* DamageVisuals: fix HandleDamage call, inheritdoc

* bunch of unused AppearanceSystem instances

* Handful more unused appearance systems, inheritdoc

* JetpackSystem: Ent<T>

* cleanup roundup, more Ent<T>

* a few lingering AppearanceSystem.TryGetData calls

* more lingering AppearanceData access

* Remove unnecessary inheritdoc

* once again, with feeling
---
 .../Actions/ActionIconVisualsSystem.cs        |   5 +-
 .../AlertLevel/AlertLevelDisplaySystem.cs     |  10 +-
 .../Anomaly/AnomalyScannerSystem.cs           |  13 ++-
 Content.Client/Anomaly/AnomalySystem.cs       |   4 +-
 .../AtmosPipeAppearanceSystem.cs              |   4 +-
 .../EntitySystems/AtmosPipeLayersSystem.cs    |  15 +--
 .../GasCanisterAppearanceSystem.cs            |   4 +-
 .../EntitySystems/MaxPressureVisualsSystem.cs |  27 ++---
 .../PipeColorVisualizerSystem.cs              |  16 +--
 .../Monitor/AtmosAlarmableVisualsSystem.cs    |   8 +-
 .../PortableScrubberVisualsSystem.cs          |   6 +-
 Content.Client/Audio/Jukebox/JukeboxSystem.cs |   5 +-
 .../BarSign/BarSignVisualizerSystem.cs        |   4 +-
 Content.Client/Botany/PotencyVisualsSystem.cs |  12 +--
 Content.Client/Buckle/BuckleSystem.cs         |   2 +-
 .../TypingIndicatorVisualizerSystem.cs        |   2 +-
 .../Visualizers/SmokeVisualizerSystem.cs      |   2 +-
 .../SolutionContainerVisualsSystem.cs         |  15 +--
 .../Visualizers/VaporVisualizerSystem.cs      |   4 +-
 Content.Client/Construction/FlatpackSystem.cs |   2 +-
 Content.Client/Damage/DamageVisualsSystem.cs  | 102 +++++++++---------
 .../DamageStateVisualizerSystem.cs            |  16 ++-
 .../Delivery/DeliveryVisualizerSystem.cs      |   4 +-
 .../Disposal/Unit/DisposalUnitSystem.cs       |  27 +----
 Content.Client/Doors/AirlockSystem.cs         |  14 ++-
 Content.Client/Doors/DoorSystem.cs            |   4 +-
 Content.Client/Doors/FirelockSystem.cs        |   7 +-
 .../ElectrocutionHUDVisualizerSystem.cs       |   2 +-
 Content.Client/Ensnaring/EnsnareableSystem.cs |  18 ++--
 .../ClusterGrenadeVisualizerSystem.cs         |   3 +-
 Content.Client/Fax/System/FaxVisualsSystem.cs |  39 +++----
 Content.Client/Fluids/PuddleSystem.cs         |  21 ++--
 Content.Client/Gravity/GravitySystem.cs       |   4 +-
 Content.Client/Holiday/HolidaySystem.cs       |   2 +-
 .../ClientRandomIconSmoothSystem.cs           |  11 +-
 Content.Client/Kudzu/KudzuVisualizerSystem.cs |  14 ++-
 Content.Client/Lathe/LatheSystem.cs           |   4 +-
 .../EntitySystems/EmergencyLightSystem.cs     |   4 +-
 .../EntitySystems/ExpendableLightSystem.cs    |   4 +-
 .../Light/EntitySystems/LightBulbSystem.cs    |  22 ++--
 Content.Client/Light/HandheldLightSystem.cs   |  50 ++++-----
 .../PoweredLightVisualizerSystem.cs           |   4 +-
 .../Lock/Visualizers/LockVisualizerSystem.cs  |   8 +-
 .../Materials/MaterialStorageSystem.cs        |   3 +-
 .../Materials/RecyclerVisualizerSystem.cs     |   6 +-
 .../Mech/MechAssemblyVisualizerSystem.cs      |   2 +-
 Content.Client/Mech/MechSystem.cs             |  28 ++---
 .../Medical/Cryogenics/CryoPodSystem.cs       |  18 +---
 .../Movement/Systems/JetpackSystem.cs         |  15 +--
 Content.Client/PDA/PdaVisualizerSystem.cs     |   6 +-
 Content.Client/Paper/PaperVisualizerSystem.cs |   4 +-
 ...ParticleAcceleratorPartVisualizerSystem.cs |   2 +-
 .../Power/APC/ApcVisualizerSystem.cs          |   4 +-
 Content.Client/Power/SMES/SmesSystem.cs       |   4 +-
 .../Visualizers/CableVisualizerSystem.cs      |  19 ++--
 .../PowerCell/PowerChargerVisualizerSystem.cs |   4 +-
 Content.Client/Revenant/RevenantSystem.cs     |  32 ++----
 .../Rotation/RotationVisualizerSystem.cs      |  18 +---
 Content.Client/Shuttles/ThrusterSystem.cs     |   8 +-
 Content.Client/Silicons/Borgs/BorgSystem.cs   |  28 ++---
 .../Silicons/StationAi/StationAiSystem.cs     |  13 ++-
 .../Singularity/Systems/EmitterSystem.cs      |  30 ++----
 .../Visualizers/RadiationCollectorSystem.cs   |   2 +-
 .../Smoking/BurnStateVisualizerSystem.cs      |   2 +-
 Content.Client/Sprite/ScaleVisualsSystem.cs   |  16 +--
 Content.Client/Stack/StackSystem.cs           |  10 +-
 .../StationTeleporterSystem.cs                |  11 +-
 .../Visualizers/StickyVisualizerSystem.cs     |  10 +-
 .../Storage/Systems/ItemCounterSystem.cs      |  25 ++---
 .../Systems/StorageContainerVisualsSystem.cs  |   4 +-
 .../EntityStorageVisualizerSystem.cs          |  89 ++++++++-------
 .../StorageFillVisualizerSystem.cs            |   3 +-
 Content.Client/SubFloor/SubFloorHideSystem.cs |  16 +--
 .../SurveillanceCameraVisualsSystem.cs        |   5 +-
 Content.Client/Tabletop/TabletopSystem.cs     |  15 +--
 .../Toggleable/ToggleableVisualsSystem.cs     |   4 +-
 .../Visualizers/WeldableVisualizerSystem.cs   |   2 +-
 .../Systems/TimerTriggerVisualizerSystem.cs   |   9 +-
 .../Turrets/DeployableTurretSystem.cs         |   2 +-
 .../Systems/GunSystem.ChamberMagazine.cs      |   2 +-
 .../Systems/GunSystem.MagazineVisuals.cs      |  52 +++++----
 .../Ranged/Systems/GunSystem.SpentAmmo.cs     |   5 +-
 .../Visualizers/WiresVisualizerSystem.cs      |   3 +-
 .../RandomArtifactSpriteSystem.cs             |   6 +-
 84 files changed, 430 insertions(+), 651 deletions(-)

diff --git a/Content.Client/Actions/ActionIconVisualsSystem.cs b/Content.Client/Actions/ActionIconVisualsSystem.cs
index fdaceecc4e..da1a2c6105 100644
--- a/Content.Client/Actions/ActionIconVisualsSystem.cs
+++ b/Content.Client/Actions/ActionIconVisualsSystem.cs
@@ -7,12 +7,13 @@ namespace Content.Client.Actions;
 
 public sealed partial class ActionIconVisualsSystem : VisualizerSystem<ActionComponent>
 {
+    /// <inheritdoc/>
     protected override void OnAppearanceChange(EntityUid uid, ActionComponent comp, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<SpriteSpecifier>(uid, ActionState.DynamicIcon, out var icon, args.Component))
+        if (args.TryGetData<SpriteSpecifier>(ActionState.DynamicIcon, out var icon))
         {
             if (icon is SpriteSpecifier.EntityPrototype)
                 SpriteSystem.LayerSetTexture((uid, args.Sprite), ActionVisuals.Icon, SpriteSystem.Frame0(icon));
@@ -20,7 +21,7 @@ public sealed partial class ActionIconVisualsSystem : VisualizerSystem<ActionCom
                 SpriteSystem.LayerSetSprite((uid, args.Sprite), ActionVisuals.Icon, icon);
         }
 
-        if (AppearanceSystem.TryGetData<Color>(uid, ActionState.Color, out var color, args.Component))
+        if (args.TryGetData<Color>(ActionState.Color, out var color))
         {
             SpriteSystem.LayerSetColor((uid, args.Sprite), ActionVisuals.Icon, color);
 
diff --git a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
index b366ef6207..50f75157d5 100644
--- a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs
@@ -8,23 +8,19 @@ namespace Content.Client.AlertLevel;
 public sealed partial class AlertLevelDisplaySystem : EntitySystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
 
     [SubscribeLocalEvent]
     private void OnAppearanceChange(EntityUid uid, AlertLevelDisplayComponent alertLevelDisplay, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
-        {
             return;
-        }
+
         var layer = _sprite.LayerMapReserve((uid, args.Sprite), AlertLevelDisplay.Layer);
 
-        if (_appearance.TryGetData<bool>(uid, AlertLevelDisplay.Powered, out var powered, component: args.Component))
-        {
+        if (args.TryGetData<bool>(AlertLevelDisplay.Powered, out var powered))
             _sprite.LayerSetVisible((uid, args.Sprite), layer, powered);
-        }
 
-        if (!_appearance.TryGetData<ProtoId<AlertLevelPrototype>>(uid, AlertLevelDisplay.CurrentLevel, out var level, component: args.Component))
+        if (!args.TryGetData<ProtoId<AlertLevelPrototype>>(AlertLevelDisplay.CurrentLevel, out var level))
         {
             _sprite.LayerSetRsiState((uid, args.Sprite), layer, alertLevelDisplay.AlertVisuals.Values.First());
             return;
diff --git a/Content.Client/Anomaly/AnomalyScannerSystem.cs b/Content.Client/Anomaly/AnomalyScannerSystem.cs
index f30a213977..1145217d76 100644
--- a/Content.Client/Anomaly/AnomalyScannerSystem.cs
+++ b/Content.Client/Anomaly/AnomalyScannerSystem.cs
@@ -34,7 +34,7 @@ public sealed partial class AnomalyScannerSystem : SharedAnomalyScannerSystem
 
     private void OnComponentInit(Entity<AnomalyScannerScreenComponent> ent, ref ComponentInit args)
     {
-        if(!_sprite.TryGetLayer(ent.Owner, AnomalyScannerVisualLayers.Base, out var layer, true))
+        if (!_sprite.TryGetLayer(ent.Owner, AnomalyScannerVisualLayers.Base, out var layer, true))
             return;
 
         // Allocate the OwnedTexture
@@ -70,9 +70,8 @@ public sealed partial class AnomalyScannerSystem : SharedAnomalyScannerSystem
         if (args.Sprite is null || ent.Comp.ScreenTexture is null || ent.Comp.BarBuf is null)
             return;
 
-        args.AppearanceData.TryGetValue(AnomalyScannerVisuals.AnomalySeverity, out var severityObj);
-        if (severityObj is not float severity)
-            severity = 0;
+        if (!args.TryGetData<float>(AnomalyScannerVisuals.AnomalySeverity, out var severity))
+            severity = 0.0f;
 
         // Get the bar length
         var barLength = (int)(severity * ent.Comp.Size.X);
@@ -80,16 +79,16 @@ public sealed partial class AnomalyScannerSystem : SharedAnomalyScannerSystem
         // Calculate the bar color
         // Hue "angle" of two colors to interpolate between depending on severity
         // Just a lerp from Green hue at severity = 0.5 to Red hue at 1.0
-        var hue = Math.Clamp(2*GreenHue * (1 - severity), RedHue, GreenHue);
+        var hue = Math.Clamp(2 * GreenHue * (1 - severity), RedHue, GreenHue);
         var color = new Rgba32(Color.FromHsv(new Vector4(hue, 1f, 1f, 1f)).RGBA);
 
         var transparent = new Rgba32(0, 0, 0, 255);
 
-        for(var y = 0; y < ent.Comp.Size.Y; y++)
+        for (var y = 0; y < ent.Comp.Size.Y; y++)
         {
             for (var x = 0; x < ent.Comp.Size.X; x++)
             {
-                ent.Comp.BarBuf[y*ent.Comp.Size.X + x]  = x < barLength ? color : transparent;
+                ent.Comp.BarBuf[y * ent.Comp.Size.X + x] = x < barLength ? color : transparent;
             }
         }
 
diff --git a/Content.Client/Anomaly/AnomalySystem.cs b/Content.Client/Anomaly/AnomalySystem.cs
index 839880acef..d67e3ada42 100644
--- a/Content.Client/Anomaly/AnomalySystem.cs
+++ b/Content.Client/Anomaly/AnomalySystem.cs
@@ -46,10 +46,10 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
         if (args.Sprite is not { } sprite)
             return;
 
-        if (!Appearance.TryGetData<bool>(uid, AnomalyVisuals.IsPulsing, out var pulsing, args.Component))
+        if (!args.TryGetData<bool>(AnomalyVisuals.IsPulsing, out var pulsing))
             pulsing = false;
 
-        if (Appearance.TryGetData<bool>(uid, AnomalyVisuals.Supercritical, out var super, args.Component) && super)
+        if (args.TryGetData<bool>(AnomalyVisuals.Supercritical, out var super) && super)
             pulsing = super;
 
         if (HasComp<AnomalySupercriticalComponent>(uid))
diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
index 4ee3d74545..3337623469 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs
@@ -75,13 +75,13 @@ public sealed partial class AtmosPipeAppearanceSystem : SharedAtmosPipeAppearanc
 
         var numberOfPipeLayers = GetNumberOfPipeLayers(uid, out var atmosPipeLayers);
 
-        if (!_appearance.TryGetData<int>(uid, PipeVisuals.VisualState, out var worldConnectedDirections, args.Component))
+        if (!args.TryGetData<int>(PipeVisuals.VisualState, out var worldConnectedDirections))
         {
             HideAllPipeConnection((uid, args.Sprite), atmosPipeLayers, numberOfPipeLayers);
             return;
         }
 
-        if (!_appearance.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
+        if (!args.TryGetData<Color>(PipeColorVisuals.Color, out var color))
             color = Color.White;
 
         for (byte i = 0; i < numberOfPipeLayers; i++)
diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs
index bdd653ad8f..456f214416 100644
--- a/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs
@@ -14,30 +14,23 @@ namespace Content.Client.Atmos.EntitySystems;
 /// </summary>
 public sealed partial class AtmosPipeLayersSystem : SharedAtmosPipeLayersSystem
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private IReflectionManager _reflection = default!;
     [Dependency] private IResourceCache _resourceCache = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AtmosPipeLayersComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(Entity<AtmosPipeLayersComponent> ent, ref AppearanceChangeEvent ev)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<AtmosPipeLayersComponent> ent, ref AppearanceChangeEvent args)
     {
         if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        if (_appearance.TryGetData<string>(ent, AtmosPipeLayerVisuals.Sprite, out var spriteRsi) &&
+        if (args.TryGetData<string>(AtmosPipeLayerVisuals.Sprite, out var spriteRsi) &&
             _resourceCache.TryGetResource(SpriteSpecifierSerializer.TextureRoot / spriteRsi, out RSIResource? resource))
         {
             _sprite.SetBaseRsi((ent, sprite), resource.RSI);
         }
 
-        if (_appearance.TryGetData<Dictionary<string, string>>(ent, AtmosPipeLayerVisuals.SpriteLayers, out var pipeState))
+        if (args.TryGetData<Dictionary<string, string>>(AtmosPipeLayerVisuals.SpriteLayers, out var pipeState))
         {
             foreach (var (layerKey, rsiPath) in pipeState)
             {
diff --git a/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
index 1d0bf5d315..ec49c2609b 100644
--- a/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs
@@ -5,13 +5,13 @@ using Robust.Client.GameObjects;
 namespace Content.Client.Atmos.EntitySystems;
 
 /// <summary>
-/// Used to change the appearance of gas canisters.
+/// Used to change the appearance of gas canisters when painted.
 /// </summary>
 public sealed partial class GasCanisterAppearanceSystem : VisualizerSystem<GasCanisterComponent>
 {
     protected override void OnAppearanceChange(EntityUid uid, GasCanisterComponent component, ref AppearanceChangeEvent args)
     {
-        if (!AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var protoName, args.Component) || args.Sprite is not { } old)
+        if (!args.TryGetData<string>(PaintableVisuals.Prototype, out var protoName) || args.Sprite is null)
             return;
 
         if (!ProtoMan.HasIndex(protoName))
diff --git a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
index e27ac45dac..1e72903803 100644
--- a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs
@@ -14,13 +14,7 @@ public sealed partial class MaxPressureVisualsSystem : EntitySystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<MaxPressureVisualsComponent, ComponentInit>(OnMaxPressureInit);
-        SubscribeLocalEvent<MaxPressureVisualsComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
+    [SubscribeLocalEvent]
     private void OnMaxPressureInit(Entity<MaxPressureVisualsComponent> entity, ref ComponentInit args)
     {
         if (!TryComp<SpriteComponent>(entity, out var sprite))
@@ -28,28 +22,27 @@ public sealed partial class MaxPressureVisualsSystem : EntitySystem
 
         ArgumentOutOfRangeException.ThrowIfNegativeOrZero(entity.Comp.IntegritySteps);
 
-        if (_sprite.LayerMapTryGet((entity, sprite), MaxPressureVisualLayers.Base, out _, false))
+        if (_sprite.LayerMapTryGet((entity, sprite), MaxPressureVisualLayers.Base, out var layerIndex, false))
         {
-            _sprite.LayerSetRsiState((entity, sprite), MaxPressureVisualLayers.Base, $"{entity.Comp.IntegrityMask}");
-            _sprite.LayerSetVisible((entity, sprite), MaxPressureVisualLayers.Base, false);
+            _sprite.LayerSetRsiState((entity, sprite), layerIndex, $"{entity.Comp.IntegrityMask}");
+            _sprite.LayerSetVisible((entity, sprite), layerIndex, false);
         }
 
-        if (_sprite.LayerMapTryGet((entity, sprite), MaxPressureVisualLayers.BaseUnshaded, out _, false))
+        if (_sprite.LayerMapTryGet((entity, sprite), MaxPressureVisualLayers.BaseUnshaded, out layerIndex, false))
         {
-            _sprite.LayerSetRsiState((entity, sprite), MaxPressureVisualLayers.BaseUnshaded, $"{entity.Comp.IntegrityState}-unshaded-0");
-            _sprite.LayerSetVisible((entity, sprite), MaxPressureVisualLayers.BaseUnshaded, false);
+            _sprite.LayerSetRsiState((entity, sprite), layerIndex, $"{entity.Comp.IntegrityState}-unshaded-0");
+            _sprite.LayerSetVisible((entity, sprite), layerIndex, false);
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(Entity<MaxPressureVisualsComponent> entity, ref AppearanceChangeEvent args)
     {
         if (args.Sprite is not { } sprite)
             return;
 
-        if (!args.AppearanceData.TryGetValue(GasIntegrity.Integrity, out var obj) || obj is not float integrity)
-            return;
-
-        if (!args.AppearanceData.TryGetValue(GasIntegrity.MaxIntegrity, out obj) || obj is not float maxIntegrity)
+        if (!args.TryGetData<float>(GasIntegrity.Integrity, out var integrity)
+            || !args.TryGetData<float>(GasIntegrity.MaxIntegrity, out var maxIntegrity))
             return;
 
         // We don't want visuals at max integrity, so we return if we're at max.
diff --git a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
index 2a5029ee19..e21a6da20e 100644
--- a/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
+++ b/Content.Client/Atmos/EntitySystems/PipeColorVisualizerSystem.cs
@@ -8,13 +8,15 @@ public sealed partial class PipeColorVisualizerSystem : VisualizerSystem<PipeCol
 {
     protected override void OnAppearanceChange(EntityUid uid, PipeColorVisualsComponent component, ref AppearanceChangeEvent args)
     {
-        if (TryComp<SpriteComponent>(uid, out var sprite)
-            && AppearanceSystem.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
-        {
-            // T-ray scanner / sub floor runs after this visualizer. Lets not bulldoze transparency.
-            var layer = sprite[PipeVisualLayers.Pipe];
-            layer.Color = color.WithAlpha(layer.Color.A);
-        }
+        if (args.Sprite == null)
+            return;
+
+        if (!args.TryGetData<Color>(PipeColorVisuals.Color, out var color))
+            return;
+
+        // T-ray scanner / sub floor runs after this visualizer. Lets not bulldoze transparency.
+        var layer = args.Sprite[PipeVisualLayers.Pipe];
+        layer.Color = color.WithAlpha(layer.Color.A);
     }
 }
 
diff --git a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
index 3291fbbece..0d88109b89 100644
--- a/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
+++ b/Content.Client/Atmos/Monitor/AtmosAlarmableVisualsSystem.cs
@@ -12,11 +12,8 @@ public sealed partial class AtmosAlarmableVisualsSystem : VisualizerSystem<Atmos
         if (args.Sprite == null || !SpriteSystem.LayerMapTryGet((uid, args.Sprite), component.LayerMap, out var layer, false))
             return;
 
-        if (!args.AppearanceData.TryGetValue(PowerDeviceVisuals.Powered, out var poweredObject) ||
-            poweredObject is not bool powered)
-        {
+        if (!args.TryGetData<bool>(PowerDeviceVisuals.Powered, out var powered))
             return;
-        }
 
         if (component.HideOnDepowered != null)
         {
@@ -36,8 +33,7 @@ public sealed partial class AtmosAlarmableVisualsSystem : VisualizerSystem<Atmos
             }
         }
 
-        if (args.AppearanceData.TryGetValue(AtmosMonitorVisuals.AlarmType, out var alarmTypeObject)
-            && alarmTypeObject is AtmosAlarmType alarmType
+        if (args.TryGetData<AtmosAlarmType>(AtmosMonitorVisuals.AlarmType, out var alarmType)
             && powered
             && component.AlarmStates.TryGetValue(alarmType, out var state))
         {
diff --git a/Content.Client/Atmos/Visualizers/PortableScrubberVisualsSystem.cs b/Content.Client/Atmos/Visualizers/PortableScrubberVisualsSystem.cs
index 464c714c7d..6183546041 100644
--- a/Content.Client/Atmos/Visualizers/PortableScrubberVisualsSystem.cs
+++ b/Content.Client/Atmos/Visualizers/PortableScrubberVisualsSystem.cs
@@ -14,8 +14,8 @@ public sealed partial class PortableScrubberSystem : VisualizerSystem<PortableSc
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsFull, out var isFull, args.Component)
-            && AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsRunning, out var isRunning, args.Component))
+        if (args.TryGetData<bool>(PortableScrubberVisuals.IsFull, out var isFull)
+            && args.TryGetData<bool>(PortableScrubberVisuals.IsRunning, out var isRunning))
         {
             var runningState = isRunning ? component.RunningState : component.IdleState;
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), PortableScrubberVisualLayers.IsRunning, runningState);
@@ -24,7 +24,7 @@ public sealed partial class PortableScrubberSystem : VisualizerSystem<PortableSc
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), PowerDeviceVisualLayers.Powered, fullState);
         }
 
-        if (AppearanceSystem.TryGetData<bool>(uid, PortableScrubberVisuals.IsDraining, out var isDraining, args.Component))
+        if (args.TryGetData<bool>(PortableScrubberVisuals.IsDraining, out var isDraining))
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), PortableScrubberVisualLayers.IsDraining, isDraining);
         }
diff --git a/Content.Client/Audio/Jukebox/JukeboxSystem.cs b/Content.Client/Audio/Jukebox/JukeboxSystem.cs
index 2caac59f64..75d25dedc2 100644
--- a/Content.Client/Audio/Jukebox/JukeboxSystem.cs
+++ b/Content.Client/Audio/Jukebox/JukeboxSystem.cs
@@ -72,11 +72,8 @@ public sealed partial class JukeboxSystem : SharedJukeboxSystem
         if (args.Sprite == null)
             return;
 
-        if (!args.AppearanceData.TryGetValue(JukeboxVisuals.VisualState, out var visualStateObject) ||
-            visualStateObject is not JukeboxVisualState visualState)
-        {
+        if (!args.TryGetData<JukeboxVisualState>(JukeboxVisuals.VisualState, out var visualState))
             visualState = JukeboxVisualState.On;
-        }
 
         UpdateAppearance((uid, args.Sprite), visualState, component);
     }
diff --git a/Content.Client/BarSign/BarSignVisualizerSystem.cs b/Content.Client/BarSign/BarSignVisualizerSystem.cs
index 029c4724dc..2c5f08b485 100644
--- a/Content.Client/BarSign/BarSignVisualizerSystem.cs
+++ b/Content.Client/BarSign/BarSignVisualizerSystem.cs
@@ -8,8 +8,8 @@ public sealed partial class BarSignVisualizerSystem : VisualizerSystem<BarSignCo
 {
     protected override void OnAppearanceChange(EntityUid uid, BarSignComponent component, ref AppearanceChangeEvent args)
     {
-        AppearanceSystem.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component);
-        AppearanceSystem.TryGetData<string>(uid, BarSignVisuals.BarSignPrototype, out var currentSign, args.Component);
+        args.TryGetData<bool>(PowerDeviceVisuals.Powered, out var powered);
+        args.TryGetData<string>(BarSignVisuals.BarSignPrototype, out var currentSign);
 
         if (powered
             && currentSign != null
diff --git a/Content.Client/Botany/PotencyVisualsSystem.cs b/Content.Client/Botany/PotencyVisualsSystem.cs
index 116ddc9059..c2810210e4 100644
--- a/Content.Client/Botany/PotencyVisualsSystem.cs
+++ b/Content.Client/Botany/PotencyVisualsSystem.cs
@@ -12,11 +12,11 @@ public sealed partial class PotencyVisualsSystem : VisualizerSystem<PotencyVisua
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<float>(uid, ProduceVisuals.Potency, out var potency, args.Component))
-        {
-            var potencyRatio = Math.Clamp(potency / 100f, 0f, 1f);
-            var scale = MathHelper.Lerp(component.MinimumScale, component.MaximumScale, potencyRatio);
-            SpriteSystem.SetScale((uid, args.Sprite), new Vector2(scale, scale));
-        }
+        if (!args.TryGetData<float>(ProduceVisuals.Potency, out var potency))
+            return;
+
+        var potencyRatio = Math.Clamp(potency / 100f, 0f, 1f);
+        var scale = MathHelper.Lerp(component.MinimumScale, component.MaximumScale, potencyRatio);
+        SpriteSystem.SetScale((uid, args.Sprite), new Vector2(scale, scale));
     }
 }
diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index de6b228e22..3e1b620df7 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -133,7 +133,7 @@ internal sealed partial class BuckleSystem : SharedBuckleSystem
         if (!TryComp<RotationVisualsComponent>(ent, out var rotVisuals))
             return;
 
-        if (!Appearance.TryGetData<bool>(ent, BuckleVisuals.Buckled, out var buckled, args.Component) ||
+        if (!args.TryGetData<bool>(BuckleVisuals.Buckled, out var buckled) ||
             !buckled ||
             args.Sprite == null)
         {
diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
index 8fb0a750bb..b994458011 100644
--- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
+++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs
@@ -39,7 +39,7 @@ public sealed partial class TypingIndicatorVisualizerSystem : VisualizerSystem<T
         args.Sprite.LayerSetShader(layer, proto.Shader);
         SpriteSystem.LayerSetOffset((uid, args.Sprite), layer, proto.Offset);
 
-        AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state);
+        args.TryGetData<TypingIndicatorState>(TypingIndicatorVisuals.State, out var state);
         SpriteSystem.LayerSetVisible((uid, args.Sprite), layer, state != TypingIndicatorState.None);
         switch (state)
         {
diff --git a/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
index bcbc217d3c..49bc639a05 100644
--- a/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SmokeVisualizerSystem.cs
@@ -15,7 +15,7 @@ public sealed partial class SmokeVisualizerSystem : VisualizerSystem<SmokeVisual
     {
         if (args.Sprite == null)
             return;
-        if (!AppearanceSystem.TryGetData<Color>(uid, SmokeVisuals.Color, out var color))
+        if (!args.TryGetData<Color>(SmokeVisuals.Color, out var color))
             return;
         SpriteSystem.SetColor((uid, args.Sprite), color);
     }
diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
index e07a6a6292..0cb50e86b6 100644
--- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs
@@ -35,14 +35,11 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
 
         // Check if the solution that was updated is the one set as represented
         if (!string.IsNullOrEmpty(component.SolutionName)
-            && AppearanceSystem.TryGetData(uid, SolutionContainerVisuals.SolutionName, out string name, args.Component)
+            && args.TryGetData<string>(SolutionContainerVisuals.SolutionName, out var name)
             && name != component.SolutionName)
             return;
 
-        if (!AppearanceSystem.TryGetData(uid,
-                SolutionContainerVisuals.FillFraction,
-                out float fraction,
-                args.Component))
+        if (!args.TryGetData<float>(SolutionContainerVisuals.FillFraction, out var fraction))
             return;
 
         // C# moment; setting it as nullable (even though it's not) avoids a
@@ -100,8 +97,7 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
 
             SpriteSystem.LayerSetRsiState(ent, fillLayer, fillBaseName + closestFillSprite);
 
-            if (changeColor
-                && AppearanceSystem.TryGetData(uid, SolutionContainerVisuals.Color, out Color color, args.Component))
+            if (changeColor && args.TryGetData<Color>(SolutionContainerVisuals.Color, out var color))
                 SpriteSystem.LayerSetColor(ent, fillLayer, color);
             else
                 SpriteSystem.LayerSetColor(ent, fillLayer, Color.White);
@@ -127,10 +123,7 @@ public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem<So
         Entity<SpriteComponent?> ent,
         int fillLayer)
     {
-        if (!AppearanceSystem.TryGetData(uid,
-                SolutionContainerVisuals.BaseOverride,
-                out string baseOverride,
-                args.Component))
+        if (!args.TryGetData<string>(SolutionContainerVisuals.BaseOverride, out var baseOverride))
             return null;
 
         var reagentProto = ProtoMan.Index<ReagentPrototype>(baseOverride);
diff --git a/Content.Client/Chemistry/Visualizers/VaporVisualizerSystem.cs b/Content.Client/Chemistry/Visualizers/VaporVisualizerSystem.cs
index b81df15c37..da1778b70f 100644
--- a/Content.Client/Chemistry/Visualizers/VaporVisualizerSystem.cs
+++ b/Content.Client/Chemistry/Visualizers/VaporVisualizerSystem.cs
@@ -50,10 +50,8 @@ public sealed partial class VaporVisualizerSystem : VisualizerSystem<VaporVisual
     /// </summary>
     protected override void OnAppearanceChange(EntityUid uid, VaporVisualsComponent comp, ref AppearanceChangeEvent args)
     {
-        if (AppearanceSystem.TryGetData<Color>(uid, VaporVisuals.Color, out var color, args.Component) && args.Sprite != null)
-        {
+        if (args.Sprite != null && args.TryGetData<Color>(VaporVisuals.Color, out var color))
             SpriteSystem.SetColor((uid, args.Sprite), color);
-        }
     }
 }
 
diff --git a/Content.Client/Construction/FlatpackSystem.cs b/Content.Client/Construction/FlatpackSystem.cs
index 5cce2e22f6..e43a155f21 100644
--- a/Content.Client/Construction/FlatpackSystem.cs
+++ b/Content.Client/Construction/FlatpackSystem.cs
@@ -22,7 +22,7 @@ public sealed partial class FlatpackSystem : SharedFlatpackSystem
     private void OnAppearanceChange(Entity<FlatpackComponent> ent, ref AppearanceChangeEvent args)
     {
         var (_, comp) = ent;
-        if (!_appearance.TryGetData<string>(ent, FlatpackVisuals.Machine, out var machineBoardId) || args.Sprite == null)
+        if (args.Sprite == null || !args.TryGetData<string>(FlatpackVisuals.Machine, out var machineBoardId))
             return;
 
         if (!ProtoMan.TryIndex<EntityPrototype>(machineBoardId, out var machineBoardPrototype))
diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs
index 13ff8a0137..5ae2c95869 100644
--- a/Content.Client/Damage/DamageVisualsSystem.cs
+++ b/Content.Client/Damage/DamageVisualsSystem.cs
@@ -13,20 +13,20 @@ using Robust.Shared.Utility;
 namespace Content.Client.Damage;
 
 /// <summary>
-///     A simple visualizer for any entity with a DamageableComponent
-///     to display the status of how damaged it is.
+/// A simple visualizer for any entity with a DamageableComponent
+/// to display the status of how damaged it is.
 ///
-///     Can either be an overlay for an entity, or target multiple
-///     layers on the same entity.
+/// Can either be an overlay for an entity, or target multiple
+/// layers on the same entity.
 ///
-///     This can be disabled dynamically by passing into SetData,
-///     key DamageVisualizerKeys.Disabled, value bool
-///     (DamageVisualizerKeys lives in Content.Shared.Damage)
+/// This can be disabled dynamically by passing into SetData,
+/// key DamageVisualizerKeys.Disabled, value bool
+/// (DamageVisualizerKeys lives in Content.Shared.Damage)
 ///
-///     Damage layers, if targeting layers, can also be dynamically
-///     disabled if needed by passing into SetData, the name/enum
-///     of the sprite layer, and then passing in a bool value
-///     (true to enable, false to disable).
+/// Damage layers, if targeting layers, can also be dynamically
+/// disabled if needed by passing into SetData, the name/enum
+/// of the sprite layer, and then passing in a bool value
+/// (true to enable, false to disable).
 /// </summary>
 public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisualsComponent>
 {
@@ -325,7 +325,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Adds a damage tracking layer to a given sprite component.
+    /// Adds a damage tracking layer to a given sprite component.
     /// </summary>
     private void AddDamageLayerToSprite(Entity<SpriteComponent?> spriteEnt, DamageVisualizerSprite sprite, string state, string mapKey, int? index = null)
     {
@@ -355,35 +355,34 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
         // If this was passed into the component, we update
         // the data to ensure that the current disabled
         // bool matches.
-        if (AppearanceSystem.TryGetData<bool>(uid, DamageVisualizerKeys.Disabled, out var disabledStatus, args.Component))
+        if (args.TryGetData<bool>(DamageVisualizerKeys.Disabled, out var disabledStatus))
             damageVisComp.Disabled = disabledStatus;
 
         if (damageVisComp.Disabled)
             return;
 
-        if (AppearanceSystem.TryGetData<string>(uid,  DamageVisualizerKeys.Displacement,  out var displacement, args.Component) &&
+        if (args.TryGetData<string>(DamageVisualizerKeys.Displacement, out var displacement) &&
             ProtoMan.Resolve<DisplacementDataPrototype>(displacement, out var displacementProto))
             damageVisComp.Displacement = displacementProto.Displacement;
         else
             damageVisComp.Displacement = null;
 
-        HandleDamage(uid, args.Component, damageVisComp);
+        HandleDamage(uid, args, damageVisComp);
     }
 
-    private void HandleDamage(EntityUid uid, AppearanceComponent component, DamageVisualsComponent damageVisComp)
+    private void HandleDamage(EntityUid uid, AppearanceChangeEvent args, DamageVisualsComponent damageVisComp)
     {
         if (!TryComp(uid, out SpriteComponent? spriteComponent)
             || !TryComp(uid, out DamageableComponent? damageComponent))
             return;
 
         if (damageVisComp.TargetLayers != null && damageVisComp.DamageOverlayGroups != null)
-            UpdateDisabledLayers(uid, spriteComponent, component, damageVisComp);
+            UpdateDisabledLayers(uid, spriteComponent, args, damageVisComp);
 
         if (damageVisComp.Overlay && damageVisComp.TargetLayers == null)
             CheckOverlayOrdering((uid, spriteComponent), damageVisComp);
 
-        if (AppearanceSystem.TryGetData<bool>(uid, DamageVisualizerKeys.ForceUpdate, out var update, component)
-            && update)
+        if (args.TryGetData<bool>(DamageVisualizerKeys.ForceUpdate, out var update) && update)
         {
             ForceUpdateLayers((uid, damageComponent, spriteComponent, damageVisComp));
             return;
@@ -395,8 +394,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
             return;
         }
 
-        if (!AppearanceSystem.TryGetData<DamageVisualizerGroupData>(uid, DamageVisualizerKeys.DamageUpdateGroups,
-                out var data, component))
+        if (!args.TryGetData<DamageVisualizerGroupData>(DamageVisualizerKeys.DamageUpdateGroups, out var data))
         {
             data = new DamageVisualizerGroupData(_damageable.GetDamagePerGroup(uid).Keys.ToList());
         }
@@ -405,18 +403,18 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Checks if any layers were disabled in the last
-    ///     data update. Disabled layers mean that the
-    ///     layer will no longer be visible, or obtain
-    ///     any damage updates.
+    /// Checks if any layers were disabled in the last
+    /// data update. Disabled layers mean that the
+    /// layer will no longer be visible, or obtain
+    /// any damage updates.
     /// </summary>
-    private void UpdateDisabledLayers(EntityUid uid, SpriteComponent spriteComponent, AppearanceComponent component, DamageVisualsComponent damageVisComp)
+    private void UpdateDisabledLayers(EntityUid uid, SpriteComponent spriteComponent, AppearanceChangeEvent args, DamageVisualsComponent damageVisComp)
     {
         foreach (var layer in damageVisComp.TargetLayerMapKeys)
         {
             // I assume this gets set by something like body system if limbs are missing???
             // TODO is this actually used by anything anywhere?
-            AppearanceSystem.TryGetData(uid, layer, out bool disabled, component);
+            args.TryGetData(layer, out bool disabled);
 
             if (damageVisComp.DisabledLayers[layer] == disabled)
                 continue;
@@ -439,11 +437,11 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Checks the overlay ordering on the current
-    ///     sprite component, compared to the
-    ///     data for the visualizer. If the top
-    ///     most layer doesn't match, the sprite
-    ///     layers are recreated and placed on top.
+    /// Checks the overlay ordering on the current
+    /// sprite component, compared to the
+    /// data for the visualizer. If the top
+    /// most layer doesn't match, the sprite
+    /// layers are recreated and placed on top.
     /// </summary>
     private void CheckOverlayOrdering(Entity<SpriteComponent> spriteEnt, DamageVisualsComponent damageVisComp)
     {
@@ -494,8 +492,8 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates damage visuals without tracking
-    ///     any damage groups.
+    /// Updates damage visuals without tracking
+    /// any damage groups.
     /// </summary>
     private void UpdateDamageVisuals(Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
     {
@@ -521,9 +519,9 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates damage visuals by damage group,
-    ///     according to the list of damage groups
-    ///     passed into it.
+    /// Updates damage visuals by damage group,
+    /// according to the list of damage groups
+    /// passed into it.
     /// </summary>
     private void UpdateDamageVisuals(List<ProtoId<DamageGroupPrototype>> delta, Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
     {
@@ -562,7 +560,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Checks if a threshold boundary was passed.
+    /// Checks if a threshold boundary was passed.
     /// </summary>
     private bool CheckThresholdBoundary(FixedPoint2 damageTotal, FixedPoint2 lastThreshold, DamageVisualsComponent damageVisComp, out FixedPoint2 threshold)
     {
@@ -587,10 +585,10 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     This is the entry point for
-    ///     forcing an update on all damage layers.
-    ///     Does different things depending on
-    ///     the configuration of the visualizer.
+    /// This is the entry point for
+    /// forcing an update on all damage layers.
+    /// Does different things depending on
+    /// the configuration of the visualizer.
     /// </summary>
     private void ForceUpdateLayers(Entity<DamageableComponent, SpriteComponent, DamageVisualsComponent> entity)
     {
@@ -611,9 +609,9 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates a target layer. Without a damage group passed in,
-    ///     it assumes you're updating a layer that is tracking all
-    ///     damage.
+    /// Updates a target layer. Without a damage group passed in,
+    /// it assumes you're updating a layer that is tracking all
+    /// damage.
     /// </summary>
     private void UpdateTargetLayer(Entity<SpriteComponent> spriteEnt, DamageVisualsComponent damageVisComp, object layerMapKey, FixedPoint2 threshold)
     {
@@ -647,7 +645,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates a target layer by damage group.
+    /// Updates a target layer by damage group.
     /// </summary>
     private void UpdateTargetLayer(Entity<SpriteComponent, DamageVisualsComponent> entity, object layerMapKey, string damageGroup, FixedPoint2 threshold)
     {
@@ -686,7 +684,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates an overlay that is tracking all damage.
+    /// Updates an overlay that is tracking all damage.
     /// </summary>
     private void UpdateOverlay(Entity<SpriteComponent> spriteEnt, FixedPoint2 threshold, DisplacementData? displacement = null)
     {
@@ -701,7 +699,7 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates an overlay based on damage group.
+    /// Updates an overlay based on damage group.
     /// </summary>
     private void UpdateOverlay(Entity<SpriteComponent, DamageVisualsComponent> entity, string damageGroup, FixedPoint2 threshold, DisplacementData? displacement = null)
     {
@@ -726,10 +724,10 @@ public sealed partial class DamageVisualsSystem : VisualizerSystem<DamageVisuals
     }
 
     /// <summary>
-    ///     Updates a layer on the sprite by what
-    ///     prefix it has (calculated by whatever
-    ///     function calls it), and what threshold
-    ///     was passed into it.
+    /// Updates a layer on the sprite by what
+    /// prefix it has (calculated by whatever
+    /// function calls it), and what threshold
+    /// was passed into it.
     /// </summary>
     private void UpdateDamageLayerState(Entity<SpriteComponent> spriteEnt, int spriteLayer, string statePrefix, FixedPoint2 threshold, string layerKey, DisplacementData? displacement)
     {
diff --git a/Content.Client/DamageState/DamageStateVisualizerSystem.cs b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
index 7240ca2e84..e31f13c477 100644
--- a/Content.Client/DamageState/DamageStateVisualizerSystem.cs
+++ b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
@@ -10,31 +10,27 @@ public sealed partial class DamageStateVisualizerSystem : VisualizerSystem<Damag
     {
         var sprite = args.Sprite;
 
-        if (sprite == null || !AppearanceSystem.TryGetData<MobState>(uid, MobStateVisuals.State, out var data, args.Component))
-        {
+        if (sprite == null || !args.TryGetData<MobState>(MobStateVisuals.State, out var data))
             return;
-        }
 
         if (!component.States.TryGetValue(data, out var layers))
-        {
             return;
-        }
 
         // Brain no worky rn so this was just easier.
         foreach (var key in new[] { DamageStateVisualLayers.Base, DamageStateVisualLayers.BaseUnshaded })
         {
-            if (!SpriteSystem.LayerMapTryGet((uid, sprite), key, out _, false)) continue;
+            if (!SpriteSystem.LayerMapTryGet((uid, sprite), key, out var layerIndex, false)) continue;
 
-            SpriteSystem.LayerSetVisible((uid, sprite), key, false);
+            SpriteSystem.LayerSetVisible((uid, sprite), layerIndex, false);
         }
 
         foreach (var (key, state) in layers)
         {
             // Inheritance moment.
-            if (!SpriteSystem.LayerMapTryGet((uid, sprite), key, out _, false)) continue;
+            if (!SpriteSystem.LayerMapTryGet((uid, sprite), key, out var layerIndex, false)) continue;
 
-            SpriteSystem.LayerSetVisible((uid, sprite), key, true);
-            SpriteSystem.LayerSetRsiState((uid, sprite), key, state);
+            SpriteSystem.LayerSetVisible((uid, sprite), layerIndex, true);
+            SpriteSystem.LayerSetRsiState((uid, sprite), layerIndex, state);
         }
 
         // So they don't draw over mobs anymore
diff --git a/Content.Client/Delivery/DeliveryVisualizerSystem.cs b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
index 6b6e93d6a2..d11c275a82 100644
--- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs
+++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs
@@ -7,8 +7,6 @@ namespace Content.Client.Delivery;
 
 public sealed partial class DeliveryVisualizerSystem : VisualizerSystem<DeliveryComponent>
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
-
     private static readonly ProtoId<JobIconPrototype> UnknownIcon = "JobIconUnknown";
 
     protected override void OnAppearanceChange(EntityUid uid, DeliveryComponent component, ref AppearanceChangeEvent args)
@@ -16,7 +14,7 @@ public sealed partial class DeliveryVisualizerSystem : VisualizerSystem<Delivery
         if (args.Sprite == null)
             return;
 
-        _appearance.TryGetData(uid, DeliveryVisuals.JobIcon, out string job, args.Component);
+        args.TryGetData<string>(DeliveryVisuals.JobIcon, out var job);
 
         if (string.IsNullOrEmpty(job))
             job = UnknownIcon;
diff --git a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
index 2a23ad7bc0..5eddc1d593 100644
--- a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
+++ b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs
@@ -15,14 +15,6 @@ public sealed partial class DisposalUnitSystem : SharedDisposalUnitSystem
 
     private const string AnimationKey = "disposal_unit_animation";
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<DisposalUnitComponent, AfterAutoHandleStateEvent>(OnHandleState);
-        SubscribeLocalEvent<DisposalUnitComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
     protected override void OnComponentInit(Entity<DisposalUnitComponent> ent, ref ComponentInit args)
     {
         base.OnComponentInit(ent, ref args);
@@ -55,28 +47,19 @@ public sealed partial class DisposalUnitSystem : SharedDisposalUnitSystem
         ent.Comp.FlushingAnimation = anim;
     }
 
-    private void OnHandleState(EntityUid uid, DisposalUnitComponent component, ref AfterAutoHandleStateEvent args)
+    [SubscribeLocalEvent]
+    private void OnHandleState(Entity<DisposalUnitComponent> ent, ref AfterAutoHandleStateEvent args)
     {
-        UpdateUI((uid, component));
+        UpdateUI(ent);
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(Entity<DisposalUnitComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        UpdateState(ent, args.Sprite, args.Component);
-    }
-
-    /// <summary>
-    /// Updates the animation of a disposal unit.
-    /// </summary>
-    /// <param name="ent">The disposal unit.</param>
-    /// <param name="sprite">The disposal unit's sprite.</param>
-    /// <param name="appearance">The disposal unit's appearance.</param>
-    private void UpdateState(Entity<DisposalUnitComponent> ent, SpriteComponent sprite, AppearanceComponent appearance)
-    {
-        if (!_appearanceSystem.TryGetData<bool>(ent, DisposalUnitVisuals.IsFlushing, out var isFlushing, appearance))
+        if (!args.TryGetData<bool>(DisposalUnitVisuals.IsFlushing, out var isFlushing))
             return;
 
         // This is a transient state so not too worried about replaying in range.
diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs
index ce76f88705..d266e94091 100644
--- a/Content.Client/Doors/AirlockSystem.cs
+++ b/Content.Client/Doors/AirlockSystem.cs
@@ -10,7 +10,6 @@ namespace Content.Client.Doors;
 /// <inheritdoc/>
 public sealed partial class AirlockSystem : SharedAirlockSystem
 {
-    [Dependency] private AppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
     [Dependency] private EntityQuery<DoorComponent> _doorQuery;
@@ -80,10 +79,10 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
         if (args.Sprite == null)
             return;
 
-        if (!_appearanceSystem.TryGetData<DoorState>(ent, DoorVisuals.State, out var state, args.Component))
+        if (!args.TryGetData<DoorState>(DoorVisuals.State, out var state))
             state = DoorState.Closed;
 
-        _appearanceSystem.TryGetData<bool>(ent, PowerDeviceVisuals.Powered, out var hasPower, args.Component);
+        args.TryGetData<bool>(PowerDeviceVisuals.Powered, out var hasPower);
 
         var showBaseUnlit = false;
         var showBolted = false;
@@ -91,10 +90,10 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
 
         if (hasPower)
         {
-            _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.BoltLights, out var boltedVisible, args.Component);
+            args.TryGetData<bool>(DoorVisuals.BoltLights, out var boltedVisible);
             showBolted = boltedVisible && (state == DoorState.Closed || state == DoorState.Welded);
 
-            _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.EmergencyLights, out var emergencyVisible, args.Component);
+            args.TryGetData<bool>(DoorVisuals.EmergencyLights, out var emergencyVisible);
             showEmergency = emergencyVisible;
 
             if (!showBolted && !showEmergency)
@@ -105,7 +104,7 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
                 if (state == DoorState.Open && ent.Comp.OpenUnlitVisible)
                     showBaseUnlit = true;
 
-                _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.ClosedLights, out var closedLightsVisible, args.Component);
+                args.TryGetData<bool>(DoorVisuals.ClosedLights, out var closedLightsVisible);
                 if (state == DoorState.Closed && closedLightsVisible)
                     showBaseUnlit = true;
             }
@@ -116,8 +115,7 @@ public sealed partial class AirlockSystem : SharedAirlockSystem
         if (ent.Comp.EmergencyAccessLayer)
         {
             var isDoorIdle = state != DoorState.Open && state != DoorState.Opening && state != DoorState.Closing;
-            _sprite.LayerSetVisible((ent, args.Sprite),
-                DoorVisualLayers.BaseEmergencyAccess,
+            _sprite.LayerSetVisible((ent, args.Sprite), DoorVisualLayers.BaseEmergencyAccess,
                 showEmergency && isDoorIdle && !showBolted);
         }
 
diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
index 025f5bb6ed..1e76d22ce1 100644
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -110,10 +110,10 @@ public sealed partial class DoorSystem : SharedDoorSystem
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<DoorState>(entity, DoorVisuals.State, out var state, args.Component))
+        if (!args.TryGetData<DoorState>(DoorVisuals.State, out var state))
             state = DoorState.Closed;
 
-        if (AppearanceSystem.TryGetData<string>(entity, PaintableVisuals.Prototype, out var prototype, args.Component))
+        if (args.TryGetData<string>(PaintableVisuals.Prototype, out var prototype))
             UpdateSpriteLayers((entity.Owner, args.Sprite), prototype);
 
         if (_sprite.LayerMapTryGet(entity.Owner, DoorVisualLayers.BaseEmagging, out var emaggingLayer, logMissing: false))
diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index f4ea6c02cd..911d40b15c 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -11,7 +11,6 @@ namespace Content.Client.Doors;
 /// <inheritdoc/>
 public sealed partial class FirelockSystem : SharedFirelockSystem
 {
-    [Dependency] private SharedAppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
     [Dependency] private EntityQuery<DoorComponent> _doorQuery;
@@ -71,15 +70,15 @@ public sealed partial class FirelockSystem : SharedFirelockSystem
         if (args.Sprite == null)
             return;
 
-        if (!_appearanceSystem.TryGetData<DoorState>(ent, DoorVisuals.State, out var state, args.Component))
+        if (!args.TryGetData<DoorState>(DoorVisuals.State, out var state))
             state = DoorState.Closed;
 
-        var boltedVisible = _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.BoltLights, out var lights, args.Component) && lights;
+        var boltedVisible = args.TryGetData<bool>(DoorVisuals.BoltLights, out var lights) && lights;
         var unlitVisible =
             state == DoorState.Closing
             || state == DoorState.Opening
             || state == DoorState.Denying
-            || _appearanceSystem.TryGetData<bool>(ent, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights;
+            || args.TryGetData<bool>(DoorVisuals.ClosedLights, out var closedLights) && closedLights;
 
         if (_sprite.LayerMapTryGet((ent, args.Sprite), DoorVisualLayers.BaseUnlit, out var unlitLayer, logMissing: false))
             _sprite.LayerSetVisible((ent, args.Sprite), unlitLayer, unlitVisible && !boltedVisible);
diff --git a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
index 9ff184d6b4..2c4f5ab450 100644
--- a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
+++ b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs
@@ -79,7 +79,7 @@ public sealed partial class ElectrocutionHUDVisualizerSystem : VisualizerSystem<
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<bool>(uid, ElectrifiedVisuals.IsElectrified, out var electrified, args.Component))
+        if (!args.TryGetData<bool>(ElectrifiedVisuals.IsElectrified, out var electrified))
             return;
 
         var player = _playerMan.LocalEntity;
diff --git a/Content.Client/Ensnaring/EnsnareableSystem.cs b/Content.Client/Ensnaring/EnsnareableSystem.cs
index 373821e580..9d353a720f 100644
--- a/Content.Client/Ensnaring/EnsnareableSystem.cs
+++ b/Content.Client/Ensnaring/EnsnareableSystem.cs
@@ -30,18 +30,18 @@ public sealed partial class EnsnareableSystem : SharedEnsnareableSystem
 
     private void OnAppearanceChange(EntityUid uid, EnsnareableComponent component, ref AppearanceChangeEvent args)
     {
+        if (component.Sprite == null)
+            return;
+
         if (args.Sprite == null || !_sprite.LayerMapTryGet((uid, args.Sprite), EnsnaredVisualLayers.Ensnared, out var layer, false))
             return;
 
-        if (_appearance.TryGetData<bool>(uid, EnsnareableVisuals.IsEnsnared, out var isEnsnared, args.Component))
-        {
-            if (component.Sprite != null)
-            {
-                _sprite.LayerSetRsi((uid, args.Sprite), layer, new ResPath(component.Sprite));
-                _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.State);
-                _sprite.LayerSetVisible((uid, args.Sprite), layer, isEnsnared);
-            }
-        }
+        if (!args.TryGetData<bool>(EnsnareableVisuals.IsEnsnared, out var isEnsnared))
+            return;
+
+        _sprite.LayerSetRsi((uid, args.Sprite), layer, new ResPath(component.Sprite));
+        _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.State);
+        _sprite.LayerSetVisible((uid, args.Sprite), layer, isEnsnared);
     }
 }
 
diff --git a/Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs b/Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs
index 442a9d7f71..9701a76013 100644
--- a/Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs
+++ b/Content.Client/Explosion/ClusterGrenadeVisualizerSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Explosion;
 using Content.Shared.Explosion.Components;
 using Robust.Client.GameObjects;
 
@@ -11,7 +10,7 @@ public sealed partial class ClusterGrenadeVisualizerSystem : VisualizerSystem<Cl
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<int>(uid, ClusterGrenadeVisuals.GrenadesCounter, out var grenadesCounter, args.Component))
+        if (args.TryGetData<int>(ClusterGrenadeVisuals.GrenadesCounter, out var grenadesCounter))
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, $"{comp.State}-{grenadesCounter}");
     }
 }
diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs
index b9431b9706..2eecbc074e 100644
--- a/Content.Client/Fax/System/FaxVisualsSystem.cs
+++ b/Content.Client/Fax/System/FaxVisualsSystem.cs
@@ -11,15 +11,8 @@ namespace Content.Client.Fax.System;
 public sealed partial class FaxVisualsSystem : EntitySystem
 {
     [Dependency] private AnimationPlayerSystem _player = default!;
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<FaxMachineComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-    }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChanged(EntityUid uid, FaxMachineComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
@@ -28,26 +21,26 @@ public sealed partial class FaxVisualsSystem : EntitySystem
         if (_player.HasRunningAnimation(uid, "faxecute"))
             return;
 
-        if (_appearance.TryGetData(uid, FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals) &&
-            visuals == FaxMachineVisualState.Inserting)
-        {
-            _player.Play(uid,
-                new Animation()
+        if (!args.TryGetData(FaxMachineVisuals.VisualState, out FaxMachineVisualState visuals)
+            || visuals != FaxMachineVisualState.Inserting)
+            return;
+
+        _player.Play(uid,
+            new Animation()
+            {
+                Length = TimeSpan.FromSeconds(2.4),
+                AnimationTracks =
                 {
-                    Length = TimeSpan.FromSeconds(2.4),
-                    AnimationTracks =
+                    new AnimationTrackSpriteFlick()
                     {
-                        new AnimationTrackSpriteFlick()
+                        LayerKey = FaxMachineVisuals.VisualState,
+                        KeyFrames =
                         {
-                            LayerKey = FaxMachineVisuals.VisualState,
-                            KeyFrames =
-                            {
-                                new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f)
-                            },
+                            new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f)
                         },
                     },
                 },
-                "faxecute");
-        }
+            },
+            "faxecute");
     }
 }
diff --git a/Content.Client/Fluids/PuddleSystem.cs b/Content.Client/Fluids/PuddleSystem.cs
index bf1a8cb50b..711a3ab0e4 100644
--- a/Content.Client/Fluids/PuddleSystem.cs
+++ b/Content.Client/Fluids/PuddleSystem.cs
@@ -24,12 +24,8 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
         if (args.Sprite == null)
             return;
 
-        var volume = 1f;
-
-        if (args.AppearanceData.TryGetValue(PuddleVisuals.CurrentVolume, out var volumeObj))
-        {
-            volume = (float)volumeObj;
-        }
+        if (!args.TryGetData<float>(PuddleVisuals.CurrentVolume, out var volume))
+            volume = 1.0f;
 
         // Update smoothing and sprite based on volume.
         if (TryComp<IconSmoothComponent>(uid, out var smooth))
@@ -57,15 +53,10 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
 
         var baseColor = Color.White;
 
-        if (args.AppearanceData.TryGetValue(PuddleVisuals.SolutionColor, out var colorObj))
-        {
-            var color = (Color)colorObj;
-            _sprite.SetColor((uid, args.Sprite), color * baseColor);
-        }
-        else
-        {
-            _sprite.SetColor((uid, args.Sprite), args.Sprite.Color * baseColor);
-        }
+        if (!args.TryGetData<Color>(PuddleVisuals.SolutionColor, out var color))
+            color = args.Sprite.Color;
+
+        _sprite.SetColor((uid, args.Sprite), color * baseColor);
     }
 
     #region Spill
diff --git a/Content.Client/Gravity/GravitySystem.cs b/Content.Client/Gravity/GravitySystem.cs
index ab47c5ed23..bdaebeb106 100644
--- a/Content.Client/Gravity/GravitySystem.cs
+++ b/Content.Client/Gravity/GravitySystem.cs
@@ -24,7 +24,7 @@ public sealed partial class GravitySystem : SharedGravitySystem
         if (args.Sprite == null)
             return;
 
-        if (_appearanceSystem.TryGetData<PowerChargeStatus>(uid, PowerChargeVisuals.State, out var state, args.Component))
+        if (args.TryGetData<PowerChargeStatus>(PowerChargeVisuals.State, out var state))
         {
             if (comp.SpriteMap.TryGetValue(state, out var spriteState))
             {
@@ -33,7 +33,7 @@ public sealed partial class GravitySystem : SharedGravitySystem
             }
         }
 
-        if (_appearanceSystem.TryGetData<float>(uid, PowerChargeVisuals.Charge, out var charge, args.Component))
+        if (args.TryGetData<float>(PowerChargeVisuals.Charge, out var charge))
         {
             var layer = _sprite.LayerMapGet((uid, args.Sprite), GravityGeneratorVisualLayers.Core);
             switch (charge)
diff --git a/Content.Client/Holiday/HolidaySystem.cs b/Content.Client/Holiday/HolidaySystem.cs
index bb38a41593..d9eaef3b2e 100644
--- a/Content.Client/Holiday/HolidaySystem.cs
+++ b/Content.Client/Holiday/HolidaySystem.cs
@@ -21,7 +21,7 @@ public sealed partial class HolidaySystem : EntitySystem
 
     private void OnAppearanceChange(Entity<HolidayRsiSwapComponent> ent, ref AppearanceChangeEvent args)
     {
-        if (!_appearance.TryGetData<string>(ent, HolidayVisuals.Holiday, out var data, args.Component))
+        if (!args.TryGetData<string>(HolidayVisuals.Holiday, out var data))
             return;
 
         var comp = ent.Comp;
diff --git a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs
index ab0923ab73..f5423db11a 100644
--- a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs
@@ -6,21 +6,14 @@ namespace Content.Client.IconSmoothing;
 public sealed partial class ClientRandomIconSmoothSystem : SharedRandomIconSmoothSystem
 {
     [Dependency] private IconSmoothSystem _iconSmooth = default!;
-    [Dependency] private AppearanceSystem _appearance = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RandomIconSmoothComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(Entity<RandomIconSmoothComponent> ent, ref AppearanceChangeEvent args)
     {
         if (!TryComp<IconSmoothComponent>(ent, out var smooth))
             return;
 
-        if (!_appearance.TryGetData<string>(ent, RandomIconSmoothState.State, out var state, args.Component))
+        if (!args.TryGetData<string>(RandomIconSmoothState.State, out var state))
             return;
 
         smooth.StateBase = state;
diff --git a/Content.Client/Kudzu/KudzuVisualizerSystem.cs b/Content.Client/Kudzu/KudzuVisualizerSystem.cs
index 9b525fa39a..bd8b19678d 100644
--- a/Content.Client/Kudzu/KudzuVisualizerSystem.cs
+++ b/Content.Client/Kudzu/KudzuVisualizerSystem.cs
@@ -7,14 +7,12 @@ public sealed partial class KudzuVisualsSystem : VisualizerSystem<KudzuVisualsCo
 {
     protected override void OnAppearanceChange(EntityUid uid, KudzuVisualsComponent component, ref AppearanceChangeEvent args)
     {
-
-        if (args.Sprite == null)
+        if (args.Sprite == null
+            || !args.TryGetData<int>(KudzuVisuals.Variant, out var variant)
+            || !args.TryGetData<int>(KudzuVisuals.GrowthLevel, out var level))
             return;
-        if (AppearanceSystem.TryGetData<int>(uid, KudzuVisuals.Variant, out var var, args.Component)
-            && AppearanceSystem.TryGetData<int>(uid, KudzuVisuals.GrowthLevel, out var level, args.Component))
-        {
-            var index = SpriteSystem.LayerMapReserve((uid, args.Sprite), $"{component.Layer}");
-            SpriteSystem.LayerSetRsiState((uid, args.Sprite), index, $"kudzu_{level}{var}");
-        }
+
+        var index = SpriteSystem.LayerMapReserve((uid, args.Sprite), $"{component.Layer}");
+        SpriteSystem.LayerSetRsiState((uid, args.Sprite), index, $"kudzu_{level}{variant}");
     }
 }
diff --git a/Content.Client/Lathe/LatheSystem.cs b/Content.Client/Lathe/LatheSystem.cs
index f8795a2630..e52a965952 100644
--- a/Content.Client/Lathe/LatheSystem.cs
+++ b/Content.Client/Lathe/LatheSystem.cs
@@ -24,7 +24,7 @@ public sealed partial class LatheSystem : SharedLatheSystem
             return;
 
         // Lathe specific stuff
-        if (_appearance.TryGetData<bool>(uid, LatheVisuals.IsRunning, out var isRunning, args.Component))
+        if (args.TryGetData<bool>(LatheVisuals.IsRunning, out var isRunning))
         {
             if (_sprite.LayerMapTryGet((uid, args.Sprite), LatheVisualLayers.IsRunning, out var runningLayer, false) &&
                 component.RunningState != null &&
@@ -35,7 +35,7 @@ public sealed partial class LatheSystem : SharedLatheSystem
             }
         }
 
-        if (_appearance.TryGetData<bool>(uid, PowerDeviceVisuals.Powered, out var powered, args.Component) &&
+        if (args.TryGetData<bool>(PowerDeviceVisuals.Powered, out var powered) &&
             _sprite.LayerMapTryGet((uid, args.Sprite), PowerDeviceVisualLayers.Powered, out var powerLayer, false))
         {
             _sprite.LayerSetVisible((uid, args.Sprite), powerLayer, powered);
diff --git a/Content.Client/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Client/Light/EntitySystems/EmergencyLightSystem.cs
index b0fd9dc957..5078394333 100644
--- a/Content.Client/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/EmergencyLightSystem.cs
@@ -11,13 +11,13 @@ public sealed partial class EmergencyLightSystem : VisualizerSystem<EmergencyLig
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<bool>(uid, EmergencyLightVisuals.On, out var on, args.Component))
+        if (!args.TryGetData<bool>(EmergencyLightVisuals.On, out var on))
             on = false;
 
         SpriteSystem.LayerSetVisible((uid, args.Sprite), EmergencyLightVisualLayers.LightOff, !on);
         SpriteSystem.LayerSetVisible((uid, args.Sprite), EmergencyLightVisualLayers.LightOn, on);
 
-        if (AppearanceSystem.TryGetData<Color>(uid, EmergencyLightVisuals.Color, out var color, args.Component))
+        if (args.TryGetData<Color>(EmergencyLightVisuals.Color, out var color))
         {
             SpriteSystem.LayerSetColor((uid, args.Sprite), EmergencyLightVisualLayers.LightOn, color);
             SpriteSystem.LayerSetColor((uid, args.Sprite), EmergencyLightVisualLayers.LightOff, color);
diff --git a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
index da50cff84b..46906fd21a 100644
--- a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs
@@ -28,7 +28,7 @@ public sealed partial class ExpendableLightSystem : VisualizerSystem<ExpendableL
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<string>(uid, ExpendableLightVisuals.Behavior, out var lightBehaviourID, args.Component)
+        if (args.TryGetData<string>(ExpendableLightVisuals.Behavior, out var lightBehaviourID)
             && TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
         {
             _lightBehavior.StopLightBehaviour((uid, lightBehaviour));
@@ -43,7 +43,7 @@ public sealed partial class ExpendableLightSystem : VisualizerSystem<ExpendableL
             }
         }
 
-        if (!AppearanceSystem.TryGetData<ExpendableLightState>(uid, ExpendableLightVisuals.State, out var state, args.Component))
+        if (!args.TryGetData<ExpendableLightState>(ExpendableLightVisuals.State, out var state))
             return;
 
         switch (state)
diff --git a/Content.Client/Light/EntitySystems/LightBulbSystem.cs b/Content.Client/Light/EntitySystems/LightBulbSystem.cs
index be28189818..8c6e585511 100644
--- a/Content.Client/Light/EntitySystems/LightBulbSystem.cs
+++ b/Content.Client/Light/EntitySystems/LightBulbSystem.cs
@@ -6,41 +6,35 @@ namespace Content.Client.Light.EntitySystems;
 
 public sealed partial class LightBulbSystem : SharedLightBulbSystem
 {
-    [Dependency] private AppearanceSystem _appearance = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<LightBulbComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, LightBulbComponent comp, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<LightBulbComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
         // update sprite state
-        if (_appearance.TryGetData<LightBulbState>(uid, LightBulbVisuals.State, out var state, args.Component))
+        if (args.TryGetData<LightBulbState>(LightBulbVisuals.State, out var state))
         {
             switch (state)
             {
                 case LightBulbState.Normal:
-                    _sprite.LayerSetRsiState((uid, args.Sprite), LightBulbVisualLayers.Base, comp.NormalSpriteState);
+                    _sprite.LayerSetRsiState((ent, args.Sprite), LightBulbVisualLayers.Base, ent.Comp.NormalSpriteState);
                     break;
                 case LightBulbState.Broken:
-                    _sprite.LayerSetRsiState((uid, args.Sprite), LightBulbVisualLayers.Base, comp.BrokenSpriteState);
+                    _sprite.LayerSetRsiState((ent, args.Sprite), LightBulbVisualLayers.Base, ent.Comp.BrokenSpriteState);
                     break;
                 case LightBulbState.Burned:
-                    _sprite.LayerSetRsiState((uid, args.Sprite), LightBulbVisualLayers.Base, comp.BurnedSpriteState);
+                    _sprite.LayerSetRsiState((ent, args.Sprite), LightBulbVisualLayers.Base, ent.Comp.BurnedSpriteState);
                     break;
             }
         }
 
         // also update sprites color
-        if (_appearance.TryGetData<Color>(uid, LightBulbVisuals.Color, out var color, args.Component))
+        if (args.TryGetData<Color>(LightBulbVisuals.Color, out var color))
         {
-            _sprite.SetColor((uid, args.Sprite), color);
+            _sprite.SetColor((ent, args.Sprite), color);
         }
     }
 }
diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs
index 28fbc77f27..8fb3316bad 100644
--- a/Content.Client/Light/HandheldLightSystem.cs
+++ b/Content.Client/Light/HandheldLightSystem.cs
@@ -39,40 +39,34 @@ public sealed partial class HandheldLightSystem : SharedHandheldLightSystem
 
     private void OnAppearanceChange(EntityUid uid, HandheldLightComponent component, ref AppearanceChangeEvent args)
     {
-        if (!_appearance.TryGetData<bool>(uid, ToggleableVisuals.Enabled, out var enabled, args.Component))
-        {
+        if (!args.TryGetData<bool>(ToggleableVisuals.Enabled, out var enabled))
             return;
+
+        if (!args.TryGetData<HandheldLightPowerStates>(HandheldLightVisuals.Power, out var state))
+            return;
+
+        if (!TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
+            return;
+
+        // Reset any running behaviour to reset the animated properties back to the original value, to avoid conflicts between resets
+        if (_lightBehavior.HasRunningBehaviours((uid, lightBehaviour)))
+        {
+            _lightBehavior.StopLightBehaviour((uid, lightBehaviour), resetToOriginalSettings: true);
         }
 
-        if (!_appearance.TryGetData<HandheldLightPowerStates>(uid, HandheldLightVisuals.Power, out var state, args.Component))
-        {
+        if (!enabled)
             return;
-        }
 
-        if (TryComp<LightBehaviourComponent>(uid, out var lightBehaviour))
+        switch (state)
         {
-            // Reset any running behaviour to reset the animated properties back to the original value, to avoid conflicts between resets
-            if (_lightBehavior.HasRunningBehaviours((uid, lightBehaviour)))
-            {
-                _lightBehavior.StopLightBehaviour((uid, lightBehaviour), resetToOriginalSettings: true);
-            }
-
-            if (!enabled)
-            {
-                return;
-            }
-
-            switch (state)
-            {
-                case HandheldLightPowerStates.FullPower:
-                    break; // We just needed to reset all behaviours
-                case HandheldLightPowerStates.LowPower:
-                    _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.RadiatingBehaviourId);
-                    break;
-                case HandheldLightPowerStates.Dying:
-                    _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.BlinkingBehaviourId);
-                    break;
-            }
+            case HandheldLightPowerStates.FullPower:
+                break; // We just needed to reset all behaviours
+            case HandheldLightPowerStates.LowPower:
+                _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.RadiatingBehaviourId);
+                break;
+            case HandheldLightPowerStates.Dying:
+                _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.BlinkingBehaviourId);
+                break;
         }
     }
 }
diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
index 3f90be8bd3..9630b78872 100644
--- a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs
@@ -23,7 +23,7 @@ public sealed partial class PoweredLightVisualizerSystem : VisualizerSystem<Powe
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<PoweredLightState>(uid, PoweredLightVisuals.BulbState, out var state, args.Component))
+        if (!args.TryGetData<PoweredLightState>(PoweredLightVisuals.BulbState, out var state))
             return;
 
         if (comp.SpriteStateMap.TryGetValue(state, out var spriteState))
@@ -42,7 +42,7 @@ public sealed partial class PoweredLightVisualizerSystem : VisualizerSystem<Powe
         SetBlinkingAnimation(
             uid,
             state == PoweredLightState.On
-            && (AppearanceSystem.TryGetData<bool>(uid, PoweredLightVisuals.Blinking, out var isBlinking, args.Component) && isBlinking),
+            && (args.TryGetData<bool>(PoweredLightVisuals.Blinking, out var isBlinking) && isBlinking),
             comp
         );
     }
diff --git a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
index be98331d5c..5c98930e72 100644
--- a/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
+++ b/Content.Client/Lock/Visualizers/LockVisualizerSystem.cs
@@ -9,16 +9,12 @@ public sealed partial class LockVisualizerSystem : VisualizerSystem<LockVisualsC
     protected override void OnAppearanceChange(EntityUid uid, LockVisualsComponent comp, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
-            || !AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out _, args.Component))
+            || !args.TryGetData<bool>(LockVisuals.Locked, out var locked))
             return;
 
-        // Lock state for the entity.
-        if (!AppearanceSystem.TryGetData<bool>(uid, LockVisuals.Locked, out var locked, args.Component))
-            locked = true;
-
         var unlockedStateExist = args.Sprite.BaseRSI?.TryGetState(comp.StateUnlocked, out _);
 
-        if (AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+        if (args.TryGetData<bool>(StorageVisuals.Open, out var open))
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), LockVisualLayers.Lock, !open);
         }
diff --git a/Content.Client/Materials/MaterialStorageSystem.cs b/Content.Client/Materials/MaterialStorageSystem.cs
index 2825f457ab..e70da994ba 100644
--- a/Content.Client/Materials/MaterialStorageSystem.cs
+++ b/Content.Client/Materials/MaterialStorageSystem.cs
@@ -5,7 +5,6 @@ namespace Content.Client.Materials;
 
 public sealed partial class MaterialStorageSystem : SharedMaterialStorageSystem
 {
-    [Dependency] private AppearanceSystem _appearance = default!;
     [Dependency] private TransformSystem _transform = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
@@ -24,7 +23,7 @@ public sealed partial class MaterialStorageSystem : SharedMaterialStorageSystem
         if (!_sprite.LayerMapTryGet((uid, args.Sprite), MaterialStorageVisualLayers.Inserting, out var layer, false))
             return;
 
-        if (!_appearance.TryGetData<bool>(uid, MaterialStorageVisuals.Inserting, out var inserting, args.Component))
+        if (!args.TryGetData<bool>(MaterialStorageVisuals.Inserting, out var inserting))
             return;
 
         if (inserting && TryComp<InsertingMaterialStorageComponent>(uid, out var insertingComp))
diff --git a/Content.Client/Materials/RecyclerVisualizerSystem.cs b/Content.Client/Materials/RecyclerVisualizerSystem.cs
index 38e0d1c70c..f8d7761dda 100644
--- a/Content.Client/Materials/RecyclerVisualizerSystem.cs
+++ b/Content.Client/Materials/RecyclerVisualizerSystem.cs
@@ -11,9 +11,9 @@ public sealed partial class RecyclerVisualizerSystem : VisualizerSystem<Recycler
         if (args.Sprite == null || !SpriteSystem.LayerMapTryGet((uid, args.Sprite), RecyclerVisualLayers.Main, out var layer, false))
             return;
 
-        AppearanceSystem.TryGetData<ConveyorState>(uid, ConveyorVisuals.State, out var running);
-        AppearanceSystem.TryGetData<bool>(uid, RecyclerVisuals.Bloody, out var bloody);
-        AppearanceSystem.TryGetData<bool>(uid, RecyclerVisuals.Broken, out var broken);
+        args.TryGetData<ConveyorState>(ConveyorVisuals.State, out var running);
+        args.TryGetData<bool>(RecyclerVisuals.Bloody, out var bloody);
+        args.TryGetData<bool>(RecyclerVisuals.Broken, out var broken);
 
         var activityState = running == ConveyorState.Off ? 0 : 1;
         if (broken) //breakage overrides activity
diff --git a/Content.Client/Mech/MechAssemblyVisualizerSystem.cs b/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
index d73c1388c5..bd0d5716c6 100644
--- a/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
+++ b/Content.Client/Mech/MechAssemblyVisualizerSystem.cs
@@ -15,7 +15,7 @@ public sealed partial class MechAssemblyVisualizerSystem : VisualizerSystem<Mech
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, MechAssemblyVisuals.State, out var stage, args.Component))
+        if (!args.TryGetData<int>(MechAssemblyVisuals.State, out var stage))
             return;
 
         var state = component.StatePrefix + stage;
diff --git a/Content.Client/Mech/MechSystem.cs b/Content.Client/Mech/MechSystem.cs
index 965adea621..326e86ec8b 100644
--- a/Content.Client/Mech/MechSystem.cs
+++ b/Content.Client/Mech/MechSystem.cs
@@ -9,39 +9,31 @@ namespace Content.Client.Mech;
 /// <inheritdoc/>
 public sealed partial class MechSystem : SharedMechSystem
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MechComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-    }
-
-    private void OnAppearanceChanged(EntityUid uid, MechComponent component, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChanged(Entity<MechComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_sprite.LayerExists((uid, args.Sprite), MechVisualLayers.Base))
+        if (!_sprite.LayerExists((ent, args.Sprite), MechVisualLayers.Base))
             return;
 
-        var state = component.BaseState;
+        var state = ent.Comp.BaseState;
         var drawDepth = DrawDepth.Mobs;
-        if (component.BrokenState != null && _appearance.TryGetData<bool>(uid, MechVisuals.Broken, out var broken, args.Component) && broken)
+        if (ent.Comp.BrokenState != null && args.TryGetData<bool>(MechVisuals.Broken, out var broken) && broken)
         {
-            state = component.BrokenState;
+            state = ent.Comp.BrokenState;
             drawDepth = DrawDepth.SmallMobs;
         }
-        else if (component.OpenState != null && _appearance.TryGetData<bool>(uid, MechVisuals.Open, out var open, args.Component) && open)
+        else if (ent.Comp.OpenState != null && args.TryGetData<bool>(MechVisuals.Open, out var open) && open)
         {
-            state = component.OpenState;
+            state = ent.Comp.OpenState;
             drawDepth = DrawDepth.SmallMobs;
         }
 
-        _sprite.LayerSetRsiState((uid, args.Sprite), MechVisualLayers.Base, state);
-        _sprite.SetDrawDepth((uid, args.Sprite), (int)drawDepth);
+        _sprite.LayerSetRsiState((ent, args.Sprite), MechVisualLayers.Base, state);
+        _sprite.SetDrawDepth((ent, args.Sprite), (int)drawDepth);
     }
 }
diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
index e413458f38..7e34906d43 100644
--- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
+++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs
@@ -8,15 +8,7 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CryoPodComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<InsideCryoPodComponent, ComponentStartup>(OnCryoPodInsertion);
-        SubscribeLocalEvent<InsideCryoPodComponent, ComponentRemove>(OnCryoPodRemoval);
-    }
-
+    [SubscribeLocalEvent]
     private void OnCryoPodInsertion(EntityUid uid, InsideCryoPodComponent component, ComponentStartup args)
     {
         if (!TryComp<SpriteComponent>(uid, out var spriteComponent))
@@ -28,6 +20,7 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         _sprite.SetOffset((uid, spriteComponent), new Vector2(0, 1));
     }
 
+    [SubscribeLocalEvent]
     private void OnCryoPodRemoval(EntityUid uid, InsideCryoPodComponent component, ComponentRemove args)
     {
         if (!TryComp<SpriteComponent>(uid, out var spriteComponent))
@@ -38,15 +31,14 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem
         _sprite.SetOffset((uid, spriteComponent), component.PreviousOffset);
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(EntityUid uid, CryoPodComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
-        {
             return;
-        }
 
-        if (!Appearance.TryGetData<bool>(uid, CryoPodVisuals.ContainsEntity, out var isOpen, args.Component)
-            || !Appearance.TryGetData<bool>(uid, CryoPodVisuals.IsOn, out var isOn, args.Component))
+        if (!args.TryGetData<bool>(CryoPodVisuals.ContainsEntity, out var isOpen)
+            || !args.TryGetData<bool>(CryoPodVisuals.IsOn, out var isOn))
         {
             return;
         }
diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs
index ed48b18de8..645be8fbe7 100644
--- a/Content.Client/Movement/Systems/JetpackSystem.cs
+++ b/Content.Client/Movement/Systems/JetpackSystem.cs
@@ -17,24 +17,19 @@ public sealed partial class JetpackSystem : SharedJetpackSystem
     [Dependency] private SharedTransformSystem _transform = default!;
     [Dependency] private SharedMapSystem _mapSystem = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<JetpackComponent, AppearanceChangeEvent>(OnJetpackAppearance);
-    }
-
     protected override bool CanEnable(EntityUid uid, JetpackComponent component)
     {
         // No predicted atmos so you'd have to do a lot of funny to get this working.
         return false;
     }
 
-    private void OnJetpackAppearance(EntityUid uid, JetpackComponent component, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnJetpackAppearance(Entity<JetpackComponent> ent, ref AppearanceChangeEvent args)
     {
-        Appearance.TryGetData<bool>(uid, JetpackVisuals.Enabled, out var enabled, args.Component);
+        args.TryGetData<bool>(JetpackVisuals.Enabled, out var enabled);
 
-        if (TryComp<ClothingComponent>(uid, out var clothing))
-            _clothing.SetEquippedPrefix(uid, enabled ? "on" : null, clothing);
+        if (TryComp<ClothingComponent>(ent, out var clothing))
+            _clothing.SetEquippedPrefix(ent, enabled ? "on" : null, clothing);
     }
 
     public override void Update(float frameTime)
diff --git a/Content.Client/PDA/PdaVisualizerSystem.cs b/Content.Client/PDA/PdaVisualizerSystem.cs
index d0dfb47489..1e9cc3a531 100644
--- a/Content.Client/PDA/PdaVisualizerSystem.cs
+++ b/Content.Client/PDA/PdaVisualizerSystem.cs
@@ -11,13 +11,13 @@ public sealed partial class PdaVisualizerSystem : VisualizerSystem<PdaVisualsCom
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<string>(uid, PdaVisuals.PdaType, out var pdaType, args.Component))
+        if (args.TryGetData<string>(PdaVisuals.PdaType, out var pdaType))
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), PdaVisualLayers.Base, pdaType);
 
-        if (AppearanceSystem.TryGetData<bool>(uid, UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn, args.Component))
+        if (args.TryGetData<bool>(UnpoweredFlashlightVisuals.LightOn, out var isFlashlightOn))
             SpriteSystem.LayerSetVisible((uid, args.Sprite), PdaVisualLayers.Flashlight, isFlashlightOn);
 
-        if (AppearanceSystem.TryGetData<bool>(uid, PdaVisuals.IdCardInserted, out var isCardInserted, args.Component))
+        if (args.TryGetData<bool>(PdaVisuals.IdCardInserted, out var isCardInserted))
             SpriteSystem.LayerSetVisible((uid, args.Sprite), PdaVisualLayers.IdLight, isCardInserted);
     }
 
diff --git a/Content.Client/Paper/PaperVisualizerSystem.cs b/Content.Client/Paper/PaperVisualizerSystem.cs
index b348f3a040..76d7ee0428 100644
--- a/Content.Client/Paper/PaperVisualizerSystem.cs
+++ b/Content.Client/Paper/PaperVisualizerSystem.cs
@@ -12,10 +12,10 @@ public sealed partial class PaperVisualizerSystem : VisualizerSystem<PaperVisual
         if (args.Sprite == null)
             return;
 
-        if (AppearanceSystem.TryGetData<PaperStatus>(uid, PaperVisuals.Status, out var writingStatus, args.Component))
+        if (args.TryGetData<PaperStatus>(PaperVisuals.Status, out var writingStatus))
             SpriteSystem.LayerSetVisible((uid, args.Sprite), PaperVisualLayers.Writing, writingStatus == PaperStatus.Written);
 
-        if (AppearanceSystem.TryGetData<string>(uid, PaperVisuals.Stamp, out var stampState, args.Component))
+        if (args.TryGetData<string>(PaperVisuals.Stamp, out var stampState))
         {
             if (stampState != string.Empty)
             {
diff --git a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs
index a4d2046580..dc0938f996 100644
--- a/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs
+++ b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizerSystem.cs
@@ -13,7 +13,7 @@ public sealed partial class ParticleAcceleratorPartVisualizerSystem : Visualizer
         if (!SpriteSystem.LayerMapTryGet((uid, args.Sprite), ParticleAcceleratorVisualLayers.Unlit, out var index, false))
             return;
 
-        if (!AppearanceSystem.TryGetData<ParticleAcceleratorVisualState>(uid, ParticleAcceleratorVisuals.VisualState, out var state, args.Component))
+        if (!args.TryGetData<ParticleAcceleratorVisualState>(ParticleAcceleratorVisuals.VisualState, out var state))
         {
             state = ParticleAcceleratorVisualState.Unpowered;
         }
diff --git a/Content.Client/Power/APC/ApcVisualizerSystem.cs b/Content.Client/Power/APC/ApcVisualizerSystem.cs
index aa9a45fffa..0b233d7939 100644
--- a/Content.Client/Power/APC/ApcVisualizerSystem.cs
+++ b/Content.Client/Power/APC/ApcVisualizerSystem.cs
@@ -19,7 +19,7 @@ public sealed partial class ApcVisualizerSystem : VisualizerSystem<ApcVisualsCom
             return;
 
         // Handle APC screen overlay and channel markers.
-        if (!AppearanceSystem.TryGetData<ApcChargeState>(uid, ApcVisuals.ChargeState, out var chargeState, args.Component))
+        if (!args.TryGetData<ApcChargeState>(ApcVisuals.ChargeState, out var chargeState))
             chargeState = ApcChargeState.Lack;
 
         if (chargeState < ApcChargeState.NumStates)
@@ -28,7 +28,7 @@ public sealed partial class ApcVisualizerSystem : VisualizerSystem<ApcVisualsCom
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), ApcVisualLayers.ChargeState, screenState);
 
             // Unlike the charge state, we don't have an emag with special visuals, everything's in the array.
-            if (!AppearanceSystem.TryGetData<ApcChannelState>(uid, ApcVisuals.ChannelState, out var channelState, args.Component)
+            if (!args.TryGetData<ApcChannelState>(ApcVisuals.ChannelState, out var channelState)
                 || channelState >= ApcChannelState.NumStates)
             {
                 channelState = ApcChannelState.Off;
diff --git a/Content.Client/Power/SMES/SmesSystem.cs b/Content.Client/Power/SMES/SmesSystem.cs
index 0b28e17007..4ae690ca16 100644
--- a/Content.Client/Power/SMES/SmesSystem.cs
+++ b/Content.Client/Power/SMES/SmesSystem.cs
@@ -11,7 +11,7 @@ public sealed partial class SmesVisualizerSystem : VisualizerSystem<SmesComponen
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, SmesVisuals.LastChargeLevel, out var level, args.Component) || level == 0)
+        if (!args.TryGetData<int>(SmesVisuals.LastChargeLevel, out var level) || level == 0)
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), SmesVisualLayers.Charge, false);
         }
@@ -21,7 +21,7 @@ public sealed partial class SmesVisualizerSystem : VisualizerSystem<SmesComponen
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), SmesVisualLayers.Charge, $"{comp.ChargeOverlayPrefix}{level}");
         }
 
-        if (!AppearanceSystem.TryGetData<ChargeState>(uid, SmesVisuals.LastChargeState, out var state, args.Component))
+        if (!args.TryGetData<ChargeState>(SmesVisuals.LastChargeState, out var state))
             state = ChargeState.Still;
 
         switch (state)
diff --git a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs
index 4dcaacc381..66b0d12279 100644
--- a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs
+++ b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs
@@ -6,17 +6,10 @@ namespace Content.Client.Power.Visualizers;
 
 public sealed partial class CableVisualizerSystem : EntitySystem
 {
-    [Dependency] private AppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<CableVisualizerComponent, AppearanceChangeEvent>(OnAppearanceChange, after: new[] { typeof(SubFloorHideSystem) });
-    }
-
-    private void OnAppearanceChange(EntityUid uid, CableVisualizerComponent component, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent(after: [typeof(SubFloorHideSystem)])]
+    private void OnAppearanceChange(Entity<CableVisualizerComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
@@ -28,11 +21,11 @@ public sealed partial class CableVisualizerSystem : EntitySystem
             return;
         }
 
-        if (!_appearanceSystem.TryGetData<WireVisDirFlags>(uid, WireVisVisuals.ConnectedMask, out var mask, args.Component))
+        if (!args.TryGetData<WireVisDirFlags>(WireVisVisuals.ConnectedMask, out var mask))
             mask = WireVisDirFlags.None;
 
-        _sprite.LayerSetRsiState((uid, args.Sprite), 0, $"{component.StatePrefix}{(int)mask}");
-        if (component.ExtraLayerPrefix != null)
-            _sprite.LayerSetRsiState((uid, args.Sprite), 1, $"{component.ExtraLayerPrefix}{(int)mask}");
+        _sprite.LayerSetRsiState((ent, args.Sprite), 0, $"{ent.Comp.StatePrefix}{(int)mask}");
+        if (ent.Comp.ExtraLayerPrefix != null)
+            _sprite.LayerSetRsiState((ent, args.Sprite), 1, $"{ent.Comp.ExtraLayerPrefix}{(int)mask}");
     }
 }
diff --git a/Content.Client/PowerCell/PowerChargerVisualizerSystem.cs b/Content.Client/PowerCell/PowerChargerVisualizerSystem.cs
index 9f22b59d4c..112caa8d8e 100644
--- a/Content.Client/PowerCell/PowerChargerVisualizerSystem.cs
+++ b/Content.Client/PowerCell/PowerChargerVisualizerSystem.cs
@@ -11,7 +11,7 @@ public sealed partial class PowerChargerVisualizerSystem : VisualizerSystem<Powe
             return;
 
         // Update base item
-        if (AppearanceSystem.TryGetData<bool>(uid, CellVisual.Occupied, out var occupied, args.Component) && occupied)
+        if (args.TryGetData<bool>(CellVisual.Occupied, out var occupied) && occupied)
         {
             // TODO: don't throw if it doesn't have a full state
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), PowerChargerVisualLayers.Base, comp.OccupiedState);
@@ -22,7 +22,7 @@ public sealed partial class PowerChargerVisualizerSystem : VisualizerSystem<Powe
         }
 
         // Update lighting
-        if (AppearanceSystem.TryGetData<CellChargerStatus>(uid, CellVisual.Light, out var status, args.Component)
+        if (args.TryGetData<CellChargerStatus>(CellVisual.Light, out var status)
             && comp.LightStates.TryGetValue(status, out var lightState))
         {
             SpriteSystem.LayerSetRsiState((uid, args.Sprite), PowerChargerVisualLayers.Light, lightState);
diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs
index df64b747be..ec71053700 100644
--- a/Content.Client/Revenant/RevenantSystem.cs
+++ b/Content.Client/Revenant/RevenantSystem.cs
@@ -1,5 +1,3 @@
-using Content.Client.Alerts;
-using Content.Shared.Alert;
 using Content.Shared.Alert.Components;
 using Content.Shared.Revenant;
 using Content.Shared.Revenant.Components;
@@ -7,41 +5,31 @@ using Robust.Client.GameObjects;
 
 namespace Content.Client.Revenant;
 
-public sealed partial class RevenantSystem : EntitySystem
+public sealed partial class RevenantSystem : VisualizerSystem<RevenantComponent>
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
-    [Dependency] private SpriteSystem _sprite = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RevenantComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<RevenantComponent, GetGenericAlertCounterAmountEvent>(OnGetCounterAmount);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref AppearanceChangeEvent args)
+    protected override void OnAppearanceChange(EntityUid uid, RevenantComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Harvesting, out var harvesting, args.Component) && harvesting)
+        if (args.TryGetData<bool>(RevenantVisuals.Harvesting, out var harvesting) && harvesting)
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.HarvestingState);
+            SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, component.HarvestingState);
         }
-        else if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Stunned, out var stunned, args.Component) && stunned)
+        else if (args.TryGetData<bool>(RevenantVisuals.Stunned, out var stunned) && stunned)
         {
-            _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.StunnedState);
+            SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, component.StunnedState);
         }
-        else if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Corporeal, out var corporeal, args.Component))
+        else if (args.TryGetData<bool>(RevenantVisuals.Corporeal, out var corporeal))
         {
             if (corporeal)
-                _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.CorporealState);
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, component.CorporealState);
             else
-                _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.State);
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), 0, component.State);
         }
     }
 
+    [SubscribeLocalEvent]
     private void OnGetCounterAmount(Entity<RevenantComponent> ent, ref GetGenericAlertCounterAmountEvent args)
     {
         if (args.Handled)
diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs
index 066431be13..2ad0a4d63c 100644
--- a/Content.Client/Rotation/RotationVisualizerSystem.cs
+++ b/Content.Client/Rotation/RotationVisualizerSystem.cs
@@ -7,32 +7,24 @@ namespace Content.Client.Rotation;
 
 public sealed partial class RotationVisualizerSystem : SharedRotationVisualsSystem
 {
-
-    [Dependency] private AppearanceSystem _appearance = default!;
     [Dependency] private AnimationPlayerSystem _animation = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<RotationVisualsComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, RotationVisualsComponent component, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<RotationVisualsComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_appearance.TryGetData<RotationState>(uid, RotationVisuals.RotationState, out var state, args.Component))
+        if (!args.TryGetData<RotationState>(RotationVisuals.RotationState, out var state))
             state = RotationState.Vertical;
 
         switch (state)
         {
             case RotationState.Vertical:
-                AnimateSpriteRotation(uid, args.Sprite, component.VerticalRotation, component.AnimationTime);
+                AnimateSpriteRotation(ent, args.Sprite, ent.Comp.VerticalRotation, ent.Comp.AnimationTime);
                 break;
             case RotationState.Horizontal:
-                AnimateSpriteRotation(uid, args.Sprite, component.HorizontalRotation, component.AnimationTime);
+                AnimateSpriteRotation(ent, args.Sprite, ent.Comp.HorizontalRotation, ent.Comp.AnimationTime);
                 break;
         }
     }
diff --git a/Content.Client/Shuttles/ThrusterSystem.cs b/Content.Client/Shuttles/ThrusterSystem.cs
index 470ea7cc70..a65ddf78a1 100644
--- a/Content.Client/Shuttles/ThrusterSystem.cs
+++ b/Content.Client/Shuttles/ThrusterSystem.cs
@@ -14,13 +14,13 @@ public sealed partial class ThrusterSystem : VisualizerSystem<ThrusterComponent>
     protected override void OnAppearanceChange(EntityUid uid, ThrusterComponent comp, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
-        || !AppearanceSystem.TryGetData<bool>(uid, ThrusterVisualState.State, out var state, args.Component))
+        || !args.TryGetData<bool>(ThrusterVisualState.State, out var state))
             return;
 
         SpriteSystem.LayerSetVisible((uid, args.Sprite), ThrusterVisualLayers.ThrustOn, state);
         SetThrusting(
             uid,
-            state && AppearanceSystem.TryGetData<bool>(uid, ThrusterVisualState.Thrusting, out var thrusting, args.Component) && thrusting,
+            state && args.TryGetData<bool>(ThrusterVisualState.Thrusting, out var thrusting) && thrusting,
             args.Sprite
         );
     }
@@ -31,14 +31,10 @@ public sealed partial class ThrusterSystem : VisualizerSystem<ThrusterComponent>
     private void SetThrusting(EntityUid uid, bool value, SpriteComponent sprite)
     {
         if (SpriteSystem.LayerMapTryGet((uid, sprite), ThrusterVisualLayers.Thrusting, out var thrustingLayer, false))
-        {
             SpriteSystem.LayerSetVisible((uid, sprite), thrustingLayer, value);
-        }
 
         if (SpriteSystem.LayerMapTryGet((uid, sprite), ThrusterVisualLayers.ThrustingUnshaded, out var unshadedLayer, false))
-        {
             SpriteSystem.LayerSetVisible((uid, sprite), unshadedLayer, value);
-        }
     }
 }
 
diff --git a/Content.Client/Silicons/Borgs/BorgSystem.cs b/Content.Client/Silicons/Borgs/BorgSystem.cs
index c1dcb38b27..9ae2156929 100644
--- a/Content.Client/Silicons/Borgs/BorgSystem.cs
+++ b/Content.Client/Silicons/Borgs/BorgSystem.cs
@@ -93,43 +93,43 @@ public sealed partial class BorgSystem : SharedBorgSystem
         _sprite.LayerSetRsiState((ent.Owner, ent.Comp3), BorgVisualLayers.Light, hasPlayer ? ent.Comp1.HasMindState : ent.Comp1.NoMindState);
     }
 
-    private void OnMMIAppearanceChanged(EntityUid uid, MMIComponent component, ref AppearanceChangeEvent args)
+    private void OnMMIAppearanceChanged(Entity<MMIComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
-        var sprite = args.Sprite;
 
-        if (!_appearance.TryGetData(uid, MMIVisuals.BrainPresent, out bool brain))
+        if (!args.TryGetData(MMIVisuals.BrainPresent, out bool brain))
             brain = false;
-        if (!_appearance.TryGetData(uid, MMIVisuals.HasMind, out bool hasMind))
+        if (!args.TryGetData(MMIVisuals.HasMind, out bool hasMind))
             hasMind = false;
 
         var lightColor = Color.White;
         var lightVisible = false;
+        var spriteEnt = (ent.Owner, args.Sprite);
 
-        _sprite.LayerSetVisible((uid, sprite), MMIVisualLayers.Brain, brain);
+        _sprite.LayerSetVisible(spriteEnt, MMIVisualLayers.Brain, brain);
         if (!brain)
         {
-            _sprite.LayerSetRsiState((uid, sprite), MMIVisualLayers.Base, component.NoBrainState);
+            _sprite.LayerSetRsiState(spriteEnt, MMIVisualLayers.Base, ent.Comp.NoBrainState);
         }
         else
         {
             var state = hasMind
-                ? component.HasMindState
-                : component.NoMindState;
-            _sprite.LayerSetRsiState((uid, sprite), MMIVisualLayers.Base, state);
+                ? ent.Comp.HasMindState
+                : ent.Comp.NoMindState;
+            _sprite.LayerSetRsiState(spriteEnt, MMIVisualLayers.Base, state);
 
             lightColor = hasMind
-                ? component.HasMindLightColor
-                : component.NoMindLightColor;
+                ? ent.Comp.HasMindLightColor
+                : ent.Comp.NoMindLightColor;
             lightVisible = true;
         }
 
         // Update color if it exists.
-        if (_sprite.LayerMapTryGet((uid, sprite), MMIVisualLayers.Unlit, out var layerIndex, logMissing: false))
+        if (_sprite.LayerMapTryGet(spriteEnt, MMIVisualLayers.Unlit, out var layerIndex, logMissing: false))
         {
-            _sprite.LayerSetVisible((uid, sprite), layerIndex, lightVisible);
-            _sprite.LayerSetColor((uid, sprite), layerIndex, lightColor);
+            _sprite.LayerSetVisible(spriteEnt, layerIndex, lightVisible);
+            _sprite.LayerSetColor(spriteEnt, layerIndex, lightColor);
         }
     }
 
diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.cs b/Content.Client/Silicons/StationAi/StationAiSystem.cs
index 4613a3bf7b..adbd8bfe31 100644
--- a/Content.Client/Silicons/StationAi/StationAiSystem.cs
+++ b/Content.Client/Silicons/StationAi/StationAiSystem.cs
@@ -20,14 +20,9 @@ public sealed partial class StationAiSystem : SharedStationAiSystem
         base.Initialize();
         InitializeAirlock();
         InitializePowerToggle();
-
-        SubscribeLocalEvent<StationAiOverlayComponent, LocalPlayerAttachedEvent>(OnAiAttached);
-        SubscribeLocalEvent<StationAiOverlayComponent, LocalPlayerDetachedEvent>(OnAiDetached);
-        SubscribeLocalEvent<StationAiOverlayComponent, ComponentInit>(OnAiOverlayInit);
-        SubscribeLocalEvent<StationAiOverlayComponent, ComponentRemove>(OnAiOverlayRemove);
-        SubscribeLocalEvent<StationAiCoreComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
+    [SubscribeLocalEvent]
     private void OnAiOverlayInit(Entity<StationAiOverlayComponent> ent, ref ComponentInit args)
     {
         var attachedEnt = _player.LocalEntity;
@@ -38,6 +33,7 @@ public sealed partial class StationAiSystem : SharedStationAiSystem
         AddOverlay();
     }
 
+    [SubscribeLocalEvent]
     private void OnAiOverlayRemove(Entity<StationAiOverlayComponent> ent, ref ComponentRemove args)
     {
         var attachedEnt = _player.LocalEntity;
@@ -66,22 +62,25 @@ public sealed partial class StationAiSystem : SharedStationAiSystem
         _overlay = null;
     }
 
+    [SubscribeLocalEvent]
     private void OnAiAttached(Entity<StationAiOverlayComponent> ent, ref LocalPlayerAttachedEvent args)
     {
         AddOverlay();
     }
 
+    [SubscribeLocalEvent]
     private void OnAiDetached(Entity<StationAiOverlayComponent> ent, ref LocalPlayerDetachedEvent args)
     {
         RemoveOverlay();
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChange(Entity<StationAiCoreComponent> entity, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (_appearance.TryGetData<PrototypeLayerData>(entity.Owner, StationAiVisualLayers.Icon, out var layerData, args.Component))
+        if (args.TryGetData<PrototypeLayerData>(StationAiVisualLayers.Icon, out var layerData))
             _sprite.LayerSetData((entity.Owner, args.Sprite), StationAiVisualLayers.Icon, layerData);
 
         _sprite.LayerSetVisible((entity.Owner, args.Sprite), StationAiVisualLayers.Icon, layerData != null);
diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs
index 9f39fe3bc4..1cef4f7e93 100644
--- a/Content.Client/Singularity/Systems/EmitterSystem.cs
+++ b/Content.Client/Singularity/Systems/EmitterSystem.cs
@@ -6,44 +6,36 @@ namespace Content.Client.Singularity.Systems;
 
 public sealed partial class EmitterSystem : SharedEmitterSystem
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<EmitterComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, EmitterComponent component, ref AppearanceChangeEvent args)
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<EmitterComponent> ent, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        if (!_appearance.TryGetData<EmitterVisualState>(uid, EmitterVisuals.VisualState, out var state, args.Component))
+        if (!args.TryGetData<EmitterVisualState>(EmitterVisuals.VisualState, out var state))
             state = EmitterVisualState.Off;
 
-        if (!_sprite.LayerMapTryGet((uid, args.Sprite), EmitterVisualLayers.Lights, out var layer, false))
+        if (!_sprite.LayerMapTryGet((ent, args.Sprite), EmitterVisualLayers.Lights, out var layer, false))
             return;
 
         switch (state)
         {
             case EmitterVisualState.On:
-                if (component.OnState == null)
+                if (ent.Comp.OnState == null)
                     break;
-                _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
-                _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.OnState);
+                _sprite.LayerSetVisible((ent, args.Sprite), layer, true);
+                _sprite.LayerSetRsiState((ent, args.Sprite), layer, ent.Comp.OnState);
                 break;
             case EmitterVisualState.Underpowered:
-                if (component.UnderpoweredState == null)
+                if (ent.Comp.UnderpoweredState == null)
                     break;
-                _sprite.LayerSetVisible((uid, args.Sprite), layer, true);
-                _sprite.LayerSetRsiState((uid, args.Sprite), layer, component.UnderpoweredState);
+                _sprite.LayerSetVisible((ent, args.Sprite), layer, true);
+                _sprite.LayerSetRsiState((ent, args.Sprite), layer, ent.Comp.UnderpoweredState);
                 break;
             case EmitterVisualState.Off:
-                _sprite.LayerSetVisible((uid, args.Sprite), layer, false);
+                _sprite.LayerSetVisible((ent, args.Sprite), layer, false);
                 break;
             default:
                 throw new ArgumentOutOfRangeException();
diff --git a/Content.Client/Singularity/Visualizers/RadiationCollectorSystem.cs b/Content.Client/Singularity/Visualizers/RadiationCollectorSystem.cs
index dce57b5f2c..3f9293c95b 100644
--- a/Content.Client/Singularity/Visualizers/RadiationCollectorSystem.cs
+++ b/Content.Client/Singularity/Visualizers/RadiationCollectorSystem.cs
@@ -97,7 +97,7 @@ public sealed partial class RadiationCollectorSystem : VisualizerSystem<Radiatio
         if (!TryComp<AnimationPlayerComponent>(uid, out var animPlayer))
             return;
 
-        if (!AppearanceSystem.TryGetData<RadiationCollectorVisualState>(uid, RadiationCollectorVisuals.VisualState, out var state, args.Component))
+        if (!args.TryGetData<RadiationCollectorVisualState>(RadiationCollectorVisuals.VisualState, out var state))
             state = RadiationCollectorVisualState.Deactive;
 
         UpdateVisuals(uid, state, comp, args.Sprite, animPlayer);
diff --git a/Content.Client/Smoking/BurnStateVisualizerSystem.cs b/Content.Client/Smoking/BurnStateVisualizerSystem.cs
index da8a1b7a25..0f8f11c5cb 100644
--- a/Content.Client/Smoking/BurnStateVisualizerSystem.cs
+++ b/Content.Client/Smoking/BurnStateVisualizerSystem.cs
@@ -9,7 +9,7 @@ public sealed partial class BurnStateVisualizerSystem : VisualizerSystem<BurnSta
     {
         if (args.Sprite == null)
             return;
-        if (!args.AppearanceData.TryGetValue(SmokingVisuals.Smoking, out var burnState))
+        if (!args.TryGetData<SmokableState>(SmokingVisuals.Smoking, out var burnState))
             return;
 
         var state = burnState switch
diff --git a/Content.Client/Sprite/ScaleVisualsSystem.cs b/Content.Client/Sprite/ScaleVisualsSystem.cs
index c69a9431a8..e8d6d22aa0 100644
--- a/Content.Client/Sprite/ScaleVisualsSystem.cs
+++ b/Content.Client/Sprite/ScaleVisualsSystem.cs
@@ -8,23 +8,17 @@ public sealed partial class ScaleVisualsSystem : SharedScaleVisualsSystem
 {
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<ScaleVisualsComponent, AppearanceChangeEvent>(OnChangeData);
-    }
-
+    [SubscribeLocalEvent]
     private void OnChangeData(Entity<ScaleVisualsComponent> ent, ref AppearanceChangeEvent args)
     {
-        if (!args.AppearanceData.TryGetValue(ScaleVisuals.Scale, out var scale) ||
-            args.Sprite == null) return;
+        if (args.Sprite == null
+            || !args.TryGetData<Vector2>(ScaleVisuals.Scale, out var scale))
+            return;
 
         // save the original scale
         ent.Comp.OriginalScale ??= args.Sprite.Scale;
 
-        var vecScale = (Vector2)scale;
-        _sprite.SetScale((ent.Owner, args.Sprite), vecScale);
+        _sprite.SetScale((ent.Owner, args.Sprite), scale);
     }
 
     // revert to the original scale
diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
index f1eeb0a8a2..0d2d532cab 100644
--- a/Content.Client/Stack/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -10,19 +10,17 @@ namespace Content.Client.Stack
     [UsedImplicitly]
     public sealed partial class StackSystem : SharedStackSystem
     {
-        [Dependency] private AppearanceSystem _appearanceSystem = default!;
         [Dependency] private ItemCounterSystem _counterSystem = default!;
 
         public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<StackComponent, AppearanceChangeEvent>(OnAppearanceChange);
             Subs.ItemStatus<StackComponent>(ent => new StackStatusControl(ent));
         }
 
         #region Appearance
-
+        [SubscribeLocalEvent]
         private void OnAppearanceChange(Entity<StackComponent> ent, ref AppearanceChangeEvent args)
         {
             var (uid, comp) = ent;
@@ -31,13 +29,13 @@ namespace Content.Client.Stack
                 return;
 
             // Skip processing if no elements in the stack
-            if (!_appearanceSystem.TryGetData<int>(uid, StackVisuals.Actual, out var actual, args.Component))
+            if (!args.TryGetData<int>(StackVisuals.Actual, out var actual))
                 return;
 
-            if (!_appearanceSystem.TryGetData<int>(uid, StackVisuals.MaxCount, out var maxCount, args.Component))
+            if (!args.TryGetData<int>(StackVisuals.MaxCount, out var maxCount))
                 maxCount = comp.LayerStates.Count;
 
-            if (!_appearanceSystem.TryGetData<bool>(uid, StackVisuals.Hide, out var hidden, args.Component))
+            if (!args.TryGetData<bool>(StackVisuals.Hide, out var hidden))
                 hidden = false;
 
             if (comp.LayerFunction != StackLayerFunction.None)
diff --git a/Content.Client/StationTeleporter/StationTeleporterSystem.cs b/Content.Client/StationTeleporter/StationTeleporterSystem.cs
index c1311c3be1..33af1a77ab 100644
--- a/Content.Client/StationTeleporter/StationTeleporterSystem.cs
+++ b/Content.Client/StationTeleporter/StationTeleporterSystem.cs
@@ -7,22 +7,15 @@ namespace Content.Client.StationTeleporter;
 /// <inheritdoc/>
 public sealed partial class StationTeleporterSystem : SharedStationTeleporterSystem
 {
-    [Dependency] private SharedAppearanceSystem _appearance = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StationTeleporterComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-    }
-
+    [SubscribeLocalEvent]
     private void OnAppearanceChanged(Entity<StationTeleporterComponent> ent, ref AppearanceChangeEvent args)
     {
         if (ent.Comp.PortalLayerMap is null)
             return;
 
-        if (!_appearance.TryGetData<Color>(ent, TeleporterPortalVisuals.Color, out var newColor))
+        if (!args.TryGetData<Color>(TeleporterPortalVisuals.Color, out var newColor))
             return;
 
         if (!_sprite.LayerMapTryGet(ent.Owner, ent.Comp.PortalLayerMap, out var index, false))
diff --git a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
index 889bf9eadc..5fa89c3343 100644
--- a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
+++ b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs
@@ -7,13 +7,7 @@ public sealed partial class StickyVisualizerSystem : VisualizerSystem<StickyVisu
 {
     [Dependency] private EntityQuery<SpriteComponent> _spriteQuery = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<StickyVisualizerComponent, ComponentInit>(OnInit);
-    }
-
+    [SubscribeLocalEvent]
     private void OnInit(Entity<StickyVisualizerComponent> ent, ref ComponentInit args)
     {
         if (!_spriteQuery.TryComp(ent, out var sprite))
@@ -27,7 +21,7 @@ public sealed partial class StickyVisualizerSystem : VisualizerSystem<StickyVisu
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<bool>(uid, StickyVisuals.IsStuck, out var isStuck, args.Component))
+        if (!args.TryGetData<bool>(StickyVisuals.IsStuck, out var isStuck))
             return;
 
         var drawDepth = isStuck ? comp.StuckDrawDepth : comp.OriginalDrawDepth;
diff --git a/Content.Client/Storage/Systems/ItemCounterSystem.cs b/Content.Client/Storage/Systems/ItemCounterSystem.cs
index e3ce7a7fc7..7f8189a415 100644
--- a/Content.Client/Storage/Systems/ItemCounterSystem.cs
+++ b/Content.Client/Storage/Systems/ItemCounterSystem.cs
@@ -12,31 +12,26 @@ public sealed partial class ItemCounterSystem : SharedItemCounterSystem
     [Dependency] private AppearanceSystem _appearanceSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
-    public override void Initialize()
+    [SubscribeLocalEvent]
+    private void OnAppearanceChange(Entity<ItemCounterComponent> ent, ref AppearanceChangeEvent args)
     {
-        base.Initialize();
-        SubscribeLocalEvent<ItemCounterComponent, AppearanceChangeEvent>(OnAppearanceChange);
-    }
-
-    private void OnAppearanceChange(EntityUid uid, ItemCounterComponent comp, ref AppearanceChangeEvent args)
-    {
-        if (args.Sprite == null || comp.LayerStates.Count < 1)
+        if (args.Sprite == null || ent.Comp.LayerStates.Count < 1)
             return;
 
         // Skip processing if no actual
-        if (!_appearanceSystem.TryGetData<int>(uid, StackVisuals.Actual, out var actual, args.Component))
+        if (!args.TryGetData<int>(StackVisuals.Actual, out var actual))
             return;
 
-        if (!_appearanceSystem.TryGetData<int>(uid, StackVisuals.MaxCount, out var maxCount, args.Component))
-            maxCount = comp.LayerStates.Count;
+        if (!args.TryGetData<int>(StackVisuals.MaxCount, out var maxCount))
+            maxCount = ent.Comp.LayerStates.Count;
 
-        if (!_appearanceSystem.TryGetData<bool>(uid, StackVisuals.Hide, out var hidden, args.Component))
+        if (!args.TryGetData<bool>(StackVisuals.Hide, out var hidden))
             hidden = false;
 
-        if (comp.IsComposite)
-            ProcessCompositeSprite(uid, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+        if (ent.Comp.IsComposite)
+            ProcessCompositeSprite(ent, actual, maxCount, ent.Comp.LayerStates, hidden, sprite: args.Sprite);
         else
-            ProcessOpaqueSprite(uid, comp.BaseLayer, actual, maxCount, comp.LayerStates, hidden, sprite: args.Sprite);
+            ProcessOpaqueSprite(ent, ent.Comp.BaseLayer, actual, maxCount, ent.Comp.LayerStates, hidden, sprite: args.Sprite);
     }
 
     public void ProcessOpaqueSprite(EntityUid uid, string layer, int count, int maxCount, List<string> states, bool hide = false, SpriteComponent? sprite = null)
diff --git a/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs b/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
index f1fd359607..2a66138588 100644
--- a/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
+++ b/Content.Client/Storage/Systems/StorageContainerVisualsSystem.cs
@@ -13,10 +13,10 @@ public sealed partial class StorageContainerVisualsSystem : VisualizerSystem<Sto
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, StorageVisuals.StorageUsed, out var used, args.Component))
+        if (!args.TryGetData<int>(StorageVisuals.StorageUsed, out var used))
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, StorageVisuals.Capacity, out var capacity, args.Component))
+        if (!args.TryGetData<int>(StorageVisuals.Capacity, out var capacity))
             return;
 
         var fraction = used / (float)capacity;
diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
index 93d47b17a6..989d049c1a 100644
--- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs
@@ -6,25 +6,20 @@ namespace Content.Client.Storage.Visualizers;
 
 public sealed partial class EntityStorageVisualizerSystem : VisualizerSystem<EntityStorageVisualsComponent>
 {
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<EntityStorageVisualsComponent, ComponentInit>(OnComponentInit);
-    }
-
     /// <summary>
     /// Sets the base sprite to this layer. Exists to make the inheritance tree less boilerplate-y.
     /// </summary>
-    private void OnComponentInit(EntityUid uid, EntityStorageVisualsComponent comp, ComponentInit args)
+    [SubscribeLocalEvent]
+    private void OnComponentInit(Entity<EntityStorageVisualsComponent> ent, ref ComponentInit args)
     {
-        if (comp.StateBaseClosed == null)
+        if (ent.Comp.StateBaseClosed == null)
             return;
 
-        comp.StateBaseOpen ??= comp.StateBaseClosed;
-        if (!TryComp<SpriteComponent>(uid, out var sprite))
+        ent.Comp.StateBaseOpen ??= ent.Comp.StateBaseClosed;
+        if (!TryComp<SpriteComponent>(ent, out var sprite))
             return;
 
-        SpriteSystem.LayerSetRsiState((uid, sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+        SpriteSystem.LayerSetRsiState((ent, sprite), StorageVisualLayers.Base, ent.Comp.StateBaseClosed);
     }
 
     protected override void OnAppearanceChange(EntityUid uid,
@@ -32,11 +27,11 @@ public sealed partial class EntityStorageVisualizerSystem : VisualizerSystem<Ent
         ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null
-            || !AppearanceSystem.TryGetData<bool>(uid, StorageVisuals.Open, out var open, args.Component))
+            || !args.TryGetData<bool>(StorageVisuals.Open, out var open))
             return;
 
         var forceRedrawBase = false;
-        if (AppearanceSystem.TryGetData<string>(uid, PaintableVisuals.Prototype, out var prototype, args.Component))
+        if (args.TryGetData<string>(PaintableVisuals.Prototype, out var prototype))
         {
             if (ProtoMan.Resolve(prototype, out var proto))
             {
@@ -56,46 +51,46 @@ public sealed partial class EntityStorageVisualizerSystem : VisualizerSystem<Ent
         }
 
         // Open/Closed state for the storage entity.
-        if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), StorageVisualLayers.Door, out _, false))
+        if (!SpriteSystem.LayerMapTryGet((uid, args.Sprite), StorageVisualLayers.Door, out _, false))
+            return;
+
+        if (open)
         {
-            if (open)
+            if (comp.OpenDrawDepth != null)
+                SpriteSystem.SetDrawDepth((uid, args.Sprite), comp.OpenDrawDepth.Value);
+
+            if (comp.StateDoorOpen != null)
             {
-                if (comp.OpenDrawDepth != null)
-                    SpriteSystem.SetDrawDepth((uid, args.Sprite), comp.OpenDrawDepth.Value);
-
-                if (comp.StateDoorOpen != null)
-                {
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Door, comp.StateDoorOpen);
-                    SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, true);
-                }
-                else
-                {
-                    SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, false);
-                }
-
-                if (comp.StateBaseOpen != null)
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
-                else if (forceRedrawBase && comp.StateBaseClosed != null)
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Door, comp.StateDoorOpen);
+                SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, true);
             }
             else
             {
-                if (comp.ClosedDrawDepth != null)
-                    SpriteSystem.SetDrawDepth((uid, args.Sprite), comp.ClosedDrawDepth.Value);
-
-                if (comp.StateDoorClosed != null)
-                {
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Door, comp.StateDoorClosed);
-                    SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, true);
-                }
-                else
-                    SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, false);
-
-                if (comp.StateBaseClosed != null)
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
-                else if (forceRedrawBase && comp.StateBaseOpen != null)
-                    SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
+                SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, false);
             }
+
+            if (comp.StateBaseOpen != null)
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
+            else if (forceRedrawBase && comp.StateBaseClosed != null)
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+        }
+        else
+        {
+            if (comp.ClosedDrawDepth != null)
+                SpriteSystem.SetDrawDepth((uid, args.Sprite), comp.ClosedDrawDepth.Value);
+
+            if (comp.StateDoorClosed != null)
+            {
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Door, comp.StateDoorClosed);
+                SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, true);
+            }
+            else
+                SpriteSystem.LayerSetVisible((uid, args.Sprite), StorageVisualLayers.Door, false);
+
+            if (comp.StateBaseClosed != null)
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseClosed);
+            else if (forceRedrawBase && comp.StateBaseOpen != null)
+                SpriteSystem.LayerSetRsiState((uid, args.Sprite), StorageVisualLayers.Base, comp.StateBaseOpen);
         }
     }
 }
diff --git a/Content.Client/Storage/Visualizers/StorageFillVisualizerSystem.cs b/Content.Client/Storage/Visualizers/StorageFillVisualizerSystem.cs
index 23857cb790..4eb8135f61 100644
--- a/Content.Client/Storage/Visualizers/StorageFillVisualizerSystem.cs
+++ b/Content.Client/Storage/Visualizers/StorageFillVisualizerSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Robust.Client.GameObjects;
 
@@ -11,7 +10,7 @@ public sealed partial class StorageFillVisualizerSystem : VisualizerSystem<Stora
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, StorageFillVisuals.FillLevel, out var level, args.Component))
+        if (!args.TryGetData<int>(StorageFillVisuals.FillLevel, out var level))
             return;
 
         var state = $"{component.FillBaseName}-{level}";
diff --git a/Content.Client/SubFloor/SubFloorHideSystem.cs b/Content.Client/SubFloor/SubFloorHideSystem.cs
index b5e056a7a0..267552586a 100644
--- a/Content.Client/SubFloor/SubFloorHideSystem.cs
+++ b/Content.Client/SubFloor/SubFloorHideSystem.cs
@@ -32,34 +32,28 @@ public sealed partial class SubFloorHideSystem : SharedSubFloorHideSystem
         }
     }
 
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<SubFloorHideComponent, AppearanceChangeEvent>(OnAppearanceChanged);
-        SubscribeNetworkEvent<ShowSubfloorRequestEvent>(OnRequestReceived);
-        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnPlayerDetached);
-    }
-
+    [SubscribeLocalEvent]
     private void OnPlayerDetached(LocalPlayerDetachedEvent ev)
     {
         // Vismask resets so need to reset this.
         ShowAll = false;
     }
 
+    [SubscribeNetworkEvent]
     private void OnRequestReceived(ShowSubfloorRequestEvent ev)
     {
         // When client receives request Queue an update on all vis.
         UpdateAll();
     }
 
+    [SubscribeLocalEvent]
     private void OnAppearanceChanged(EntityUid uid, SubFloorHideComponent component, ref AppearanceChangeEvent args)
     {
         if (args.Sprite == null)
             return;
 
-        _appearance.TryGetData<bool>(uid, SubFloorVisuals.Covered, out var covered, args.Component);
-        _appearance.TryGetData<bool>(uid, SubFloorVisuals.ScannerRevealed, out var scannerRevealed, args.Component);
+        args.TryGetData<bool>(SubFloorVisuals.Covered, out var covered);
+        args.TryGetData<bool>(SubFloorVisuals.ScannerRevealed, out var scannerRevealed);
 
         scannerRevealed &= !ShowAll; // no transparency for show-subfloor mode.
 
diff --git a/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs b/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs
index 432f09d4ca..ea379da76e 100644
--- a/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs
+++ b/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs
@@ -17,9 +17,8 @@ public sealed partial class SurveillanceCameraVisualsSystem : EntitySystem
     private void OnAppearanceChange(EntityUid uid, SurveillanceCameraVisualsComponent component,
         ref AppearanceChangeEvent args)
     {
-        if (!args.AppearanceData.TryGetValue(SurveillanceCameraVisualsKey.Key, out var data)
-            || data is not SurveillanceCameraVisuals key
-            || args.Sprite == null
+        if (args.Sprite == null
+            || !args.TryGetData<SurveillanceCameraVisuals>(SurveillanceCameraVisualsKey.Key, out var key)
             || !_sprite.LayerMapTryGet((uid, args.Sprite), SurveillanceCameraVisualsKey.Layer, out var layer, false)
             || !component.CameraSprites.TryGetValue(key, out var state))
         {
diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs
index 73922ca093..1121b1a073 100644
--- a/Content.Client/Tabletop/TabletopSystem.cs
+++ b/Content.Client/Tabletop/TabletopSystem.cs
@@ -26,7 +26,6 @@ namespace Content.Client.Tabletop
         [Dependency] private IUserInterfaceManager _uiManger = default!;
         [Dependency] private IPlayerManager _playerManager = default!;
         [Dependency] private IGameTiming _gameTiming = default!;
-        [Dependency] private AppearanceSystem _appearance = default!;
         [Dependency] private SharedTransformSystem _transform = default!;
         [Dependency] private SpriteSystem _sprite = default!;
 
@@ -211,22 +210,18 @@ namespace Content.Client.Tabletop
             return false;
         }
 
-        private void OnAppearanceChange(EntityUid uid, TabletopDraggableComponent comp, ref AppearanceChangeEvent args)
+        private void OnAppearanceChange(Entity<TabletopDraggableComponent> ent, ref AppearanceChangeEvent args)
         {
             if (args.Sprite == null)
                 return;
 
             // TODO: maybe this can work more nicely, by maybe only having to set the item to "being dragged", and have
             //  the appearance handle the rest
-            if (_appearance.TryGetData<Vector2>(uid, TabletopItemVisuals.Scale, out var scale, args.Component))
-            {
-                _sprite.SetScale((uid, args.Sprite), scale);
-            }
+            if (args.TryGetData<Vector2>(TabletopItemVisuals.Scale, out var scale))
+                _sprite.SetScale((ent, args.Sprite), scale);
 
-            if (_appearance.TryGetData<int>(uid, TabletopItemVisuals.DrawDepth, out var drawDepth, args.Component))
-            {
-                _sprite.SetDrawDepth((uid, args.Sprite), drawDepth);
-            }
+            if (args.TryGetData<int>(TabletopItemVisuals.DrawDepth, out var drawDepth))
+                _sprite.SetDrawDepth((ent, args.Sprite), drawDepth);
         }
 
         #endregion
diff --git a/Content.Client/Toggleable/ToggleableVisualsSystem.cs b/Content.Client/Toggleable/ToggleableVisualsSystem.cs
index 335240ed5a..6321907662 100644
--- a/Content.Client/Toggleable/ToggleableVisualsSystem.cs
+++ b/Content.Client/Toggleable/ToggleableVisualsSystem.cs
@@ -38,11 +38,11 @@ public sealed partial class ToggleableVisualsSystem : VisualizerSystem<Toggleabl
         ToggleableVisualsComponent component,
         ref AppearanceChangeEvent args)
     {
-        if (!AppearanceSystem.TryGetData<bool>(uid, ToggleableVisuals.Enabled, out var enabled, args.Component))
+        if (!args.TryGetData<bool>(ToggleableVisuals.Enabled, out var enabled))
             return;
 
         var modulateColor =
-            AppearanceSystem.TryGetData<Color>(uid, ToggleableVisuals.Color, out var color, args.Component);
+            args.TryGetData<Color>(ToggleableVisuals.Color, out var color);
 
         // Update the item's sprite
         if (args.Sprite != null && component.SpriteLayer != null &&
diff --git a/Content.Client/Tools/Visualizers/WeldableVisualizerSystem.cs b/Content.Client/Tools/Visualizers/WeldableVisualizerSystem.cs
index 362fc13d9f..2bfbeb0af7 100644
--- a/Content.Client/Tools/Visualizers/WeldableVisualizerSystem.cs
+++ b/Content.Client/Tools/Visualizers/WeldableVisualizerSystem.cs
@@ -10,7 +10,7 @@ public sealed partial class WeldableVisualizerSystem : VisualizerSystem<Weldable
         if (args.Sprite == null)
             return;
 
-        AppearanceSystem.TryGetData<bool>(uid, WeldableVisuals.IsWelded, out var isWelded, args.Component);
+        args.TryGetData<bool>(WeldableVisuals.IsWelded, out var isWelded);
         if (SpriteSystem.LayerMapTryGet((uid, args.Sprite), WeldableLayers.BaseWelded, out var layer, false))
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), layer, isWelded);
diff --git a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
index 626b7d6221..4c9123ec53 100644
--- a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
+++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs
@@ -10,12 +10,7 @@ public sealed partial class TimerTriggerVisualizerSystem : VisualizerSystem<Time
 {
     [Dependency] private SharedAudioSystem _audioSystem = default!;
 
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<TimerTriggerVisualsComponent, ComponentInit>(OnComponentInit);
-    }
-
+    [SubscribeLocalEvent]
     private void OnComponentInit(Entity<TimerTriggerVisualsComponent> ent, ref ComponentInit args)
     {
         ent.Comp.PrimingAnimation = new Animation
@@ -47,7 +42,7 @@ public sealed partial class TimerTriggerVisualizerSystem : VisualizerSystem<Time
         || !TryComp<AnimationPlayerComponent>(uid, out var animPlayer))
             return;
 
-        if (!AppearanceSystem.TryGetData<TriggerVisualState>(uid, TriggerVisuals.VisualState, out var state, args.Component))
+        if (!args.TryGetData<TriggerVisualState>(TriggerVisuals.VisualState, out var state))
             state = TriggerVisualState.Unprimed;
 
         switch (state)
diff --git a/Content.Client/Turrets/DeployableTurretSystem.cs b/Content.Client/Turrets/DeployableTurretSystem.cs
index c5709eac48..be74271d76 100644
--- a/Content.Client/Turrets/DeployableTurretSystem.cs
+++ b/Content.Client/Turrets/DeployableTurretSystem.cs
@@ -70,7 +70,7 @@ public sealed partial class DeployableTurretSystem : SharedDeployableTurretSyste
         if (!TryComp<AnimationPlayerComponent>(ent, out var animPlayer))
             return;
 
-        if (!_appearance.TryGetData<DeployableTurretState>(ent, DeployableTurretVisuals.Turret, out var state, args.Component))
+        if (!args.TryGetData<DeployableTurretState>(DeployableTurretVisuals.Turret, out var state))
             state = DeployableTurretState.Retracted;
 
         UpdateVisuals(ent, state, args.Sprite, animPlayer);
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
index e47b0c952d..cdf5ef0d76 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs
@@ -22,7 +22,7 @@ public sealed partial class GunSystem
     {
         if (args.Sprite == null ||
             !_sprite.LayerMapTryGet((ent, args.Sprite), GunVisualLayers.Base, out var boltLayer, false) ||
-            !Appearance.TryGetData(ent, AmmoVisuals.BoltClosed, out bool boltClosed))
+            !args.TryGetData(AmmoVisuals.BoltClosed, out bool boltClosed))
         {
             return;
         }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
index 8bf37eaca8..d4f7b653cb 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.MagazineVisuals.cs
@@ -40,58 +40,54 @@ public sealed partial class GunSystem
 
         if (sprite == null) return;
 
-        if (!args.AppearanceData.TryGetValue(AmmoVisuals.MagLoaded, out var magloaded) ||
+        if (!args.TryGetData<bool>(AmmoVisuals.MagLoaded, out var magloaded) ||
             magloaded is true)
         {
-            if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoMax, out var capacity))
-            {
+            if (!args.TryGetData<int>(AmmoVisuals.AmmoMax, out var capacity))
                 capacity = ent.Comp.MagSteps;
-            }
 
-            if (!args.AppearanceData.TryGetValue(AmmoVisuals.AmmoCount, out var current))
-            {
+            if (!args.TryGetData<int>(AmmoVisuals.AmmoCount, out var current))
                 current = ent.Comp.MagSteps;
-            }
 
             var step = ContentHelpers.RoundToLevels((int)current, (int)capacity, ent.Comp.MagSteps);
 
             if (step == 0 && !ent.Comp.ZeroVisible)
             {
-                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out var magLayer, false))
                 {
-                    _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false);
+                    _sprite.LayerSetVisible((ent, sprite), magLayer, false);
                 }
 
-                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out var magUnshadedLayer, false))
                 {
-                    _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false);
+                    _sprite.LayerSetVisible((ent, sprite), magUnshadedLayer, false);
+                }
+            }
+            else
+            {
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out var magLayer, false))
+                {
+                    _sprite.LayerSetVisible((ent, sprite), magLayer, true);
+                    _sprite.LayerSetRsiState((ent, sprite), magLayer, $"{ent.Comp.MagState}-{step}");
                 }
 
-                return;
-            }
-
-            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
-            {
-                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, true);
-                _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.Mag, $"{ent.Comp.MagState}-{step}");
-            }
-
-            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
-            {
-                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, true);
-                _sprite.LayerSetRsiState((ent, sprite), GunVisualLayers.MagUnshaded, $"{ent.Comp.MagState}-unshaded-{step}");
+                if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out var magUnshadedLayer, false))
+                {
+                    _sprite.LayerSetVisible((ent, sprite), magUnshadedLayer, true);
+                    _sprite.LayerSetRsiState((ent, sprite), magUnshadedLayer, $"{ent.Comp.MagState}-unshaded-{step}");
+                }
             }
         }
         else
         {
-            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.Mag, out var magLayer, false))
             {
-                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.Mag, false);
+                _sprite.LayerSetVisible((ent, sprite), magLayer, false);
             }
 
-            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out _, false))
+            if (_sprite.LayerMapTryGet((ent, sprite), GunVisualLayers.MagUnshaded, out var magUnshadedLayer, false))
             {
-                _sprite.LayerSetVisible((ent, sprite), GunVisualLayers.MagUnshaded, false);
+                _sprite.LayerSetVisible((ent, sprite), magUnshadedLayer, false);
             }
         }
     }
diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
index a4fb34fcb7..29f10f44ff 100644
--- a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
+++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs
@@ -16,12 +16,9 @@ public sealed partial class GunSystem
         var sprite = args.Sprite;
         if (sprite == null) return;
 
-        if (!args.AppearanceData.TryGetValue(AmmoVisuals.Spent, out var varSpent))
-        {
+        if (!args.TryGetData<bool>(AmmoVisuals.Spent, out var spent))
             return;
-        }
 
-        var spent = (bool)varSpent;
         string state;
 
         if (spent)
diff --git a/Content.Client/Wires/Visualizers/WiresVisualizerSystem.cs b/Content.Client/Wires/Visualizers/WiresVisualizerSystem.cs
index 364c5a2e7b..596f7c7fdc 100644
--- a/Content.Client/Wires/Visualizers/WiresVisualizerSystem.cs
+++ b/Content.Client/Wires/Visualizers/WiresVisualizerSystem.cs
@@ -17,8 +17,7 @@ public sealed partial class WiresVisualizerSystem : VisualizerSystem<WiresVisual
         var layer = SpriteSystem.LayerMapReserve((uid, args.Sprite), WiresVisualLayers.MaintenancePanel);
 
         // Data doesn't exist (e.g. in the spawn menu), act as though the panel's closed
-        if (!args.AppearanceData.TryGetValue(WiresVisuals.MaintenancePanelState, out var panelOpenObj)
-            || panelOpenObj is not bool panelOpen)
+        if (!args.TryGetData<bool>(WiresVisuals.MaintenancePanelState, out var panelOpen))
         {
             SpriteSystem.LayerSetVisible((uid, args.Sprite), layer, component.VisibleWhenClosed);
             return;
diff --git a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs
index 38b4abab22..f1a89c26de 100644
--- a/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs
+++ b/Content.Client/Xenoarchaeology/XenoArtifacts/RandomArtifactSpriteSystem.cs
@@ -10,13 +10,13 @@ public sealed partial class RandomArtifactSpriteSystem : VisualizerSystem<Random
         if (args.Sprite == null)
             return;
 
-        if (!AppearanceSystem.TryGetData<int>(uid, SharedArtifactsVisuals.SpriteIndex, out var spriteIndex, args.Component))
+        if (!args.TryGetData<int>(SharedArtifactsVisuals.SpriteIndex, out var spriteIndex))
             return;
 
-        if (!AppearanceSystem.TryGetData<bool>(uid, SharedArtifactsVisuals.IsUnlocking, out var isUnlocking, args.Component))
+        if (!args.TryGetData<bool>(SharedArtifactsVisuals.IsUnlocking, out var isUnlocking))
             isUnlocking = false;
 
-        if (!AppearanceSystem.TryGetData<bool>(uid, SharedArtifactsVisuals.IsActivated, out var isActivated, args.Component))
+        if (!args.TryGetData<bool>(SharedArtifactsVisuals.IsActivated, out var isActivated))
             isActivated = false;
 
         var spriteIndexStr = spriteIndex.ToString("D2");

From 8a80326d862710ccec56ab33085a353c1ec33591 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:15:31 +0000
Subject: [PATCH 52/69] Bugfix: Check component lifecycle in
 SharedInteractionSystem.OnMoveAttempt. (#45999)

* blockmovement: check component lifecycle

* whitespace

* well, guess I'll clean up then

* private EntityQuery

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../SharedInteractionSystem.Blocking.cs       | 48 ++++++++++---------
 .../Interaction/SharedInteractionSystem.cs    |  2 -
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
index 5d566b850e..58a2856762 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
@@ -14,59 +14,61 @@ namespace Content.Shared.Interaction;
 /// </summary>
 public partial class SharedInteractionSystem
 {
-    private void InitializeBlocking()
-    {
-        SubscribeLocalEvent<BlockMovementComponent, UpdateCanMoveEvent>(OnMoveAttempt);
-        SubscribeLocalEvent<BlockMovementComponent, UseAttemptEvent>(CancelUseEvent);
-        SubscribeLocalEvent<BlockMovementComponent, InteractionAttemptEvent>(CancelInteractEvent);
-        SubscribeLocalEvent<BlockMovementComponent, DropAttemptEvent>(CancellableInteractEvent);
-        SubscribeLocalEvent<BlockMovementComponent, PickupAttemptEvent>(CancellableInteractEvent);
-        SubscribeLocalEvent<BlockMovementComponent, ChangeDirectionAttemptEvent>(CancelEvent);
-
-        SubscribeLocalEvent<BlockMovementComponent, ComponentStartup>(OnBlockingStartup);
-        SubscribeLocalEvent<BlockMovementComponent, ComponentShutdown>(OnBlockingShutdown);
-    }
+    [Dependency] private EntityQuery<RelayInputMoverComponent> _relayInputMoverQuery;
 
+    [SubscribeLocalEvent]
     private void CancelInteractEvent(Entity<BlockMovementComponent> ent, ref InteractionAttemptEvent args)
     {
         if (ent.Comp.BlockInteraction)
             args.Cancelled = true;
     }
 
+    [SubscribeLocalEvent]
     private void CancelUseEvent(Entity<BlockMovementComponent> ent, ref UseAttemptEvent args)
     {
         if (ent.Comp.BlockUse)
             args.Cancel();
     }
 
-    private void OnMoveAttempt(EntityUid uid, BlockMovementComponent component, UpdateCanMoveEvent args)
+    [SubscribeLocalEvent]
+    private void OnMoveAttempt(Entity<BlockMovementComponent> ent, ref UpdateCanMoveEvent args)
     {
         // If we're relaying then don't cancel.
-        if (HasComp<RelayInputMoverComponent>(uid))
+        if (_relayInputMoverQuery.HasComp(ent))
             return;
 
-        args.Cancel(); // no more scurrying around
+        args.Cancel();
     }
 
-    private void CancellableInteractEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
+    [SubscribeLocalEvent]
+    private void OnDropAttempt(Entity<BlockMovementComponent> ent, ref DropAttemptEvent args)
     {
-        if (component.BlockInteraction)
+        if (ent.Comp.BlockInteraction)
             args.Cancel();
     }
 
-    private void CancelEvent(EntityUid uid, BlockMovementComponent component, CancellableEntityEventArgs args)
+    [SubscribeLocalEvent]
+    private void OnPickupAttempt(Entity<BlockMovementComponent> ent, ref PickupAttemptEvent args)
+    {
+        if (ent.Comp.BlockInteraction)
+            args.Cancel();
+    }
+
+    [SubscribeLocalEvent]
+    private void CancelEvent(Entity<BlockMovementComponent> ent, ref ChangeDirectionAttemptEvent args)
     {
         args.Cancel();
     }
 
-    private void OnBlockingStartup(EntityUid uid, BlockMovementComponent component, ComponentStartup args)
+    [SubscribeLocalEvent]
+    private void OnBlockingStartup(Entity<BlockMovementComponent> ent, ref ComponentStartup args)
     {
-        _actionBlockerSystem.UpdateCanMove(uid);
+        _actionBlockerSystem.UpdateCanMove(ent);
     }
 
-    private void OnBlockingShutdown(EntityUid uid, BlockMovementComponent component, ComponentShutdown args)
+    [SubscribeLocalEvent]
+    private void OnBlockingRemove(Entity<BlockMovementComponent> ent, ref ComponentRemove args)
     {
-        _actionBlockerSystem.UpdateCanMove(uid);
+        _actionBlockerSystem.UpdateCanMove(ent);
     }
 }
-
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 0cf426b196..552fc49297 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -131,8 +131,6 @@ namespace Content.Shared.Interaction
                     CCVars.InteractionRateLimitAnnounceAdminsDelay,
                     RateLimitAlertAdmins)
             );
-
-            InitializeBlocking();
         }
 
         private void RateLimitAlertAdmins(ICommonSession session)

From d0550290e705296c67ff4849f176f56475c6f281 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:17:00 +0000
Subject: [PATCH 53/69] Handheld radio now lights up when on. (#45984)

* walkie talkie feedback

* update copyright

the fewer pixels the more legitimate the copyright claim

* simpler walkietalkie visuals, no walkietalkie-off

* per-RSI states

* active/on order in json, remove radio off inhands

* Remove unused states from meta.json

whoops

* muh seccie copyright
---
 .../Entities/Objects/Devices/radio.yml        |  30 ++++++++---
 .../Devices/communication.rsi/meta.json       |  13 +----
 .../off-walkietalkie-inhand-left.png          | Bin 338 -> 0 bytes
 .../off-walkietalkie-inhand-right.png         | Bin 1722 -> 0 bytes
 .../communication.rsi/walkietalkie-active.png | Bin 119 -> 108 bytes
 .../communication.rsi/walkietalkie-off.png    | Bin 290 -> 0 bytes
 .../communication.rsi/walkietalkie-on.png     | Bin 116 -> 127 bytes
 .../communication.rsi/walkietalkie.png        | Bin 299 -> 316 bytes
 .../Devices/securityhandy.rsi/meta.json       |  50 +++++++++---------
 .../securityhandy.rsi/walkietalkie-active.png | Bin 0 -> 108 bytes
 .../securityhandy.rsi/walkietalkie-off.png    | Bin 357 -> 0 bytes
 .../securityhandy.rsi/walkietalkie-on.png     | Bin 156 -> 127 bytes
 .../securityhandy.rsi/walkietalkie.png        | Bin 348 -> 282 bytes
 13 files changed, 49 insertions(+), 44 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png
 delete mode 100644 Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
 create mode 100644 Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png
 delete mode 100644 Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png

diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index adf094d12e..5551412745 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: handheld radio
-  description: A handy handheld radio.
   parent: BaseItem
   id: RadioHandheld
+  name: handheld radio
+  description: A handy handheld radio.
   components:
   - type: TelecomExempt
   - type: RadioMicrophone
@@ -16,8 +16,25 @@
     sprite: Objects/Devices/communication.rsi
     layers:
     - state: walkietalkie
-    - state: walkietalkie-on
-    state: walkietalkie
+    - map: [enum.RadioDeviceVisualLayers.Broadcasting]
+      state: walkietalkie-on
+      shader: unshaded
+      visible: false
+    - map: [enum.RadioDeviceVisualLayers.Speaker]
+      state: walkietalkie-active
+      shader: unshaded
+      visible: false
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.RadioDeviceVisuals.Broadcasting:
+        enum.RadioDeviceVisualLayers.Broadcasting:
+          True: { visible: true }
+          False: { visible: false }
+      enum.RadioDeviceVisuals.Speaker:
+        enum.RadioDeviceVisualLayers.Speaker:
+          True: { visible: true }
+          False: { visible: false }
   - type: Item
     sprite: Objects/Devices/communication.rsi
     heldPrefix: walkietalkie
@@ -26,10 +43,10 @@
     - Radio
 
 - type: entity
-  name: security radio
-  description: A handy security radio.
   parent: [ RadioHandheld, BaseSecurityContraband ]
   id: RadioHandheldSecurity
+  name: security radio
+  description: A handy security radio.
   components:
   - type: RadioMicrophone
     broadcastChannel: Security
@@ -41,4 +58,3 @@
     sprite: Objects/Devices/securityhandy.rsi
   - type: Item
     sprite: Objects/Devices/securityhandy.rsi
-    heldPrefix: walkietalkie
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
index 7aa33b0489..7c69dcca12 100644
--- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other lisenced sprites in the repo",
+    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Uplink radio sprites by Vermidia, derivative of other licensed sprites in the repo. walkietalkie/-on/-active edited by whatston3.",
     "size": {
         "x": 32,
         "y": 32
@@ -33,9 +33,6 @@
         {
             "name": "walkietalkie-on"
         },
-        {
-            "name": "walkietalkie-off"
-        },
         {
             "name": "walkietalkie-active"
         },
@@ -47,14 +44,6 @@
             "name": "walkietalkie-inhand-left",
             "directions": 4
         },
-        {
-            "name": "off-walkietalkie-inhand-right",
-            "directions": 4
-        },
-        {
-            "name": "off-walkietalkie-inhand-left",
-            "directions": 4
-        },
         {
             "name": "old-radio"
         },
diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-left.png
deleted file mode 100644
index 7aefcd07ef6f245717fef7ebb95b6942737f1bb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
zcmV-Y0j>UtP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0003QNkl<Zc%1Fp
z!3n}J6oBCuaR@iaMQ<K5f;VRn1V`x*3QpjmH&^gnFWtZ;B$DExr&iOaG|m5kgd#lp
z;^QI76951J06>O}X3ExDA7a*Z9Ua4a-}${Us;?|F)o2M)-OlQ4nxAjEY8GSG-^ciO
z1<X~WiOA)-6{*ViQ+G0x<DBzlS^BU#=c3XJ70~t3rrraJqL9sgp<Aavq`Cpe!>w7b
zr^mRm?C_H&7~-yWapjtN6CC_@+6nf_{(k@f000000D!!x9>IQcbMx<0-#*!&3Mah*
zVIIL+J19o>6_9ifXwM^<bzCmVS3sCYxK|@-tbKR;+V}hId4$*)$ydP8d4!}lKw}<Z
k5>0T(JOTg!0J0<^FUJCXBrGJW_W%F@07*qoM6N<$f)+TGx&QzG

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/off-walkietalkie-inhand-right.png
deleted file mode 100644
index de13046469104b2a024b62a1dab6a49041febbab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1722
zcmbVNZD<>19KR%FxVEFhbm*9PToG2;y*9lpN6$1(vNdDr(k|HQVC-`DBsqF_&-L!o
zr1fQE&P~xO%06saVMW*n6{lc73<|EIpdU&t44EH%!7&uZUfAjeTOIYeyxF<xaDmG`
z&;R*7|KI=p-c0pvU)Qv;3B#~;iQd=%dUw0eBWuwAN9xGW=(X1DeZj`C=JoF5!OD|Q
zV3>b{njUh7k~;+%>Xf9w44_K7iO?9<6)u^QJPaH>19GY%64z$V61b{}#9(KVNt#iR
zS9`}TuzS2OEsqb&A%zG(hj*0(q(BFbgqL*9u!WLHRP+jH?TTpvuRxq(k%+j2_)s#1
zN1+99o?=LuVK_V(qF6o<;F&Er$8ZeIbkZzGvb?|q1U87*egtB(l&mli+g9U3JCVpc
zjw#S|u~?*v9Tc>3G#d(qXojOXjzkF39y1)NL>hKmT|*4mvZb1i3Ju)VC}m*55eZ~z
z)dk&bs5R_bm{7pzl4Q~>#kek2fQsC}nFUL$kSj6`G@t{+u@RPSV9h*qpq+>RqPlT>
z4*?2oGTGo*)fQcEP}oj<6uD6g$f{^NJ!S%W0NAi#$sj(8%xrVLF@>lFBnMh)2(@~m
zQgxGYj-@z!^Pp-duxPihxBz0314II4jU}0_BpXb#L4gek4B7?-hN(i6P*JmEt3f%G
zWBwi}Dj7v`qz8f(S;#_5mypA%F697i8aV=Qgi(k>4O)m8S=X^ro`^<M7R;&|I<N<}
z_uz?mlxIUcPjVDnF*lhM5{B(ah71xhkwC$rR8<kOfgsCoWjK;&G9i*>0-a=tQ#cZ2
zvKfivIiBaZ`u!M`3vLP2?<@cF{w_;JEhuRZt;cOlw|0bH)kawztF_K<Fj8A-DqblU
zL6Y4z5DD4MKTwF8SbgXSRMi&q04e>Cx~Rfzn01Ph1tK{Vtq0Z}jf|(=hOPQR|I@|F
z*^1__!_mZWmyJ<{HjQBi3^d^^G|DFSKmHSjd3GdXk#uSDN}28Zs{7G+jyOI0<mH2h
zpS{(7#@kNJD<f;>rT)}26Ro}zgcW(?gZJ7Nr)QQEA6~d{dn`D5@%qvCzn?q2VX7Z{
z@xV4u-m}p^<<CEM;BP_s$hVQJM)KUT<EPZ}pEs5!m;0YT>+N!Ge$n+*>+j9Wf81Hj
z`7iFw`!}^3Pya#>&)|o=mydiRhOcU2?fk9V#hyJ=*Iw%QT*>n9$gk|#_uJhoHre|2
zg8tdp>rbxLJ;m?t?A`y?rIWsur1x2IpP)SBo7PX<Y<}(1;OvcH^!2%xEqgtu=2{N<
z&MbYptG&bbD`_Uq7qb4jmLKo79b5W%apC3JPAh!<_zy>izDzG~n!={B3Gae8(A3?$
euo)w}ZSVXyJ6=8auE*zoT@vxW*y)~q2mb<EBsety

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-active.png
index ecd4d0661c1b9667802a83b90142fdc714a66e82..95cf3d8ccd5e4d1af060c55596b0203cdb21201f 100644
GIT binary patch
delta 77
zcmXTVnV{mqSRCZ;#IWw1%u5Ca1~pF?$B>BDx91!M85md?3_QQ^FX5M+V?AH@pi%?#
h)SLI&85kP2GFF^o5}1CRO&h3#!PC{xWt~$(69CH37@7b8

delta 88
zcmc~PpP&+K=jq}Y649D0!MZp>q^Bv+fXmG$K}DTmn{CqH_cmYUW8UA(S@u7!X#Yv0
kY^eM}4UpmlMrLMahRqW=m=yNLd|&_qPgg&ebxsLQ0G^#66951J

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png
deleted file mode 100644
index 70e2b3a2a56ff9d446ed8f379c3fad5ab524ab40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002#Nkl<Zc%1E&
zF^<AO3`PH}xPVVFO(IeH7@H$(8qP4)igQqK1qv>KM1d5P6KuDIB^t`V1tJO^@kA8t
zJZTD#^zE-1+d!dEn1L80z1ojCjT8g_$3TpcIgK}Fkt0@B0)Uy#;pO?FJc70l!{HIU
zo0&?OD(JR>RZXl<pTphva))ylP=9f9KKB<~?CO=~p{ne*fvU>B?>UY=`P^feQbOCd
zNGW+!_)t~a{_zFwu_vFa2Y!BUqt`Ue5PQkmgd&n7_Zir%4ybBEL||qR5mYs?Ssk*?
oJjL9L$ZcXgelIOvC=}j~KhM{5)L%+=$p8QV07*qoM6N<$f<MT8W&i*H

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png
index 0bf04a782db0e0813899de8605f0cd665fea2f42..f0407d14488b1a468d1a8d0f869f208b7404cbd8 100644
GIT binary patch
delta 96
zcmV-m0H6PKe~=_w0drDELIAGL9O(c6069rSK~z|U?aUz#z#tSvK}bnBGH2*r(Ig1c
zDg^dhX4IOuDFMLkax|Rn`Sz~w3jdU7*hjPk066_Vg$3xuQyd@w0000<MNUMnLSTX&
C^d^J=

delta 85
zcmV-b0IL6gbdV%aJ4r-AR9J=W&>;!{AQXe)iGoM=4Bqu+!62Fh^Q!-sR<<w!0Pwx!
r9xz+pH`l)Go#GZ_xJ>{6fQO_5K7|G7DgVm<00000NkvXXu0mjfSL-D^

diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie.png
index 0799b3f9c8bb605924e5f0bd7fb4164075fa1f03..6834e594bc8244bd50610f997f9ee2e6e1f33e31 100644
GIT binary patch
delta 289
zcmV++0p9+r0=xo{B!2;OQb$4nuFf3k0002?Nkl<ZScUDBJ!->15QX1{<N(v<2HQw=
z<_KwZgop&4VUH4I@Fi6E3IcU9Y7B0i!r)?$Fe!wD+<9k(3wuA<VisoRF@HcJkyrt1
zt!RB;)|HY3Jc|Hpt;7u8lGhk#W)=YO-mjtM_N3B5d}HP(9e-pJ6N(9S=(k3Gen0T}
z{XYNgHfPjTi~LK1<EdM4Je(HRn>I{1Qwx|`hGCGUt%;}Ff_-n`oI_cbaL!@h2UlJX
zGmCG`RRtzn6Hhe*f0uFfilUfpEm4<{h+^Dz0_v(omJ5go-g^)cvRqJCZM2x1So;vE
nMKH7U+j02rni@QjNIV?>m?3waOaHZ@00000NkvXXu0mjf0Y!p?

delta 272
zcmV+r0q_320;>X$B!BWrL_t(|ob8k`4#F@DMSp<{_yEjV=<c0~u}7c_11HEqm>7DA
zt~~$}8>klmF~E?G1%w$;t9EOhiUIPZ3_p^cpTss02m}Ve7$e%)(U3-hf&VdJj1iy0
zYclZ(W@Z5Z=iCrpx*sZgh|8mT$sSUf=}Xi%;E+Xfnols_ynpJwVm-pNcp_d(?|iB+
zSX>{t+{Z0_?0**>%q)j25@wdNETyS6`P6M_twoxqu-0l*=wN1XdHV$_t;wgVf%EOt
zdP$PhT8q~tBqE=1oq_FYhgmEjA~@$jM3}{b?P}+3rV~RCBDINT`+fEBKp^mQyaC~7
Wcnq&YI#>Vz00{s|MNUMnLSTa9?0b#?

diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
index 2ff702f252..84ad1775ae 100644
--- a/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/securityhandy.rsi/meta.json
@@ -1,28 +1,28 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "walkietalkie"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6. Minor edits, unshaded separation by whatston3.",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "walkietalkie-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "walkietalkie-off"
-    },
-    {
-      "name": "walkietalkie-on"
-    }
-  ]
+    "states": [
+        {
+            "name": "walkietalkie"
+        },
+        {
+            "name": "walkietalkie-on"
+        },
+        {
+            "name": "walkietalkie-active"
+        },
+        {
+            "name": "walkietalkie-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "walkietalkie-inhand-right",
+            "directions": 4
+        }
+    ]
 }
diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..95cf3d8ccd5e4d1af060c55596b0203cdb21201f
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}YMw5RArY-_
z&p8S*Ft9Kfcz)qu!Y@0=dcN*Kr3U7yH}A7EFf?pstT@FaF#R~2Hc$tHr>mdKI;Vst
E05CWlK>z>%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-off.png
deleted file mode 100644
index 2afdf8d962fcb45b45e43332cb70909d2f71539a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$9Z5t%R9Hvtl`(F@KomsB1uc?APrElj8<9FGD0~NV14s&=zy(QefbZaf0%{N|
zZm@0o$P#S|N8_*-qRLw6yU4n+SMvHl&;K(Uq30{=xjq6wP~a{KD5Yv^ZKrQ_+H~uj
z0Pz15_yB6o!2-WQCawSrvTz*7%{*3B1u++Bt?Q#PI9yp_3gAI&7-PI$<-K7K)aTCu
zPP<u)FnQWwIR3`tr6oQGTqgkj@pARt)_H&3Hj0P<umx|%;6-Z`MS(O;;npH8Z~$Lr
zi9FAdWf?|E(g2A8a0oecP64+T1EAz{rP>)-TPv%817Hp?14IF6L+5)ICxpudF&Fe2
zL~J~rz`L^_pSuho_jw1APs;t}-2f022nzJBzz?yujUfgX)K>ri002ovPDHLkV1fVu
D=x>X5

diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie-on.png
index dfd79a644160d79f8d519a00ff5bc7abfe1244f7..af20e880abd95f1cdeba46474b0c5aaf86027379 100644
GIT binary patch
delta 84
zcmV-a0IUC;0e_G&PB}?LK~z|U?aZMO03i?r!J~=*k%ah?2*`y<Kq0Vazgw-DjR1hZ
qE7`DpvF{!||5LN!n%NQn;B^2#Oa!IL+d4S_0000<MNUMnLSTa91S0wX

delta 113
zcmb=Q!#Ke(JH*q)F(kr0IYlDjfW?7t#ywUECM<5wFyaJXV}mHq|3uN7Z5*Foi)@lj
zn9){n;AbTB1BR^7$0_XxRxl$JgIOy?nHaimuqoa>Cn?PU1fH&bF6*2Univ=WGC(H@

diff --git a/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png b/Resources/Textures/Objects/Devices/securityhandy.rsi/walkietalkie.png
index 12aaa3f2f091110ff2933e4599e6faf13b60ba5e..4e694002dabaf796da2fe2e36dc10f78f3ee59d7 100644
GIT binary patch
delta 242
zcmV<O01f}#0-6GlFn<8lNkl<ZScUDBy$u2}422&E21v&SUcm(e(B2M=z!>OyB$i0W
z06}7cYmjJY=x&5Z!<|xcz9<FwlOn~D>^%7oa2%%qB0{V0vaA#r@Gk;dfGuEdyquNA
z=_CRG&=3d!eczYR@*S#50!-N<KvgwmWHHqt0X(Q;x8IC!muvG2$J-5CLp)On0N`<d
zX4cvoW;#O&RFz%VF}JG;NC0DuR8__pnQ99tnE_J|TtB1NG|gyRnY9T+2y@(R<Z~|~
s%=bbS0i_p_S;R06!@b()j^q3sZ!&RmZTrAAYybcN07*qoM6N<$f|qk-zyJUM

delta 309
zcmV-50m}ZG0^9<SFn<9QNkl<ZSV!%ZJqp4=6okjZRtWaC+gq(ackm7oasaW(3DSrM
z5X>FCgFjo@Z)-0BTZ_m<SH;Q=@=~~Il7(#Emw9hyTWI)dHC!J7ASmz?1(Z^ywYJu`
zYHj*-P5}5n1(ra`Ihf%dWa0|2APYxPRLx^i6cBTP*19|xgMZzd6-EFCTEiIQ?JDmL
zTcEt0+F0$cPlROHMyGeh_|X!d1FjYT|G1yL${bgy6cGVn3l_#;t~K&JM;ym+YmpW>
zfb(X9EX$ClDY}zM1tbQ*A>`0G1>9N;fRay@dJe(bT3H1g0CRvDAPPVmI^VN6AzUtq
zxuDS?V&mxq-Y%W}_*`cIxz9U@d{XY4cLP9BASlqd0ykx{j3IkATx9?N002ovPDHLk
HV1fVuqwRy3


From 838aecdccc078ab3d4e866148debeb9b847751c6 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:41:31 +0000
Subject: [PATCH 54/69] Allow secondary/tertiary config atmos entities to be
 copied in the map editor (#45950)

Add SandboxCopyableComponent
---
 .../Sandbox/Components/SandboxCopyableComponent.cs    | 11 +++++++++++
 Content.Client/Sandbox/SandboxSystem.cs               | 10 +++++++++-
 Content.Server/Entry/IgnoredComponents.cs             |  3 ++-
 .../Structures/Piping/Atmospherics/binary.yml         |  3 ++-
 .../Piping/Atmospherics/gas_pipe_sensor.yml           |  2 +-
 .../Entities/Structures/Piping/Atmospherics/pipes.yml |  1 +
 .../Structures/Piping/Atmospherics/trinary.yml        |  1 +
 .../Entities/Structures/Piping/Atmospherics/unary.yml |  2 +-
 8 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 Content.Client/Sandbox/Components/SandboxCopyableComponent.cs

diff --git a/Content.Client/Sandbox/Components/SandboxCopyableComponent.cs b/Content.Client/Sandbox/Components/SandboxCopyableComponent.cs
new file mode 100644
index 0000000000..14c736fbac
--- /dev/null
+++ b/Content.Client/Sandbox/Components/SandboxCopyableComponent.cs
@@ -0,0 +1,11 @@
+namespace Content.Client.Sandbox.Components;
+
+/// <summary>
+/// A marker component for entities that can be copied in sandbox mode.
+/// </summary>
+/// <remarks>
+/// This is useful for entities with HideSpawnMenu set to true that should still be copied.
+/// (e.g. alternative pipe layouts). Will not work on abstract prototypes.
+/// </remarks>
+[RegisterComponent]
+public sealed partial class SandboxCopyableComponent : Component;
diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs
index 5c5bb6d848..e467f129e1 100644
--- a/Content.Client/Sandbox/SandboxSystem.cs
+++ b/Content.Client/Sandbox/SandboxSystem.cs
@@ -1,5 +1,6 @@
 using Content.Client.Administration.Managers;
 using Content.Client.Movement.Systems;
+using Content.Client.Sandbox.Components;
 using Content.Shared.Sandbox;
 using Robust.Client.Console;
 using Robust.Client.Placement;
@@ -18,6 +19,8 @@ namespace Content.Client.Sandbox
         [Dependency] private SharedTransformSystem _transform = default!;
         [Dependency] private SharedMapSystem _mapSystem = default!;
 
+        [Dependency] private EntityQuery<SandboxCopyableComponent> _sandboxCopyableQuery;
+
         private bool _sandboxEnabled;
         public bool SandboxAllowed { get; private set; }
         public event Action? SandboxEnabled;
@@ -97,7 +100,12 @@ namespace Content.Client.Sandbox
                 && TryComp(uid, out MetaDataComponent? comp)
                 && !comp.EntityDeleted)
             {
-                if (comp.EntityPrototype == null || comp.EntityPrototype.HideSpawnMenu || comp.EntityPrototype.Abstract)
+                // Unconditional failures.
+                if (comp.EntityPrototype == null || comp.EntityPrototype.Abstract)
+                    return false;
+
+                // Skippable failures.
+                if (comp.EntityPrototype.HideSpawnMenu && !_sandboxCopyableQuery.HasComp(uid))
                     return false;
 
                 if (_placement.Eraser)
diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs
index b1bbc3dbd8..27931548a4 100644
--- a/Content.Server/Entry/IgnoredComponents.cs
+++ b/Content.Server/Entry/IgnoredComponents.cs
@@ -22,7 +22,8 @@ namespace Content.Server.Entry
             "OptionsVisualizer",
             "AnomalyScannerScreen",
             "MultipartMachineGhost",
-            "DirectionalArrowIndicator"
+            "DirectionalArrowIndicator",
+            "SandboxCopyable"
         };
     }
 }
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
index 95f4691607..15950d34f6 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
@@ -27,6 +27,7 @@
       Primary: Structures/Piping/Atmospherics/pump.rsi
       Secondary: Structures/Piping/Atmospherics/pump_alt1.rsi
       Tertiary: Structures/Piping/Atmospherics/pump_alt2.rsi
+  - type: SandboxCopyable
 
 - type: entity
   parent: GasBinaryBase
@@ -559,7 +560,7 @@
       shader: unshaded
   - type: AtmosPipeLayers
     pipeLayer: !type:CreateVariants
-      values: [ 0, 1, 2 ] 
+      values: [ 0, 1, 2 ]
     spriteLayersRsiPaths:
       enum.PipeVisualLayers.Pipe:
         Primary: Structures/Piping/Atmospherics/pipe.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
index e3864f0d8c..c894423385 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
@@ -11,7 +11,7 @@
   components:
   - type: Sprite
     sprite: !type:CreateVariants
-       values: 
+       values:
        - Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
        - Structures/Piping/Atmospherics/gas_pipe_sensor_alt1.rsi
        - Structures/Piping/Atmospherics/gas_pipe_sensor_alt2.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 427b68b198..2c0397b49e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -74,6 +74,7 @@
         Primary: Structures/Piping/Atmospherics/pipe.rsi
         Secondary: Structures/Piping/Atmospherics/pipe_alt1.rsi
         Tertiary: Structures/Piping/Atmospherics/pipe_alt2.rsi
+  - type: SandboxCopyable
 
 - type: entity
   abstract: true
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 412ca4886c..0f601963ab 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -26,6 +26,7 @@
           !type:PipeNode
           nodeGroupID: Pipe
           pipeDirection: South
+    - type: SandboxCopyable
 
 - type: entity
   parent: GasTrinaryBase
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index 3b41ff8f97..c9d04ac0a9 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -19,6 +19,7 @@
           nodeGroupID: Pipe
           pipeDirection: South
     - type: CollideOnAnchor
+    - type: SandboxCopyable
 
 - type: entity
   parent: [GasUnaryBase, AirSensorBase]
@@ -553,4 +554,3 @@
   - type: GuideHelp
     guides:
     - GasCondensing
-

From e91add1eae60f0d2f489c3ffdac84f1c8a773c9c Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:42:07 +0000
Subject: [PATCH 55/69] Bugfix: Global comms consoles work without a station
 check. (#45836)

* Comms console consistency

* alert-level-unknown is kill

* Address Pok's suggestions

Co-authored-by: Pok27 <113675512+Pok27@users.noreply.github.com>

* Remove unneeded string interpolation from AlertLevelSystem.cs

1 char webedit gang

---------

Co-authored-by: Pok27 <113675512+Pok27@users.noreply.github.com>
---
 ...CommunicationsConsoleBoundUserInterface.cs | 30 +++++++++++++------
 .../CommunicationsConsoleSystem.cs            | 19 +++++++-----
 Content.Shared/AlertLevel/AlertLevelSystem.cs |  8 ++---
 .../en-US/alert-levels/alert-levels.ftl       |  3 +-
 .../communications-console-component.ftl      |  1 +
 .../Prototypes/AlertLevels/alert_levels.yml   | 10 +++++++
 6 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index eb416c3f3c..7923d817cd 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -21,10 +21,13 @@ public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid ow
     [Dependency] private StationSystem _station = default!;
     [Dependency] private AlertLevelSystem _alertLevel = default!;
 
+    [Dependency] private EntityQuery<AlertLevelComponent> _alertLevelQuery;
+
     [ViewVariables]
     private CommunicationsConsoleMenu? _menu;
 
     private static readonly EntProtoId FallbackScreen = "Screen";
+    private static readonly ProtoId<AlertLevelPrototype> UnknownAlertLevel = "Unknown";
 
     /// <inheritdoc/>
     protected override void Open()
@@ -81,21 +84,30 @@ public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid ow
     {
         base.UpdateState(state);
 
+        if (_menu == null)
+            return;
+
         if (state is not CommunicationsConsoleInterfaceState commsState)
             return;
 
         var stationUid = _station.GetOwningStation(Owner);
 
-        if (!EntMan.TryGetComponent<AlertLevelComponent>(stationUid, out var alertComp))
-            return;
-
-        if (_menu != null)
+        ProtoId<AlertLevelPrototype> currentAlertLevel;
+        List<ProtoId<AlertLevelPrototype>> selectableAlertLevels;
+        bool canChangeAlertLevel;
+        if (_alertLevelQuery.TryGetComponent(stationUid, out var alertComp))
         {
-            var currentAlertLevel = alertComp.CurrentAlertLevel;
-            var selectableAlertLevels = _alertLevel.GetSelectableAlertLevels((stationUid.Value, alertComp));
-            var canChangeAlertLevel = _alertLevel.CanChangeAlertLevel((stationUid.Value, alertComp));
-
-            _menu.UpdateState(commsState, currentAlertLevel, selectableAlertLevels, canChangeAlertLevel);
+            currentAlertLevel = alertComp.CurrentAlertLevel;
+            selectableAlertLevels = _alertLevel.GetSelectableAlertLevels((stationUid.Value, alertComp));
+            canChangeAlertLevel = _alertLevel.CanChangeAlertLevel((stationUid.Value, alertComp));
         }
+        else
+        {
+            currentAlertLevel = UnknownAlertLevel;
+            selectableAlertLevels = new() { UnknownAlertLevel };
+            canChangeAlertLevel = false;
+        }
+
+        _menu.UpdateState(commsState, currentAlertLevel, selectableAlertLevels, canChangeAlertLevel);
     }
 }
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index a5b32e1586..d05323d7c1 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -23,18 +23,18 @@ namespace Content.Server.Communications
 {
     public sealed partial class CommunicationsConsoleSystem : EntitySystem
     {
+        [Dependency] private IAdminLogManager _adminLogger = default!;
+        [Dependency] private IConfigurationManager _cfg = default!;
         [Dependency] private AccessReaderSystem _accessReaderSystem = default!;
         [Dependency] private AlertLevelSystem _alertLevelSystem = default!;
         [Dependency] private ChatSystem _chatSystem = default!;
         [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!;
         [Dependency] private EmergencyShuttleSystem _emergency = default!;
+        [Dependency] private IdentitySystem _identity = default!;
         [Dependency] private PopupSystem _popupSystem = default!;
         [Dependency] private RoundEndSystem _roundEndSystem = default!;
         [Dependency] private StationSystem _stationSystem = default!;
         [Dependency] private UserInterfaceSystem _uiSystem = default!;
-        [Dependency] private IConfigurationManager _cfg = default!;
-        [Dependency] private IAdminLogManager _adminLogger = default!;
-        [Dependency] private IdentitySystem _identity = default!;
 
         private const float UIUpdateInterval = 5.0f;
 
@@ -43,7 +43,7 @@ namespace Content.Server.Communications
             // All events that refresh the BUI
             SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
             SubscribeLocalEvent<RoundEndSystemChangedEvent>(_ => OnGenericBroadcastEvent());
-            SubscribeLocalEvent<AlertLevelDelayFinishedEvent>((ref AlertLevelDelayFinishedEvent ev) => OnGenericBroadcastEvent());
+            SubscribeLocalEvent((ref AlertLevelDelayFinishedEvent ev) => OnGenericBroadcastEvent());
 
             // Messages from the BUI
             SubscribeLocalEvent<CommunicationsConsoleComponent, CommunicationsConsoleSelectAlertLevelMessage>(OnSelectAlertLevelMessage);
@@ -133,15 +133,18 @@ namespace Content.Server.Communications
         {
             // TODO: Use component states and predict the UI
             _uiSystem.SetUiState(uid, CommunicationsConsoleUiKey.Key, new CommunicationsConsoleInterfaceState(
-                CanAnnounce(comp),
+                CanAnnounce((uid, comp)),
                 CanCallOrRecall(comp),
                 _roundEndSystem.ExpectedCountdownEnd
             ));
         }
 
-        private static bool CanAnnounce(CommunicationsConsoleComponent comp)
+        private bool CanAnnounce(Entity<CommunicationsConsoleComponent> ent, EntityUid? station = null)
         {
-            return comp.AnnouncementCooldownRemaining <= 0f;
+            if (station == null)
+                station = _stationSystem.GetOwningStation(ent) ?? EntityUid.Invalid;
+
+            return (station.Value.Valid || ent.Comp.Global) && ent.Comp.AnnouncementCooldownRemaining <= 0f;
         }
 
         private bool CanUse(EntityUid user, EntityUid console)
@@ -204,7 +207,7 @@ namespace Content.Server.Communications
             var author = Loc.GetString("comms-console-announcement-unknown-sender");
             if (message.Actor is { Valid: true } mob)
             {
-                if (!CanAnnounce(comp))
+                if (!CanAnnounce((uid, comp)))
                     return;
 
                 if (!CanUse(mob, uid))
diff --git a/Content.Shared/AlertLevel/AlertLevelSystem.cs b/Content.Shared/AlertLevel/AlertLevelSystem.cs
index 7fe5a0afce..bff4f6ca6f 100644
--- a/Content.Shared/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Shared/AlertLevel/AlertLevelSystem.cs
@@ -20,10 +20,10 @@ public sealed partial class AlertLevelSystem : EntitySystem
     [Dependency] private SharedChatSystem _chat = default!;
     [Dependency] private StationSystem _station = default!;
 
-    private static string _fallbackAlertKey = "alert-level-unknown";
-    private static string _fallbackAlertName = $"{_fallbackAlertKey}";
-    private static string _fallbackAlertAnnouncement = $"{_fallbackAlertKey}";
-    private static string _fallbackAlertInstructions = $"{_fallbackAlertKey}";
+    // Absolute worst case fallbacks.
+    private static string _fallbackAlertName = "generic-unknown-title";
+    private static string _fallbackAlertAnnouncement = "alert-level-unknown-announcement";
+    private static string _fallbackAlertInstructions = "alert-level-unknown-instructions";
 
     public override void Update(float time)
     {
diff --git a/Resources/Locale/en-US/alert-levels/alert-levels.ftl b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
index 31b2470acc..b33bd8303d 100644
--- a/Resources/Locale/en-US/alert-levels/alert-levels.ftl
+++ b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
@@ -1,6 +1,7 @@
 alert-level-announcement = Attention! Station alert level is now {$name}! {$announcement}
 
-alert-level-unknown = Unknown.
+# unknown name uses generic-unknown-title
+alert-level-unknown-announcement = This is a test of the alert broadcast system.
 alert-level-unknown-instructions = Unknown.
 
 alert-level-green = Green
diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl
index 18dc2f028c..27233bd3ad 100644
--- a/Resources/Locale/en-US/communications/communications-console-component.ftl
+++ b/Resources/Locale/en-US/communications/communications-console-component.ftl
@@ -46,3 +46,4 @@ comms-console-level-Red-flavour-label = Remain vigilant
 comms-console-level-Gamma-flavour-label = Suggest extreme caution
 comms-console-level-Delta-flavour-label = Good luck
 comms-console-level-Epsilon-flavour-label = You're fired
+comms-console-level-Unknown-flavour-label = Stay vigilant
diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml
index 6aa6b6e684..d74792a680 100644
--- a/Resources/Prototypes/AlertLevels/alert_levels.yml
+++ b/Resources/Prototypes/AlertLevels/alert_levels.yml
@@ -105,3 +105,13 @@
   color: PaleVioletRed
   emergencyLightColor: PaleVioletRed
   forceEnableEmergencyLights: true
+
+# Placeholder for the comms console in case of failure.
+- type: alertLevel
+  parent: Green
+  id: Unknown
+  name: generic-unknown-title
+  announcement: alert-level-unknown-announcement
+  instructions: alert-level-unknown-instructions
+  selectable: false
+  color: Gray

From a257d91f5fce397b07fe802eda2a56e782a5aba6 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:54:56 +0000
Subject: [PATCH 56/69] Cleanup: Modernize MaterialReclaimerSystem (#46281)

* MaterialReclaimerSystem: cleanup

* more cleanup

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../Materials/MaterialReclaimerSystem.cs      | 33 +++------
 .../SharedMaterialReclaimerSystem.cs          | 68 +++++++++----------
 2 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs
index a7344575d5..bf846612c9 100644
--- a/Content.Server/Materials/MaterialReclaimerSystem.cs
+++ b/Content.Server/Materials/MaterialReclaimerSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Ghost;
 using Content.Server.Popups;
-using Content.Server.Stack;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage.Systems;
@@ -28,31 +27,18 @@ namespace Content.Server.Materials;
 public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSystem
 {
     [Dependency] private AppearanceSystem _appearance = default!;
-    [Dependency] private GhostSystem _ghostSystem = default!;
+    [Dependency] private GhostSystem _ghost = default!;
     [Dependency] private MaterialStorageSystem _materialStorage = default!;
     [Dependency] private PopupSystem _popup = default!;
     [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] private GibbingSystem _gibbing = default!;
     [Dependency] private PuddleSystem _puddle = default!;
-    [Dependency] private StackSystem _stack = default!;
     [Dependency] private SharedMindSystem _mind = default!;
     [Dependency] private IAdminLogManager _adminLogger = default!;
     [Dependency] private SharedDestructibleSystem _destructible = default!;
     [Dependency] private DamageableSystem _damage = default!;
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<MaterialReclaimerComponent, PowerChangedEvent>(OnPowerChanged);
-        SubscribeLocalEvent<MaterialReclaimerComponent, SuicideByEnvironmentEvent>(OnSuicideByEnvironment);
-        SubscribeLocalEvent<ActiveMaterialReclaimerComponent, PowerChangedEvent>(OnActivePowerChanged);
-
-        SubscribeLocalEvent<MaterialReclaimerComponent, BreakageEventArgs>(OnBreakage);
-        SubscribeLocalEvent<MaterialReclaimerComponent, RepairedEvent>(OnRepaired);
-    }
-
+    [SubscribeLocalEvent]
     private void OnPowerChanged(Entity<MaterialReclaimerComponent> entity, ref PowerChangedEvent args)
     {
         AmbientSound.SetAmbience(entity.Owner, entity.Comp.Enabled && args.Powered);
@@ -60,6 +46,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
         Dirty(entity);
     }
 
+    [SubscribeLocalEvent]
     private void OnSuicideByEnvironment(Entity<MaterialReclaimerComponent> entity, ref SuicideByEnvironmentEvent args)
     {
         if (args.Handled)
@@ -69,7 +56,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
         if (TryComp(victim, out ActorComponent? actor) &&
             _mind.TryGetMind(actor.PlayerSession, out var mindId, out var mind))
         {
-            _ghostSystem.OnGhostAttempt(mindId, false, mind: mind);
+            _ghost.OnGhostAttempt(mindId, false, mind: mind);
             if (mind.OwnedEntity is { Valid: true } suicider)
             {
                 _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message"), suicider);
@@ -87,12 +74,14 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
         args.Handled = true;
     }
 
+    [SubscribeLocalEvent]
     private void OnActivePowerChanged(Entity<ActiveMaterialReclaimerComponent> entity, ref PowerChangedEvent args)
     {
         if (!args.Powered)
             TryFinishProcessItem(entity, null, entity.Comp);
     }
 
+    [SubscribeLocalEvent]
     private void OnBreakage(Entity<MaterialReclaimerComponent> ent, ref BreakageEventArgs args)
     {
         //un-emags itself when it breaks
@@ -100,6 +89,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
         SetBroken(ent, true);
     }
 
+    [SubscribeLocalEvent]
     private void OnRepaired(Entity<MaterialReclaimerComponent> ent, ref RepairedEvent args)
     {
         SetBroken(ent, false);
@@ -133,7 +123,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
         Dirty(uid, component);
 
         // scales the output if the process was interrupted.
-        var completion = 1f - Math.Clamp((float) Math.Round((active.EndTime - Timing.CurTime) / active.Duration),
+        var completion = 1f - Math.Clamp((float)Math.Round((active.EndTime - Timing.CurTime) / active.Duration),
             0f,
             1f);
         Reclaim(uid, item, completion, component);
@@ -159,10 +149,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
 
         if (CanDamageAndGib(uid, item, component))
         {
-            var didBloody = false;
-
-            if (component.DamageOnEmag is not null && _damage.TryChangeDamage(item, component.DamageOnEmag, false)) // It shouldn't ignore resistance
-                didBloody = true;
+            var didBloody = component.DamageOnEmag is not null && _damage.TryChangeDamage(item, component.DamageOnEmag); // It shouldn't ignore resistance
 
             if (_destructible.CanDestroy(item) && component.GibOnEmag)
             {
@@ -204,7 +191,7 @@ public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSys
 
         foreach (var (material, amount) in composition.MaterialComposition)
         {
-            var outputAmount = (int) (amount * efficiency * modifier);
+            var outputAmount = (int)(amount * efficiency * modifier);
             _materialStorage.TryChangeMaterialAmount(reclaimer, material, outputAmount, storage);
         }
 
diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
index a43f374d87..4555439335 100644
--- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
+++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Administration.Logs;
 using Content.Shared.Audio;
 using Content.Shared.Body;
@@ -17,7 +18,6 @@ using Robust.Shared.Containers;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
-using System.Linq;
 
 namespace Content.Shared.Materials;
 
@@ -27,30 +27,22 @@ namespace Content.Shared.Materials;
 /// </summary>
 public abstract partial class SharedMaterialReclaimerSystem : EntitySystem
 {
+    [Dependency] private EmagSystem _emag = default!;
+    [Dependency] private EntityWhitelistSystem _whitelist = default!;
     [Dependency] private ISharedAdminLogManager _adminLog = default!;
+    [Dependency] private OpenableSystem _openable = default!;
+    [Dependency] private SharedAudioSystem _audio = default!;
+    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
     [Dependency] protected IGameTiming Timing = default!;
     [Dependency] protected SharedAmbientSoundSystem AmbientSound = default!;
-    [Dependency] private SharedAudioSystem _audio = default!;
     [Dependency] protected SharedContainerSystem Container = default!;
-    [Dependency] private EntityWhitelistSystem _whitelistSystem = default!;
-    [Dependency] private EmagSystem _emag = default!;
-    [Dependency] private OpenableSystem _openable = default!;
-    [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!;
+
+    [Dependency] private EntityQuery<MaterialReclaimerComponent> _materialReclaimerQuery;
+    [Dependency] private EntityQuery<SolutionTransferComponent> _solutionTransferQuery;
 
     public const string ActiveReclaimerContainerId = "active-material-reclaimer-container";
 
-    /// <inheritdoc/>
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<MaterialReclaimerComponent, ComponentShutdown>(OnShutdown);
-        SubscribeLocalEvent<MaterialReclaimerComponent, ExaminedEvent>(OnExamined);
-        SubscribeLocalEvent<MaterialReclaimerComponent, GotEmaggedEvent>(OnEmagged);
-        SubscribeLocalEvent<MaterialReclaimerComponent, MapInitEvent>(OnMapInit);
-        SubscribeLocalEvent<CollideMaterialReclaimerComponent, StartCollideEvent>(OnCollide);
-        SubscribeLocalEvent<ActiveMaterialReclaimerComponent, ComponentStartup>(OnActiveStartup);
-        SubscribeLocalEvent<MaterialReclaimerComponent, InteractUsingEvent>(OnInteractUsing,
-            before: [typeof(SolutionTransferSystem), typeof(AnchorableSystem)]);
-    }
+    [SubscribeLocalEvent(before: [typeof(SolutionTransferSystem), typeof(AnchorableSystem)])]
     private void OnInteractUsing(Entity<MaterialReclaimerComponent> entity, ref InteractUsingEvent args)
     {
         if (args.Handled)
@@ -64,7 +56,7 @@ public abstract partial class SharedMaterialReclaimerSystem : EntitySystem
                 if (_openable.IsClosed(args.Used))
                     return;
 
-                if (TryComp<SolutionTransferComponent>(args.Used, out var transfer) &&
+                if (_solutionTransferQuery.TryComp(args.Used, out var transfer) &&
                     transfer.CanSend)
                     return;
             }
@@ -73,44 +65,50 @@ public abstract partial class SharedMaterialReclaimerSystem : EntitySystem
         args.Handled = TryStartProcessItem(entity.Owner, args.Used, entity.Comp, args.User);
     }
 
-    private void OnMapInit(EntityUid uid, MaterialReclaimerComponent component, MapInitEvent args)
+    [SubscribeLocalEvent]
+    private void OnMapInit(Entity<MaterialReclaimerComponent> ent, ref MapInitEvent args)
     {
-        component.NextSound = Timing.CurTime;
+        ent.Comp.NextSound = Timing.CurTime;
     }
 
-    private void OnShutdown(EntityUid uid, MaterialReclaimerComponent component, ComponentShutdown args)
+    [SubscribeLocalEvent]
+    private void OnShutdown(Entity<MaterialReclaimerComponent> ent, ref ComponentShutdown args)
     {
-        _audio.Stop(component.Stream);
+        _audio.Stop(ent.Comp.Stream);
     }
 
-    private void OnExamined(EntityUid uid, MaterialReclaimerComponent component, ExaminedEvent args)
+    [SubscribeLocalEvent]
+    private void OnExamined(Entity<MaterialReclaimerComponent> ent, ref ExaminedEvent args)
     {
-        args.PushMarkup(Loc.GetString("recycler-count-items", ("items", component.ItemsProcessed)));
+        args.PushMarkup(Loc.GetString("recycler-count-items", ("items", ent.Comp.ItemsProcessed)));
     }
 
-    private void OnEmagged(EntityUid uid, MaterialReclaimerComponent component, ref GotEmaggedEvent args)
+    [SubscribeLocalEvent]
+    private void OnEmagged(Entity<MaterialReclaimerComponent> ent, ref GotEmaggedEvent args)
     {
         if (!_emag.CompareFlag(args.Type, EmagType.Interaction))
             return;
 
-        if (_emag.CheckFlag(uid, EmagType.Interaction))
+        if (_emag.CheckFlag(ent, EmagType.Interaction))
             return;
 
         args.Handled = true;
     }
 
-    private void OnCollide(EntityUid uid, CollideMaterialReclaimerComponent component, ref StartCollideEvent args)
+    [SubscribeLocalEvent]
+    private void OnCollide(Entity<CollideMaterialReclaimerComponent> ent, ref StartCollideEvent args)
     {
-        if (args.OurFixtureId != component.FixtureId)
+        if (args.OurFixtureId != ent.Comp.FixtureId)
             return;
-        if (!TryComp<MaterialReclaimerComponent>(uid, out var reclaimer))
+        if (!_materialReclaimerQuery.TryComp(ent, out var reclaimer))
             return;
-        TryStartProcessItem(uid, args.OtherEntity, reclaimer);
+        TryStartProcessItem(ent, args.OtherEntity, reclaimer);
     }
 
-    private void OnActiveStartup(EntityUid uid, ActiveMaterialReclaimerComponent component, ComponentStartup args)
+    [SubscribeLocalEvent]
+    private void OnActiveStartup(Entity<ActiveMaterialReclaimerComponent> ent, ref ComponentStartup args)
     {
-        component.ReclaimingContainer = Container.EnsureContainer<Container>(uid, ActiveReclaimerContainerId);
+        ent.Comp.ReclaimingContainer = Container.EnsureContainer<Container>(ent, ActiveReclaimerContainerId);
     }
 
     /// <summary>
@@ -127,8 +125,8 @@ public abstract partial class SharedMaterialReclaimerSystem : EntitySystem
         if (HasComp<MobStateComponent>(item) && !CanDamageAndGib(uid, item, component)) // whitelist? We be gibbing, boy!
             return false;
 
-        if (_whitelistSystem.IsWhitelistFail(component.Whitelist, item) ||
-            _whitelistSystem.IsWhitelistPass(component.Blacklist, item))
+        if (_whitelist.IsWhitelistFail(component.Whitelist, item) ||
+            _whitelist.IsWhitelistPass(component.Blacklist, item))
             return false;
 
         if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item))

From 07f97fffa61bf03ed73f32101b03ca6702405e06 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 01:58:03 +0000
Subject: [PATCH 57/69] Cleanup: Resolve/suppress many obsolete warnings,
 delete EntityPrototypeHelpers. (#46141)

* Resolve warnings, mostly obsolete

* resolve via the entitymanager directly, not wref

* Ent<T>, why not

* minimize test diff

* StorageTest: consistent print order

* ChameleonProj: use Disguised value consistently

* GasArrayTest: TryComp

* OrganPickingMarker: cache ILocalizationManager

avoids warning from Loc.TryGetString, and avoids multiple IoCManager hits

* FormattedMessage.FromMarkup to FromMarkupOrThrow

* rerun tests :pray:
---
 .../AdminMessagePopupWindow.xaml.cs           |  4 +-
 .../UI/ChameleonBoundUserInterface.cs         |  5 +--
 .../Humanoid/OrganMarkingPicker.xaml.cs       | 12 ++----
 .../Tests/Atmos/GasArrayTest.cs               |  4 +-
 Content.IntegrationTests/Tests/CargoTest.cs   |  3 +-
 .../Tests/FillLevelSpriteTest.cs              |  3 +-
 .../Tests/Lathe/LatheTest.cs                  |  5 +--
 .../Tests/Puller/PullerTest.cs                |  3 +-
 .../Tests/Storage/StorageTest.cs              | 19 +++++----
 .../Tests/VendingMachineRestockTest.cs        |  3 +-
 .../Actions/Commands/AddActionCommand.cs      |  5 +--
 .../Converters/EntityCoordinatesConverter.cs  |  5 ++-
 Content.Server/Administration/ServerApi.cs    |  3 +-
 .../Construction/Completions/GivePrototype.cs |  6 ++-
 .../Completions/SpawnPrototype.cs             |  6 ++-
 Content.Server/Decals/DecalSystem.cs          | 28 +++++++------
 .../Behaviors/SpawnEntitiesBehavior.cs        |  3 +-
 .../Commands/AddObjectiveCommand.cs           |  3 +-
 Content.Server/Objectives/ObjectivesSystem.cs |  6 +--
 .../EntitySystems/StorageSystem.Fill.cs       | 22 +++++-----
 Content.Server/Traits/TraitSystem.cs          |  3 +-
 .../Weather/Commands/WeatherAddCommand.cs     |  3 +-
 .../Weather/Commands/WeatherRemoveCommand.cs  |  3 +-
 .../Weather/Commands/WeatherSetCommand.cs     |  3 +-
 Content.Shared/Actions/SharedActionsSystem.cs |  6 ++-
 ...edSolutionContainerSystem.Compatibility.cs |  7 +---
 .../SharedSolutionContainerSystem.cs          |  1 -
 .../Damage/Systems/SharedGodmodeSystem.cs     |  4 +-
 .../DecalGridChunkCollectionTypeSerializer.cs | 21 +++++-----
 Content.Shared/Decals/DecalGridComponent.cs   |  7 +++-
 Content.Shared/Decals/SharedDecalSystem.cs    | 13 +++---
 .../Kitchen/SharedKitchenSpikeSystem.cs       |  2 +-
 .../Systems/SharedChameleonProjectorSystem.cs | 16 ++++----
 .../Prototypes/EntityPrototypeHelpers.cs      | 40 -------------------
 Content.Shared/Stacks/SharedStackSystem.cs    |  2 +-
 .../StatusEffect/StatusEffectsComponent.cs    |  6 ++-
 .../StatusEffect/StatusEffectsSystem.cs       |  2 +-
 37 files changed, 125 insertions(+), 162 deletions(-)
 delete mode 100644 Content.Shared/Prototypes/EntityPrototypeHelpers.cs

diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
index b88bd1728f..d3becbf6bd 100644
--- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs
@@ -42,7 +42,7 @@ public sealed partial class AdminMessagePopupWindow : Control
 
     public void SetState(AdminMessageEuiState state)
     {
-        Timer = (float) state.Time.TotalSeconds;
+        Timer = (float)state.Time.TotalSeconds;
 
         MessageContainer.RemoveAllChildren();
 
@@ -52,7 +52,7 @@ public sealed partial class AdminMessagePopupWindow : Control
         }
 
         Description.SetMessage(
-            FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+            FormattedMessage.FromMarkupOrThrow(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)
diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
index 9fe36d683c..035dbe7b09 100644
--- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
+++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs
@@ -1,9 +1,7 @@
 using Content.Client.Clothing.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Tag;
-using Content.Shared.Prototypes;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 
@@ -54,7 +52,8 @@ public sealed partial class ChameleonBoundUserInterface : BoundUserInterface
                 newTargets.Add(target);
             }
             _menu?.UpdateState(newTargets, st.SelectedId);
-        } else
+        }
+        else
         {
             _menu?.UpdateState(targets, st.SelectedId);
         }
diff --git a/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs b/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs
index f426d79c43..728cdf3fe1 100644
--- a/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs
+++ b/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs
@@ -1,9 +1,7 @@
-using System.Linq;
 using Content.Shared.Body;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
@@ -14,9 +12,7 @@ namespace Content.Client.Humanoid;
 public sealed partial class OrganMarkingPicker : Control
 {
     [Dependency] private MarkingManager _marking = default!;
-    [Dependency] private IEntityManager _entity = default!;
-
-    private readonly SpriteSystem _sprite;
+    [Dependency] private ILocalizationManager _loc = default!;
 
     private readonly MarkingsViewModel _markingsModel;
     private readonly HashSet<HumanoidVisualLayers> _layers;
@@ -33,8 +29,6 @@ public sealed partial class OrganMarkingPicker : Control
         _group = group;
         _organ = organ;
 
-        _sprite = _entity.System<SpriteSystem>();
-
         UpdateMarkings();
     }
 
@@ -79,10 +73,10 @@ public sealed partial class OrganMarkingPicker : Control
 
             var control = new LayerMarkingPicker(_markingsModel, _organ, layer, allMarkings);
             LayerTabs.AddChild(control);
-            if (Loc.TryGetString($"markings-layer-{layer}-{_group.Id}", out var layerTitle))
+            if (_loc.TryGetString($"markings-layer-{layer}-{_group.Id}", out var layerTitle))
                 LayerTabs.SetTabTitle(i, layerTitle);
             else
-                LayerTabs.SetTabTitle(i, Loc.GetString($"markings-layer-{layer}"));
+                LayerTabs.SetTabTitle(i, _loc.GetString($"markings-layer-{layer}"));
             i++;
         }
 
diff --git a/Content.IntegrationTests/Tests/Atmos/GasArrayTest.cs b/Content.IntegrationTests/Tests/Atmos/GasArrayTest.cs
index 4b05fc16c3..6edfc9fe7b 100644
--- a/Content.IntegrationTests/Tests/Atmos/GasArrayTest.cs
+++ b/Content.IntegrationTests/Tests/Atmos/GasArrayTest.cs
@@ -50,7 +50,7 @@ public sealed class GasArrayTest : GameTest
         var gasTank = SProtoMan.Index(GasTankTestDummyId);
         using (Assert.EnterMultipleScope())
         {
-            Assert.That(gasTank.TryGetComponent<GasTankComponent>(out var gasTankComponent, _compFactory));
+            Assert.That(gasTank.TryComp<GasTankComponent>(out var gasTankComponent, _compFactory));
 
             Assert.That(gasTankComponent!.Air.GetMoles(Gas.Oxygen), Is.EqualTo(10));
             Assert.That(gasTankComponent!.Air.GetMoles(Gas.Frezon), Is.EqualTo(20));
@@ -63,7 +63,7 @@ public sealed class GasArrayTest : GameTest
         var legacyGasTank = SProtoMan.Index(GasTankLegacyTestDummyId);
         using (Assert.EnterMultipleScope())
         {
-            Assert.That(legacyGasTank.TryGetComponent<GasTankComponent>(out var gasTankComponent, _compFactory));
+            Assert.That(legacyGasTank.TryComp<GasTankComponent>(out var gasTankComponent, _compFactory));
 
             Assert.That(gasTankComponent!.Air.GetMoles(3), Is.EqualTo(10));
 
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
index 4a9bf0f0e6..7b99cfd951 100644
--- a/Content.IntegrationTests/Tests/CargoTest.cs
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -6,7 +6,6 @@ using Content.Server.Cargo.Components;
 using Content.Server.Cargo.Systems;
 using Content.Shared.Cargo.Prototypes;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Content.Shared.Storage;
 using Content.Shared.Tools.Components;
@@ -119,7 +118,7 @@ public sealed class CargoTest : GameTest
                         );
                     }
 
-                    if (proto.HasComponent<StackComponent>(_sCompFact))
+                    if (proto.HasComp<StackComponent>(_sCompFact))
                     {
                         Assert.That(
                             staticPriceComp.Price,
diff --git a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
index 6bee3aad7b..0e8eb3bc9d 100644
--- a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
+++ b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
@@ -2,7 +2,6 @@ using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components;
-using Content.Shared.Prototypes;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -43,7 +42,7 @@ public sealed class FillLevelSpriteTest : GameTest
                 {
                     Assert.That(proto.TryComp<SolutionContainerVisualsComponent>(out var visuals, componentFactory));
                     Assert.That(proto.TryComp<SpriteComponent>(out var sprite, componentFactory));
-                    if (!proto.HasComponent<AppearanceComponent>(componentFactory))
+                    if (!proto.HasComp<AppearanceComponent>(componentFactory))
                     {
                         Assert.Fail(@$"{proto.ID} has SolutionContainerVisualsComponent but no AppearanceComponent.");
                     }
diff --git a/Content.IntegrationTests/Tests/Lathe/LatheTest.cs b/Content.IntegrationTests/Tests/Lathe/LatheTest.cs
index 3f614d21b8..6e9073ae03 100644
--- a/Content.IntegrationTests/Tests/Lathe/LatheTest.cs
+++ b/Content.IntegrationTests/Tests/Lathe/LatheTest.cs
@@ -3,7 +3,6 @@ using System.Linq;
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Lathe;
 using Content.Shared.Materials;
-using Content.Shared.Prototypes;
 using Content.Shared.Research.Prototypes;
 using Content.Shared.Whitelist;
 using Robust.Shared.GameObjects;
@@ -35,13 +34,13 @@ public sealed class LatheTest : GameTest
             var latheProtos = protoMan.EnumeratePrototypes<EntityPrototype>()
                 .Where(p => !p.Abstract)
                 .Where(p => !pair.IsTestPrototype(p))
-                .Where(p => p.HasComponent<LatheComponent>());
+                .Where(p => p.HasComp<LatheComponent>(compFactory));
 
             // Find every EntityPrototype that can be inserted into a MaterialStorage
             var materialEntityProtos = protoMan.EnumeratePrototypes<EntityPrototype>()
                 .Where(p => !p.Abstract)
                 .Where(p => !pair.IsTestPrototype(p))
-                .Where(p => p.HasComponent<PhysicalCompositionComponent>());
+                .Where(p => p.HasComp<PhysicalCompositionComponent>(compFactory));
 
             // Spawn all of the above material EntityPrototypes - we need actual entities to do whitelist checks
             var materialEntities = new List<EntityUid>(materialEntityProtos.Count());
diff --git a/Content.IntegrationTests/Tests/Puller/PullerTest.cs b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
index e6d6655661..09f5226c80 100644
--- a/Content.IntegrationTests/Tests/Puller/PullerTest.cs
+++ b/Content.IntegrationTests/Tests/Puller/PullerTest.cs
@@ -1,7 +1,6 @@
 using Content.IntegrationTests.Fixtures;
 using Content.Shared.Hands.Components;
 using Content.Shared.Movement.Pulling.Components;
-using Content.Shared.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
@@ -36,7 +35,7 @@ public sealed class PullerTest : GameTest
                     if (!puller.NeedsHands)
                         continue;
 
-                    Assert.That(proto.HasComponent<HandsComponent>(compFactory), $"Found puller {proto} with NeedsHand pulling but has no hands?");
+                    Assert.That(proto.HasComp<HandsComponent>(compFactory), $"Found puller {proto} with NeedsHand pulling but has no hands?");
                 }
             });
         });
diff --git a/Content.IntegrationTests/Tests/Storage/StorageTest.cs b/Content.IntegrationTests/Tests/Storage/StorageTest.cs
index 4823d2bd15..ea65754692 100644
--- a/Content.IntegrationTests/Tests/Storage/StorageTest.cs
+++ b/Content.IntegrationTests/Tests/Storage/StorageTest.cs
@@ -6,7 +6,6 @@ using Content.IntegrationTests.Fixtures.Attributes;
 using Content.Server.Item;
 using Content.Shared.Containers;
 using Content.Shared.Item;
-using Content.Shared.Prototypes;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Content.Shared.Storage.EntitySystems;
@@ -54,6 +53,7 @@ public sealed class StorageTest : GameTest
     }
 
     [Test]
+    [Obsolete("StorageFillComponent is obsolete.")]
     public async Task TestStorageFillPrototypes()
     {
         var pair = Pair;
@@ -82,6 +82,7 @@ public sealed class StorageTest : GameTest
     }
 
     [Test]
+    [Obsolete("StorageFillComponent is obsolete.")]
     public async Task TestSufficientSpaceForFill()
     {
         var pair = Pair;
@@ -101,7 +102,7 @@ public sealed class StorageTest : GameTest
         {
             foreach (var (proto, fill) in pair.GetPrototypesWithComponent<StorageFillComponent>())
             {
-                if (proto.HasComponent<EntityStorageComponent>(compFact))
+                if (proto.HasComp<EntityStorageComponent>(compFact))
                     continue;
 
                 StorageComponent? storage = null;
@@ -168,6 +169,7 @@ public sealed class StorageTest : GameTest
     }
 
     [Test]
+    [Obsolete("StorageFillComponent is obsolete.")]
     public async Task TestSufficientSpaceForEntityStorageFill()
     {
         var pair = Pair;
@@ -182,7 +184,7 @@ public sealed class StorageTest : GameTest
 
         foreach (var (proto, fill) in pair.GetPrototypesWithComponent<StorageFillComponent>())
         {
-            if (proto.HasComponent<StorageComponent>(compFact))
+            if (proto.HasComp<StorageComponent>(compFact))
                 continue;
 
             await server.WaitAssertion(() =>
@@ -222,6 +224,7 @@ public sealed class StorageTest : GameTest
         return 0;
     }
 
+    [Obsolete("StorageFillComponent is obsolete.")]
     private int GetFillSize(StorageFillComponent fill, bool getCount, IPrototypeManager protoMan, IComponentFactory compFact, SharedItemSystem itemSystem)
     {
         var totalSize = 0;
@@ -250,15 +253,17 @@ public sealed class StorageTest : GameTest
 
         Assert.Multiple(() =>
         {
-            foreach (var (proto, fill) in pair.GetPrototypesWithComponent<EntityTableContainerFillComponent>())
+#pragma warning disable CS0618 // StorageFillComponent is obsolete, but this test is still needed while it exists.
+            foreach (var (proto, fill) in pair.GetPrototypesWithComponent<StorageFillComponent>())
             {
-                Assert.That(!proto.HasComp<StorageFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(EntityTableContainerFillComponent)} and {nameof(StorageFillComponent)}.");
-                Assert.That(!proto.HasComp<ContainerFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(EntityTableContainerFillComponent)} and {nameof(ContainerFillComponent)}.");
+                Assert.That(!proto.HasComp<EntityTableContainerFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(StorageFillComponent)} and {nameof(EntityTableContainerFillComponent)}.");
+                Assert.That(!proto.HasComp<ContainerFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(StorageFillComponent)} and {nameof(ContainerFillComponent)}.");
             }
+#pragma warning restore CS0618
 
             foreach (var (proto, fill) in pair.GetPrototypesWithComponent<ContainerFillComponent>())
             {
-                Assert.That(!proto.HasComp<StorageFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(ContainerFillComponent)} and {nameof(StorageFillComponent)}.");
+                Assert.That(!proto.HasComp<EntityTableContainerFillComponent>(compFact), $"Prototype {proto.ID} has both {nameof(ContainerFillComponent)} and {nameof(EntityTableContainerFillComponent)}.");
             }
         });
     }
diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
index 2ada6e571d..fe146c1fd0 100644
--- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
+++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
@@ -9,7 +9,6 @@ using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.Damage.Systems;
 using Content.Shared.EntityTable;
-using Content.Shared.Prototypes;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.VendingMachines;
 using Content.Shared.VendingMachines.Components;
@@ -130,7 +129,7 @@ namespace Content.IntegrationTests.Tests
                 {
                     if (proto.Abstract
                         || pair.IsTestPrototype(proto)
-                        || !proto.HasComponent<VendingMachineRestockComponent>())
+                        || !proto.HasComp<VendingMachineRestockComponent>(compFact))
                         continue;
 
                     restockEntities.Add(proto.ID);
diff --git a/Content.Server/Actions/Commands/AddActionCommand.cs b/Content.Server/Actions/Commands/AddActionCommand.cs
index f5fa7c8e1f..dde08b1785 100644
--- a/Content.Server/Actions/Commands/AddActionCommand.cs
+++ b/Content.Server/Actions/Commands/AddActionCommand.cs
@@ -3,7 +3,6 @@ using Content.Server.Administration;
 using Content.Shared.Actions;
 using Content.Shared.Actions.Components;
 using Content.Shared.Administration;
-using Content.Shared.Prototypes;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
 
@@ -38,7 +37,7 @@ public sealed partial class AddActionCommand : LocalizedEntityCommands
         }
 
         if (!_prototypeManager.TryIndex<EntityPrototype>(args[1], out var proto) ||
-            !proto.HasComponent<ActionComponent>())
+            !proto.HasComp<ActionComponent>(EntityManager.ComponentFactory))
         {
             shell.WriteError(Loc.GetString("cmd-addaction-action-not-found", ("action", args[1])));
             return;
@@ -63,7 +62,7 @@ public sealed partial class AddActionCommand : LocalizedEntityCommands
             return CompletionResult.Empty;
 
         var actionPrototypes = _prototypeManager.EnumeratePrototypes<EntityPrototype>()
-            .Where(p => p.HasComponent<ActionComponent>())
+            .Where(p => p.HasComp<ActionComponent>(EntityManager.ComponentFactory))
             .Select(p => p.ID)
             .Order();
 
diff --git a/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs b/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
index 3a0ffeb758..641df450e8 100644
--- a/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
+++ b/Content.Server/Administration/Logs/Converters/EntityCoordinatesConverter.cs
@@ -23,7 +23,10 @@ public sealed class EntityCoordinatesConverter : AdminLogConverter<EntityCoordin
         WriteEntityInfo(writer, value.EntityId, entities, "parent");
         writer.WriteNumber("x", value.X);
         writer.WriteNumber("y", value.Y);
-        var mapUid = value.GetMapUid(entities);
+        EntityUid? mapUid = null;
+        if (_entityManager.TryGetTarget(out var entMan))
+            mapUid = entMan.GetComponent<TransformComponent>(value.EntityId).MapUid;
+
         if (mapUid.HasValue)
         {
             WriteEntityInfo(writer, mapUid.Value, entities, "map");
diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs
index 4554dba2fb..759d0ebc28 100644
--- a/Content.Server/Administration/ServerApi.cs
+++ b/Content.Server/Administration/ServerApi.cs
@@ -18,7 +18,6 @@ using Content.Shared.Database;
 using Content.Shared.GameTicking;
 using Content.Shared.GameTicking.Components;
 using Content.Shared.GameTicking.Prototypes;
-using Content.Shared.Prototypes;
 using Robust.Server.ServerStatus;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
@@ -516,7 +515,7 @@ public sealed partial class ServerApi : IPostInjectInit
             if (gameRule.Abstract)
                 continue;
 
-            if (gameRule.HasComponent<GameRuleComponent>(_componentFactory))
+            if (gameRule.HasComp<GameRuleComponent>(_componentFactory))
                 gameRules.Add(gameRule.ID);
         }
 
diff --git a/Content.Server/Construction/Completions/GivePrototype.cs b/Content.Server/Construction/Completions/GivePrototype.cs
index 22c5473c8d..441375224e 100644
--- a/Content.Server/Construction/Completions/GivePrototype.cs
+++ b/Content.Server/Construction/Completions/GivePrototype.cs
@@ -2,7 +2,6 @@ using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -24,7 +23,10 @@ public sealed partial class GivePrototype : IGraphAction
         if (string.IsNullOrEmpty(Prototype))
             return;
 
-        if (EntityPrototypeHelpers.HasComponent<StackComponent>(Prototype))
+        // TODO: pass PrototypeManager into IGraphAction
+        var protoMan = IoCManager.Resolve<IPrototypeManager>();
+
+        if (protoMan.TryIndex(Prototype, out var entProto) && entProto.HasComp<StackComponent>(entityManager.ComponentFactory))
         {
             var stackSystem = entityManager.EntitySysManager.GetEntitySystem<StackSystem>();
             var stacks = stackSystem.SpawnMultipleNextToOrDrop(Prototype, Amount, userUid ?? uid);
diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs
index cb6af955f6..853df94f7f 100644
--- a/Content.Server/Construction/Completions/SpawnPrototype.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototype.cs
@@ -1,6 +1,5 @@
 using Content.Server.Stack;
 using Content.Shared.Construction;
-using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -24,7 +23,10 @@ namespace Content.Server.Construction.Completions
 
             var coordinates = entityManager.GetComponent<TransformComponent>(uid).Coordinates;
 
-            if (EntityPrototypeHelpers.HasComponent<StackComponent>(Prototype))
+            // TODO: pass the PrototypeManager into IGraphAction.
+            var protoMan = IoCManager.Resolve<IPrototypeManager>();
+
+            if (protoMan.TryIndex(Prototype, out EntityPrototype? proto) && proto.HasComp<StackComponent>(entityManager.ComponentFactory))
             {
                 var stackEnt = entityManager.SpawnEntity(Prototype, coordinates);
                 var stack = entityManager.GetComponent<StackComponent>(stackEnt);
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index 61f530c356..5049c168dd 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -23,23 +23,24 @@ public sealed partial class DecalSystem : SharedDecalSystem
 
     [Dependency] private EntityQuery<MapGridComponent> _gridQuery;
 
-    private static readonly Vector2 _boundsMinExpansion = new(0.01f, 0.01f);
-    private static readonly Vector2 _boundsMaxExpansion = new(1.01f, 1.01f);
+    private static readonly Vector2 BoundsMinExpansion = new(0.01f, 0.01f);
+    private static readonly Vector2 BoundsMaxExpansion = new(1.01f, 1.01f);
 
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
-        SubscribeLocalEvent<DecalGridComponent, ComponentStartup>(OnLegacyDecalGridStartup);
         SubscribeLocalEvent<BeforeSerializationEvent>(OnBeforeSerialization);
         SubscribeLocalEvent<PostGridSplitEvent>(OnGridSplit);
     }
 
-    private void OnLegacyDecalGridStartup(EntityUid uid, DecalGridComponent component, ComponentStartup args)
+    [SubscribeLocalEvent]
+    [Obsolete("Uses obsolete DecalGridComponent.")]
+    private void OnLegacyDecalGridStartup(Entity<DecalGridComponent> ent, ref ComponentStartup args)
     {
-        MigrateLegacyDecalGrid(uid, component);
-        RemCompDeferred(uid, component);
+        MigrateLegacyDecalGrid(ent);
+        RemCompDeferred(ent, ent.Comp);
     }
 
     private void OnBeforeSerialization(BeforeSerializationEvent ev)
@@ -55,12 +56,14 @@ public sealed partial class DecalSystem : SharedDecalSystem
 
         foreach (var uid in ev.Entities)
         {
+#pragma warning disable CS0618 // DecalGridComponent compatibility behaviour.
             if (!TryComp<DecalGridComponent>(uid, out var component))
                 continue;
 
-            MigrateLegacyDecalGrid(uid, component);
+            MigrateLegacyDecalGrid((uid, component));
             RemComp(uid, component);
             migrated.Add(uid);
+#pragma warning restore CS0618
         }
 
         foreach (var uid in migrated)
@@ -72,14 +75,15 @@ public sealed partial class DecalSystem : SharedDecalSystem
         }
     }
 
-    private void MigrateLegacyDecalGrid(EntityUid uid, DecalGridComponent component)
+    [Obsolete("Uses obsolete DecalGridComponent.")]
+    private void MigrateLegacyDecalGrid(Entity<DecalGridComponent> ent)
     {
         // Old maps store grid-wide decal chunks; convert them into chunk entities and remove the legacy component.
-        foreach (var chunk in component.ChunkCollection.ChunkCollection.Values)
+        foreach (var chunk in ent.Comp.ChunkCollection.ChunkCollection.Values)
         {
             foreach (var (id, decal) in chunk.Decals)
             {
-                AddDecalWithId(uid, id, decal);
+                AddDecalWithId(ent, id, decal);
             }
         }
     }
@@ -95,7 +99,7 @@ public sealed partial class DecalSystem : SharedDecalSystem
         foreach (var tile in _mapSystem.GetAllTiles(ev.Grid, grid))
         {
             var tilePos = (Vector2)tile.GridIndices;
-            var bounds = new Box2(tilePos - _boundsMinExpansion, tilePos + _boundsMaxExpansion);
+            var bounds = new Box2(tilePos - BoundsMinExpansion, tilePos + BoundsMaxExpansion);
 
             foreach (var (id, decal) in GetDecalsIntersecting(ev.OldGrid, bounds))
             {
@@ -123,7 +127,7 @@ public sealed partial class DecalSystem : SharedDecalSystem
             if (!_turf.IsSpace(change.NewTile))
                 continue;
 
-            var tilePos = (Vector2) change.GridIndices;
+            var tilePos = (Vector2)change.GridIndices;
             var bounds = new Box2(tilePos, tilePos + Vector2.One);
 
             foreach (var (id, _) in GetDecalsIntersecting(args.Entity, bounds))
diff --git a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 31c63b606c..2f1d7f8a15 100644
--- a/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,7 +1,6 @@
 using System.Numerics;
 using Content.Shared.Destructible.Thresholds;
 using Content.Shared.Forensics.Components;
-using Content.Shared.Prototypes;
 using Content.Shared.Stacks;
 using Robust.Server.GameObjects;
 using Robust.Shared.Prototypes;
@@ -52,7 +51,7 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
                     if (count == 0)
                         continue;
 
-                    if (EntityPrototypeHelpers.HasComponent<StackComponent>(entityId, system.PrototypeManager, system.EntityManager.ComponentFactory))
+                    if (system.PrototypeManager.TryIndex(entityId, out var prototype) && prototype.HasComp<StackComponent>(system.EntityManager.ComponentFactory))
                     {
                         var spawned = SpawnInContainer
                             ? system.EntityManager.SpawnNextToOrDrop(entityId, owner)
diff --git a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
index 4679555100..722cc549a8 100644
--- a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
@@ -3,7 +3,6 @@ using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Mind;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Prototypes;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;
@@ -41,7 +40,7 @@ public sealed partial class AddObjectiveCommand : LocalizedEntityCommands
         }
 
         if (!_prototypes.TryIndex<EntityPrototype>(args[1], out var proto) ||
-            !proto.HasComponent<ObjectiveComponent>())
+            !proto.HasComp<ObjectiveComponent>(EntityManager.ComponentFactory))
         {
             shell.WriteError(Loc.GetString("cmd-addobjective-objective-not-found", ("obj", args[1])));
             return;
diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs
index 44db00da87..fa38c1bcf8 100644
--- a/Content.Server/Objectives/ObjectivesSystem.cs
+++ b/Content.Server/Objectives/ObjectivesSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.GameTicking;
 using Content.Server.Shuttles.Systems;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.GameTicking.Components;
@@ -14,7 +13,6 @@ using System.Text;
 using Content.Server.Objectives.Commands;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
-using Content.Shared.Prototypes;
 using Content.Shared.Roles.Jobs;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -214,7 +212,7 @@ public sealed partial class ObjectivesSystem : SharedObjectivesSystem
                 }
             }
 
-            var successRate = totalObjectives > 0 ? (float) completedObjectives / totalObjectives : 0f;
+            var successRate = totalObjectives > 0 ? (float)completedObjectives / totalObjectives : 0f;
             agentSummaries.Add((agentSummary.ToString(), successRate, completedObjectives));
         }
 
@@ -324,7 +322,7 @@ public sealed partial class ObjectivesSystem : SharedObjectivesSystem
     private void CreateCompletions()
     {
         _objectives = ProtoMan.EnumeratePrototypes<EntityPrototype>()
-            .Where(p => p.HasComponent<ObjectiveComponent>())
+            .Where(p => p.HasComp<ObjectiveComponent>(EntityManager.ComponentFactory))
             .Select(p => p.ID)
             .Order();
     }
diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
index c48b396435..d7af7d334f 100644
--- a/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
+++ b/Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using Content.Server.Spawners.Components;
 using Content.Shared.Item;
-using Content.Shared.Prototypes;
 using Content.Shared.Storage;
 using Content.Shared.Storage.Components;
 using Robust.Shared.Prototypes;
@@ -11,25 +10,27 @@ namespace Content.Server.Storage.EntitySystems;
 
 public sealed partial class StorageSystem
 {
-    private void OnStorageFillMapInit(EntityUid uid, StorageFillComponent component, MapInitEvent args)
+    [Obsolete("StorageFillComponent is obsolete.")]
+    private void OnStorageFillMapInit(Entity<StorageFillComponent> ent, ref MapInitEvent args)
     {
-        if (component.Contents.Count == 0)
+        if (ent.Comp.Contents.Count == 0)
             return;
 
-        if (TryComp<StorageComponent>(uid, out var storageComp))
+        if (TryComp<StorageComponent>(ent, out var storageComp))
         {
-            FillStorage((uid, component, storageComp));
+            FillStorage((ent, ent.Comp, storageComp));
         }
-        else if (TryComp<EntityStorageComponent>(uid, out var entityStorageComp))
+        else if (TryComp<EntityStorageComponent>(ent, out var entityStorageComp))
         {
-            FillEntityStorage((uid, component, entityStorageComp));
+            FillEntityStorage((ent, ent.Comp, entityStorageComp));
         }
         else
         {
-            Log.Error($"StorageFillComponent couldn't find any StorageComponent ({uid})");
+            Log.Error($"StorageFillComponent couldn't find any StorageComponent ({ent})");
         }
     }
 
+    [Obsolete("StorageFillComponent is obsolete.")]
     private void FillStorage(Entity<StorageFillComponent?, StorageComponent?> entity)
     {
         var (uid, component, storage) = entity;
@@ -48,7 +49,7 @@ public sealed partial class StorageSystem
 
             // No, you are not allowed to fill a container with entity spawners.
             DebugTools.Assert(!ProtoMan.Index<EntityPrototype>(spawnPrototype)
-                .HasComponent(typeof(RandomSpawnerComponent)));
+                .HasComp<RandomSpawnerComponent>(Factory));
 
             if (!TryComp<ItemComponent>(ent, out var itemComp))
             {
@@ -85,6 +86,7 @@ public sealed partial class StorageSystem
         }
     }
 
+    [Obsolete("StorageFillComponent is obsolete.")]
     private void FillEntityStorage(Entity<StorageFillComponent?, EntityStorageComponent?> entity)
     {
         var (uid, component, entityStorageComp) = entity;
@@ -99,7 +101,7 @@ public sealed partial class StorageSystem
         {
             // No, you are not allowed to fill a container with entity spawners.
             DebugTools.Assert(!ProtoMan.Index<EntityPrototype>(item)
-                .HasComponent(typeof(RandomSpawnerComponent)));
+                .HasComp<RandomSpawnerComponent>(Factory));
             var ent = Spawn(item, coordinates);
 
             // handle depending on storage component, again this should be unified after ECS
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index be5142146b..d3ba233567 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -4,7 +4,6 @@ using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Roles;
 using Content.Shared.Traits;
 using Content.Shared.Whitelist;
-using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traits;
 
@@ -44,8 +43,10 @@ public sealed partial class TraitSystem : EntitySystem
                 continue;
 
             // Add all components required by the prototype
+#pragma warning disable CS0618 // Enabling compatibility behaviour for TraitPrototype.Components
             if (traitPrototype.Components.Count > 0)
                 EntityManager.AddComponents(args.Mob, traitPrototype.Components, false);
+#pragma warning restore CS0618
 
             // Add all JobSpecials required by the prototype
             foreach (var special in traitPrototype.Specials)
diff --git a/Content.Server/Weather/Commands/WeatherAddCommand.cs b/Content.Server/Weather/Commands/WeatherAddCommand.cs
index c3ea94ca1f..cf81abeaf2 100644
--- a/Content.Server/Weather/Commands/WeatherAddCommand.cs
+++ b/Content.Server/Weather/Commands/WeatherAddCommand.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Prototypes;
 using Content.Shared.Weather;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -73,7 +72,7 @@ public sealed partial class WeatherAddCommand : LocalizedEntityCommands
             var opts = new List<CompletionOption>();
             foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
             {
-                if (!proto.HasComponent<WeatherStatusEffectComponent>(_compFactory))
+                if (!proto.HasComp<WeatherStatusEffectComponent>(_compFactory))
                     continue;
 
                 opts.Add(new CompletionOption(proto.ID, proto.Name));
diff --git a/Content.Server/Weather/Commands/WeatherRemoveCommand.cs b/Content.Server/Weather/Commands/WeatherRemoveCommand.cs
index 19ae23133e..d5cd25a75e 100644
--- a/Content.Server/Weather/Commands/WeatherRemoveCommand.cs
+++ b/Content.Server/Weather/Commands/WeatherRemoveCommand.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Prototypes;
 using Content.Shared.Weather;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -69,7 +68,7 @@ public sealed partial class WeatherRemoveCommand : LocalizedEntityCommands
             var opts = new List<CompletionOption>();
             foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
             {
-                if (!proto.HasComponent<WeatherStatusEffectComponent>(_compFactory))
+                if (!proto.HasComp<WeatherStatusEffectComponent>(_compFactory))
                     continue;
 
                 opts.Add(new CompletionOption(proto.ID, proto.Name));
diff --git a/Content.Server/Weather/Commands/WeatherSetCommand.cs b/Content.Server/Weather/Commands/WeatherSetCommand.cs
index ee787085c1..e38f90b2ec 100644
--- a/Content.Server/Weather/Commands/WeatherSetCommand.cs
+++ b/Content.Server/Weather/Commands/WeatherSetCommand.cs
@@ -1,6 +1,5 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Prototypes;
 using Content.Shared.Weather;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -75,7 +74,7 @@ public sealed partial class WeatherSetCommand : LocalizedEntityCommands
             var opts = new List<CompletionOption>();
             foreach (var proto in _proto.EnumeratePrototypes<EntityPrototype>())
             {
-                if (!proto.HasComponent<WeatherStatusEffectComponent>(_compFactory))
+                if (!proto.HasComp<WeatherStatusEffectComponent>(_compFactory))
                     continue;
 
                 opts.Add(new CompletionOption(proto.ID, proto.Name));
diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs
index 0248e41aa4..f36f0a64c9 100644
--- a/Content.Shared/Actions/SharedActionsSystem.cs
+++ b/Content.Shared/Actions/SharedActionsSystem.cs
@@ -590,13 +590,15 @@ public abstract partial class SharedActionsSystem : EntitySystem
         ev.Action = action;
 
         // TODO: This is where we'd add support for event lists
-        if (!action.Comp.RaiseOnUser && action.Comp.Container is {} container && !_mindQuery.HasComp(container))
+        if (!action.Comp.RaiseOnUser && action.Comp.Container is { } container && !_mindQuery.HasComp(container))
             target = container;
 
+#pragma warning disable CS0618 // Enabling RaiseOnAction compatibility behaviour.
         if (action.Comp.RaiseOnAction)
             target = action;
+#pragma warning restore CS0618
 
-        RaiseLocalEvent(target, (object) ev, broadcast: true);
+        RaiseLocalEvent(target, (object)ev, broadcast: true);
         handled = ev.Handled;
 
         if (!handled)
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
index b23ef95919..411950cc1f 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.Compatibility.cs
@@ -12,11 +12,8 @@ namespace Content.Shared.Chemistry.EntitySystems;
 /// </summary>
 public abstract partial class SharedSolutionContainerSystem
 {
-    public void InitializeContainerManager()
-    {
-        SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnSolutionContainerInit);
-    }
-
+    [SubscribeLocalEvent]
+    [Obsolete("Uses obsolete SolutionContainerManagerComponent.")]
     private void OnSolutionContainerInit(Entity<SolutionContainerManagerComponent> container, ref MapInitEvent args)
     {
         // Create the manager, this should also create a container, so we ensure it exists.
diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index b4ccdd7e09..a605084cbb 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -86,7 +86,6 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         base.Initialize();
 
         InitializeRelays();
-        InitializeContainerManager();
 
         SubscribeLocalEvent<SolutionComponent, ComponentGetState>(OnSolutionGetState);
         SubscribeLocalEvent<SolutionComponent, ComponentHandleState>(OnSolutionHandleState);
diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
index 5a041a59e4..b3bcac82b4 100644
--- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
+++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs
@@ -4,7 +4,6 @@ using Content.Shared.Destructible;
 using Content.Shared.Glue;
 using Content.Shared.Lube;
 using Content.Shared.Nutrition;
-using Content.Shared.Prototypes;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Slippery;
 using Content.Shared.StatusEffect;
@@ -21,7 +20,6 @@ public abstract partial class SharedGodmodeSystem : EntitySystem
 
         SubscribeLocalEvent<GodmodeComponent, BeforeDamageChangedEvent>(OnBeforeDamageChanged);
         SubscribeLocalEvent<GodmodeComponent, BeforeStatusEffectAddedEvent>(OnBeforeStatusEffect);
-        SubscribeLocalEvent<GodmodeComponent, BeforeOldStatusEffectAddedEvent>(OnBeforeOldStatusEffect);
         SubscribeLocalEvent<GodmodeComponent, BeforeStaminaDamageEvent>(OnBeforeStaminaDamage);
         SubscribeLocalEvent<GodmodeComponent, IngestibleEvent>(BeforeEdible);
         SubscribeLocalEvent<GodmodeComponent, SlipAttemptEvent>(OnSlipAttempt);
@@ -44,6 +42,8 @@ public abstract partial class SharedGodmodeSystem : EntitySystem
             args.Cancelled = true;
     }
 
+    [SubscribeLocalEvent]
+    [Obsolete("BeforeOldStatusEffectAddedEvent is obsolete.")]
     private void OnBeforeOldStatusEffect(Entity<GodmodeComponent> ent, ref BeforeOldStatusEffectAddedEvent args)
     {
         // Old status effect system doesn't distinguish between good and bad status effects
diff --git a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
index 2f8d11af08..9f35c2221c 100644
--- a/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
+++ b/Content.Shared/Decals/DecalGridChunkCollectionTypeSerializer.cs
@@ -1,8 +1,6 @@
 using System.Globalization;
-using System.Linq;
 using System.Numerics;
 using Robust.Shared.GameStates;
-using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
@@ -12,7 +10,10 @@ using Robust.Shared.Serialization.Markdown.Validation;
 using Robust.Shared.Serialization.Markdown.Value;
 using Robust.Shared.Serialization.TypeSerializers.Interfaces;
 using Robust.Shared.Utility;
+
+#pragma warning disable CS0618 // Obsolete: enabling compatibility features.
 using static Content.Shared.Decals.DecalGridComponent;
+#pragma warning restore CS0618
 
 namespace Content.Shared.Decals
 {
@@ -28,7 +29,7 @@ namespace Content.Shared.Decals
             IDependencyCollection dependencies, ISerializationContext? context = null)
         {
             node.TryGetValue("version", out var versionNode);
-            var version = ((ValueDataNode?) versionNode)?.AsInt() ?? VersionUnspecified;
+            var version = ((ValueDataNode?)versionNode)?.AsInt() ?? VersionUnspecified;
 
             return version switch
             {
@@ -45,7 +46,7 @@ namespace Content.Shared.Decals
             ISerializationManager.InstantiationDelegate<DecalGridChunkCollection>? _ = default)
         {
             node.TryGetValue("version", out var versionNode);
-            var version = ((ValueDataNode?) versionNode)?.AsInt() ?? VersionUnspecified;
+            var version = ((ValueDataNode?)versionNode)?.AsInt() ?? VersionUnspecified;
 
             return version switch
             {
@@ -81,7 +82,7 @@ namespace Content.Shared.Decals
                     chunk.Decals[index.Id] = decal;
 
                     if (uid <= DecalChunkComponent.MaxServerDecalId)
-                        nextIndex = Math.Max(nextIndex, (ushort) (uid + 1));
+                        nextIndex = Math.Max(nextIndex, (ushort)(uid + 1));
                 }
             }
 
@@ -220,20 +221,20 @@ namespace Content.Shared.Decals
         {
             var used = usedIds.GetOrNew(chunk);
 
-            if (id <= DecalChunkComponent.MaxServerDecalId && used.Add((ushort) id))
+            if (id <= DecalChunkComponent.MaxServerDecalId && used.Add((ushort)id))
             {
-                nextIndex = Math.Max(nextIndex, (ushort) (id + 1));
-                return new DecalIndex(chunk, (ushort) id);
+                nextIndex = Math.Max(nextIndex, (ushort)(id + 1));
+                return new DecalIndex(chunk, (ushort)id);
             }
 
             for (var i = 0; i <= DecalChunkComponent.MaxServerDecalId; i++)
             {
-                var remapped = (ushort) i;
+                var remapped = (ushort)i;
 
                 if (!used.Add(remapped))
                     continue;
 
-                nextIndex = Math.Max(nextIndex, (ushort) (remapped + 1));
+                nextIndex = Math.Max(nextIndex, (ushort)(remapped + 1));
                 return new DecalIndex(chunk, remapped);
             }
 
diff --git a/Content.Shared/Decals/DecalGridComponent.cs b/Content.Shared/Decals/DecalGridComponent.cs
index 124311fcdc..b49d4a7d55 100644
--- a/Content.Shared/Decals/DecalGridComponent.cs
+++ b/Content.Shared/Decals/DecalGridComponent.cs
@@ -3,7 +3,10 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+
+#pragma warning disable CS0618 // This IS the obsolete component, this warning is redundant.
 using static Content.Shared.Decals.DecalGridComponent;
+#pragma warning restore CS0618
 
 namespace Content.Shared.Decals
 {
@@ -18,7 +21,7 @@ namespace Content.Shared.Decals
     {
         [Access(Other = AccessPermissions.ReadExecute)]
         [DataField(serverOnly: true)]
-        public DecalGridChunkCollection ChunkCollection = new(new ());
+        public DecalGridChunkCollection ChunkCollection = new(new());
 
         /// <summary>
         ///     Dictionary mapping decals to their corresponding grid chunks.
@@ -34,7 +37,7 @@ namespace Content.Shared.Decals
         [Serializable, NetSerializable]
         public sealed partial class DecalChunk
         {
-            [IncludeDataField(customTypeSerializer:typeof(DictionarySerializer<ushort, Decal>))]
+            [IncludeDataField(customTypeSerializer: typeof(DictionarySerializer<ushort, Decal>))]
             public Dictionary<ushort, Decal> Decals;
 
             [NonSerialized]
diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs
index 9f31f87ddd..bdd83f8790 100644
--- a/Content.Shared/Decals/SharedDecalSystem.cs
+++ b/Content.Shared/Decals/SharedDecalSystem.cs
@@ -20,7 +20,6 @@ namespace Content.Shared.Decals
         {
             base.Initialize();
 
-            SubscribeLocalEvent<DecalGridComponent, ComponentGetState>(OnGetState);
             SubscribeLocalEvent<DecalChunkComponent, ComponentStartup>(OnChunkStartup);
             SubscribeAllEvent<RequestDecalPlacementEvent>(OnDecalPlacementRequest);
             SubscribeAllEvent<RequestDecalRemovalEvent>(OnDecalRemovalRequest);
@@ -35,26 +34,28 @@ namespace Content.Shared.Decals
             RebuildFreeDecalIds(ent.Comp);
         }
 
-        private void OnGetState(EntityUid uid, DecalGridComponent component, ref ComponentGetState args)
+        [SubscribeLocalEvent]
+        [Obsolete("Uses obsolete DecalGridComponent.")]
+        private void OnGetState(Entity<DecalGridComponent> ent, ref ComponentGetState args)
         {
             if (PvsEnabled && !args.ReplayState)
                 return;
 
             // Should this be a full component state or a delta-state?
-            if (args.FromTick <= component.CreationTick || args.FromTick <= component.ForceTick)
+            if (args.FromTick <= ent.Comp.CreationTick || args.FromTick <= ent.Comp.ForceTick)
             {
-                args.State = new DecalGridState(component.ChunkCollection.ChunkCollection);
+                args.State = new DecalGridState(ent.Comp.ChunkCollection.ChunkCollection);
                 return;
             }
 
             var data = new Dictionary<Vector2i, DecalGridComponent.DecalChunk>();
-            foreach (var (index, chunk) in component.ChunkCollection.ChunkCollection)
+            foreach (var (index, chunk) in ent.Comp.ChunkCollection.ChunkCollection)
             {
                 if (chunk.LastModified >= args.FromTick)
                     data[index] = chunk;
             }
 
-            args.State = new DecalGridDeltaState(data, new(component.ChunkCollection.ChunkCollection.Keys));
+            args.State = new DecalGridDeltaState(data, new(ent.Comp.ChunkCollection.ChunkCollection.Keys));
         }
 
         public HashSet<(DecalIndex Index, Decal Decal)> GetDecalsInRange(EntityUid gridId, Vector2 position, float distance = 0.75f, Func<Decal, bool>? validDelegate = null)
diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
index 8c99feaa4b..547fda8485 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
+++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs
@@ -151,7 +151,7 @@ public sealed partial class SharedKitchenSpikeSystem : EntitySystem
 
         if (butcherable.SpawnedEntities.Count == 0)
         {
-            _popupSystem.PopupClient(Loc.GetString("comp-kitchen-spike-butcher-empty", ("victim", Identity.Entity(victim.Value, EntityManager))), ent, args.User, PopupType.MediumCaution);
+            _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-butcher-empty", ("victim", Identity.Entity(victim.Value, EntityManager))), ent, args.User, PopupType.MediumCaution);
             return;
         }
 
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index 6d18027b4e..10964d2554 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -108,7 +108,7 @@ public abstract partial class SharedChameleonProjectorSystem : EntitySystem
 
     private void OnInteract(Entity<ChameleonProjectorComponent> ent, ref AfterInteractEvent args)
     {
-        if (args.Handled || !args.CanReach || args.Target is not {} target)
+        if (args.Handled || !args.CanReach || args.Target is not { } target)
             return;
 
         args.Handled = true;
@@ -169,18 +169,18 @@ public abstract partial class SharedChameleonProjectorSystem : EntitySystem
 
     private void OnToggleNoRot(Entity<ChameleonProjectorComponent> ent, ref DisguiseToggleNoRotEvent args)
     {
-        if (ent.Comp.Disguised is not {} uid)
+        if (ent.Comp.Disguised is not { } uid)
             return;
 
         var xform = Transform(uid);
         _xform.SetLocalRotationNoLerp(uid, 0, xform);
-        xform.NoLocalRotation = !xform.NoLocalRotation;
+        _xform.SetNoLocalRotation(uid, !xform.NoLocalRotation, xform);
         args.Handled = true;
     }
 
     private void OnToggleAnchored(Entity<ChameleonProjectorComponent> ent, ref DisguiseToggleAnchoredEvent args)
     {
-        if (ent.Comp.Disguised is not {} uid)
+        if (ent.Comp.Disguised is not { } uid)
             return;
 
         var xform = Transform(uid);
@@ -294,12 +294,12 @@ public abstract partial class SharedChameleonProjectorSystem : EntitySystem
         if (!Resolve(disguised, ref disguised.Comp, false))
             return;
 
-        if (ent.Comp.Disguised == null)
+        if (ent.Comp.Disguised is not { } user)
             return;
 
-        var xform = Transform(ent.Comp.Disguised.Value);
-        xform.NoLocalRotation = false;
-        _xform.Unanchor(disguised, xform);
+        var xform = Transform(user);
+        _xform.SetNoLocalRotation(user, false, xform);
+        _xform.Unanchor(user, xform);
 
         ent.Comp.Disguised = null;
         Del(disguised.Comp.Disguise);
diff --git a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
deleted file mode 100644
index d2e5387d17..0000000000
--- a/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Shared.Prototypes;
-
-namespace Content.Shared.Prototypes
-{
-    [UsedImplicitly]
-    [Obsolete("More efficient methods exist in EntityPrototype.HasComp and EntitySystem's proxy methods")]
-    public static class EntityPrototypeHelpers
-    {
-        [Obsolete("More efficient methods exist in EntityPrototype.HasComp and EntitySystem's proxy methods")]
-        public static bool HasComponent<T>(this EntityPrototype prototype, IComponentFactory? componentFactory = null) where T : IComponent
-        {
-            return prototype.HasComponent(typeof(T), componentFactory);
-        }
-
-        [Obsolete("More efficient methods exist in EntityPrototype.HasComp and EntitySystem's proxy methods")]
-        public static bool HasComponent(this EntityPrototype prototype, Type component, IComponentFactory? componentFactory = null)
-        {
-            componentFactory ??= IoCManager.Resolve<IComponentFactory>();
-
-            var registration = componentFactory.GetRegistration(component);
-
-            return prototype.Components.ContainsKey(registration.Name);
-        }
-
-        [Obsolete("More efficient methods exist in EntityPrototype.HasComp and EntitySystem's proxy methods")]
-        public static bool HasComponent<T>(string prototype, IPrototypeManager? prototypeManager = null, IComponentFactory? componentFactory = null) where T : IComponent
-        {
-            return HasComponent(prototype, typeof(T), prototypeManager, componentFactory);
-        }
-
-        [Obsolete("More efficient methods exist in EntityPrototype.HasComp and EntitySystem's proxy methods")]
-        public static bool HasComponent(string prototype, Type component, IPrototypeManager? prototypeManager = null, IComponentFactory? componentFactory = null)
-        {
-            prototypeManager ??= IoCManager.Resolve<IPrototypeManager>();
-
-            return prototypeManager.TryIndex(prototype, out EntityPrototype? proto) && proto.HasComponent(component, componentFactory);
-        }
-    }
-}
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index 771aced664..961c453d52 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -38,7 +38,7 @@ public abstract partial class SharedStackSystem : EntitySystem
         base.Initialize();
 
         _vvm.GetTypeHandler<StackComponent>()
-            .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
+            .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, (uid, value, comp) => SetCount((uid, comp), value));
     }
 
     public override void Shutdown()
diff --git a/Content.Shared/StatusEffect/StatusEffectsComponent.cs b/Content.Shared/StatusEffect/StatusEffectsComponent.cs
index d61af62537..02c3ab2be1 100644
--- a/Content.Shared/StatusEffect/StatusEffectsComponent.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsComponent.cs
@@ -6,6 +6,7 @@ namespace Content.Shared.StatusEffect
     [RegisterComponent]
     [NetworkedComponent]
     [Access(typeof(StatusEffectsSystem))]
+    [Obsolete("Use StatusEffectContainerComponent and Content.Shared.StatusEffectNew.StatusEffectsSystem instead.")]
     public sealed partial class StatusEffectsComponent : Component
     {
         [ViewVariables]
@@ -19,7 +20,8 @@ namespace Content.Shared.StatusEffect
     }
 
     [RegisterComponent]
-    public sealed partial class ActiveStatusEffectsComponent : Component {}
+    [Obsolete("Use the new Content.Shared.StatusEffectNew.StatusEffectsSystem instead.")]
+    public sealed partial class ActiveStatusEffectsComponent : Component { }
 
     /// <summary>
     ///     Holds information about an active status effect.
@@ -47,7 +49,7 @@ namespace Content.Shared.StatusEffect
         [ViewVariables]
         public string? RelevantComponent;
 
-        public StatusEffectState((TimeSpan, TimeSpan) cooldown, bool refresh, string? relevantComponent=null)
+        public StatusEffectState((TimeSpan, TimeSpan) cooldown, bool refresh, string? relevantComponent = null)
         {
             Cooldown = cooldown;
             CooldownRefresh = refresh;
diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
index 3bbce59101..5cc49dd320 100644
--- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs
+++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs
@@ -136,7 +136,7 @@ namespace Content.Shared.StatusEffect
                 // If they already have the comp, we just won't bother updating anything.
                 if (!HasComp(uid, Factory.GetRegistration(component).Type))
                 {
-                    var newComponent = (Component) Factory.GetComponent(component);
+                    var newComponent = (Component)Factory.GetComponent(component);
                     AddComp(uid, newComponent);
                     status.ActiveEffects[key].RelevantComponent = component;
                 }

From 58dae1ce4a0806fa3b928834789b2b508b47b0f3 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 02:24:24 +0000
Subject: [PATCH 58/69] Check RelayInputMoverComponent lifecycle when applying
 input (#46172)

* Remove operator relay components immediately

* Use EntityQuery for relay comp lookups

* learn your ABCs with whatstone

* Check component lifecycle, not immediate removal
---
 .../Systems/SharedMoverController.Input.cs        |  2 +-
 Content.Shared/Vehicle/Systems/VehicleSystem.cs   | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index 4d591a9a9d..e862adb545 100644
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -312,7 +312,7 @@ namespace Content.Shared.Movement.Systems
                 return;
 
             // TODO: Should move this into HandleMobMovement itself.
-            if (entity.Comp.CanMove && RelayQuery.TryComp(entity, out var relayMover))
+            if (entity.Comp.CanMove && RelayQuery.TryComp(entity, out var relayMover) && relayMover.Running)
             {
                 DebugTools.Assert(relayMover.RelayEntity != entity.Owner);
                 DebugTools.AssertNotNull(relayMover.RelayEntity);
diff --git a/Content.Shared/Vehicle/Systems/VehicleSystem.cs b/Content.Shared/Vehicle/Systems/VehicleSystem.cs
index 076a28fe0e..e5111252c4 100644
--- a/Content.Shared/Vehicle/Systems/VehicleSystem.cs
+++ b/Content.Shared/Vehicle/Systems/VehicleSystem.cs
@@ -39,12 +39,15 @@ public sealed partial class VehicleSystem : EntitySystem
     [Dependency] private SharedVirtualItemSystem _virtualItem = default!;
     [Dependency] private IGameTiming _timing = default!;
 
-    [Dependency] private EntityQuery<VehicleComponent> _vehicleQuery;
-    [Dependency] private EntityQuery<VehicleOperatorComponent> _operatorQuery;
     [Dependency] private EntityQuery<AppearanceComponent> _appearanceQuery;
-    [Dependency] private EntityQuery<InputMoverComponent> _inputMoverQuery;
     [Dependency] private EntityQuery<HandsComponent> _handsQuery;
+    [Dependency] private EntityQuery<InputMoverComponent> _inputMoverQuery;
+    [Dependency] private EntityQuery<InteractionRelayComponent> _interactionRelayQuery;
+    [Dependency] private EntityQuery<MovementRelayTargetComponent> _movementRelayQuery;
+    [Dependency] private EntityQuery<RelayInputMoverComponent> _relayInputMoverQuery;
+    [Dependency] private EntityQuery<VehicleComponent> _vehicleQuery;
     [Dependency] private EntityQuery<VehicleHandBlockerComponent> _handBlockerQuery;
+    [Dependency] private EntityQuery<VehicleOperatorComponent> _operatorQuery;
 
     /// <remarks>
     /// We subscribe to BeforeDamageChangedEvent so that we can access the damage value before the container is applied.
@@ -219,19 +222,19 @@ public sealed partial class VehicleSystem : EntitySystem
 
     private void ClearOperatorRelays(EntityUid operatorUid, EntityUid vehicleUid)
     {
-        if (TryComp<RelayInputMoverComponent>(operatorUid, out var relayMover) &&
+        if (_relayInputMoverQuery.TryComp(operatorUid, out var relayMover) &&
             relayMover.RelayEntity == vehicleUid)
         {
             RemCompDeferred<RelayInputMoverComponent>(operatorUid);
         }
 
-        if (TryComp<InteractionRelayComponent>(operatorUid, out var interactionRelay) &&
+        if (_interactionRelayQuery.TryComp(operatorUid, out var interactionRelay) &&
             interactionRelay.RelayEntity == vehicleUid)
         {
             RemCompDeferred<InteractionRelayComponent>(operatorUid);
         }
 
-        if (TryComp<MovementRelayTargetComponent>(vehicleUid, out var relayTarget) &&
+        if (_movementRelayQuery.TryComp(vehicleUid, out var relayTarget) &&
             relayTarget.Source == operatorUid)
         {
             RemCompDeferred<MovementRelayTargetComponent>(vehicleUid);

From 763186613f196824f010bba663d353e4cce8f3ea Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 5 Oct 2026 02:44:27 +0000
Subject: [PATCH 59/69] Bugfix: Fix floating firelock pressure/temp warning
 lights (#46007)

* Firelock: temp/pressure layers in the component

* edge firelock too

* simplify

* mm inconsistent spacing
---
 Content.Client/Doors/FirelockSystem.cs        | 19 +++++++++++++++++++
 .../Structures/Doors/Firelocks/firelock.yml   | 10 ----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs
index 911d40b15c..dec91d1234 100644
--- a/Content.Client/Doors/FirelockSystem.cs
+++ b/Content.Client/Doors/FirelockSystem.cs
@@ -85,5 +85,24 @@ public sealed partial class FirelockSystem : SharedFirelockSystem
 
         if (_sprite.LayerMapTryGet((ent, args.Sprite), DoorVisualLayers.BaseBolted, out var boltedLayer, logMissing: false))
             _sprite.LayerSetVisible((ent, args.Sprite), boltedLayer, boltedVisible);
+
+        var warningLightsVisible =
+            state == DoorState.Closed
+            || state == DoorState.Welded
+            || state == DoorState.Denying;
+
+        if (_sprite.LayerMapTryGet((ent, args.Sprite), FirelockVisualLayersPressure.Base, out var pressureLayerIndex, logMissing: false))
+        {
+            if (!args.TryGetData<bool>(FirelockVisuals.PressureWarning, out var pressure))
+                pressure = false;
+            _sprite.LayerSetVisible((ent, args.Sprite), pressureLayerIndex, pressure && warningLightsVisible);
+        }
+
+        if (_sprite.LayerMapTryGet((ent, args.Sprite), FirelockVisualLayersTemperature.Base, out var tempLayerIndex, logMissing: false))
+        {
+            if (!args.TryGetData<bool>(FirelockVisuals.TemperatureWarning, out var temp))
+                temp = false;
+            _sprite.LayerSetVisible((ent, args.Sprite), tempLayerIndex, temp && warningLightsVisible);
+        }
     }
 }
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 838fa6151c..eb67ec4447 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -67,16 +67,6 @@
       shader: unshaded
       sprite: Structures/Doors/Airlocks/Effects/airlock-effects-firelock.rsi
       map: ["enum.FirelockVisualLayersTemperature.Base"]
-  - type: GenericVisualizer
-    visuals:
-      enum.FirelockVisuals.PressureWarning:
-        enum.FirelockVisualLayersPressure.Base:
-          True: { visible: true }
-          False: { visible: false }
-      enum.FirelockVisuals.TemperatureWarning:
-        enum.FirelockVisualLayersTemperature.Base:
-          True: { visible: true }
-          False: { visible: false }
   - type: AnimationPlayer
   - type: Fixtures
     fixtures:

From 75c58379d46d1757aa9d77e757e86acb5cda5523 Mon Sep 17 00:00:00 2001
From: 0-Anon <cec124@case.edu>
Date: Mon, 5 Oct 2026 03:50:40 +0000
Subject: [PATCH 60/69] Allow Space Cats (and Syndicats) to pilot Vims and fit
 in pet carriers. (#46324)

* spacecat + syndicat fit in vim + pet carriers

oversight

* Update Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

---------

Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index db09880ffa..bfaa118b8e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -3264,7 +3264,8 @@
     coldDamageThreshold: 0
   - type: Tag
     tags:
-      - DoorBumpOpener
+    - DoorBumpOpener
+    - VimPilot
   - type: MovementAlwaysTouching
   - type: PermanentStatusEffects
     statusEffects:

From 1f1c5aba102f4df8099d7003d447356d20fccb1c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 05:25:26 +0000
Subject: [PATCH 61/69] Hotfix codeword nullability (#46327)

---
 .../Systems/Chat/ChatUIController.cs             | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 97a55748d2..ad9233c4ef 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -57,8 +57,8 @@ public sealed partial class ChatUIController : UIController
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IReplayRecordingManager _replayRecording = default!;
 
-    [UISystemDependency] private readonly ChatSystem _chatSys = default!;
-    [UISystemDependency] private readonly CodewordSystem _codeword = default!;
+    [UISystemDependency] private readonly ChatSystem? _chatSys = default!;
+    [UISystemDependency] private readonly CodewordSystem? _codeword = default!;
     [UISystemDependency] private readonly ExamineSystem _examine = default!;
     [UISystemDependency] private readonly GhostSystem _ghost = default!;
     [UISystemDependency] private readonly TransformSystem _transform = default!;
@@ -833,12 +833,16 @@ public sealed partial class ChatUIController : UIController
             msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, highlight, "color", _highlightsColor);
         }
 
-        // Color any codewords for minds that have roles that use them
-        foreach (var data in _codeword.GetPlayerCodewords(_player.LocalUser))
+        // In case we get messages outside of systems being init.
+        if (_codeword != null)
         {
-            foreach (var codeword in data.Codewords)
+            // Color any codewords for minds that have roles that use them
+            foreach (var data in _codeword.GetPlayerCodewords(_player.LocalUser))
             {
-                msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", data.Color.ToHex());
+                foreach (var codeword in data.Codewords)
+                {
+                    msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", data.Color.ToHex());
+                }
             }
         }
 

From 83d9f384f6b9e14840a589f0dcf6250bd03eb9c1 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 17:30:46 +1100
Subject: [PATCH 62/69] Remove re-anchor + anchor API cleanup (#45353)

---
 .../Atmos/EntitySystems/AirtightSystem.cs        | 16 +++++-----------
 .../Construction/Completions/SetAnchor.cs        |  6 +-----
 .../Construction/ConstructionSystem.Graph.cs     | 11 +++++++----
 .../EntitySystems/NodeContainerSystem.cs         | 10 ----------
 .../Power/EntitySystems/ExtensionCableSystem.cs  | 14 --------------
 .../Systems/RadiationSystem.Blockers.cs          | 10 ----------
 Content.Server/Shuttles/Systems/DockingSystem.cs |  4 ++--
 .../ContainmentFieldGeneratorSystem.cs           |  8 ++------
 8 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
index 37e98fd902..65525f4fc4 100644
--- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs
@@ -19,7 +19,6 @@ namespace Content.Server.Atmos.EntitySystems
             SubscribeLocalEvent<AirtightComponent, ComponentInit>(OnAirtightInit);
             SubscribeLocalEvent<AirtightComponent, ComponentShutdown>(OnAirtightShutdown);
             SubscribeLocalEvent<AirtightComponent, AnchorStateChangedEvent>(OnAirtightPositionChanged);
-            SubscribeLocalEvent<AirtightComponent, ReAnchorEvent>(OnAirtightReAnchor);
             SubscribeLocalEvent<AirtightComponent, MoveEvent>(OnAirtightMoved);
         }
 
@@ -56,6 +55,7 @@ namespace Content.Server.Atmos.EntitySystems
         private void OnAirtightPositionChanged(EntityUid uid, AirtightComponent airtight, ref AnchorStateChangedEvent args)
         {
             var xform = args.Transform;
+            var oldPosition = airtight.LastPosition;
 
             if (!TryComp(xform.GridUid, out MapGridComponent? grid))
                 return;
@@ -70,18 +70,12 @@ namespace Content.Server.Atmos.EntitySystems
 
             var airtightEv = new AirtightChanged(uid, airtight, false, (gridId.Value, tilePos));
             RaiseLocalEvent(uid, ref airtightEv, true);
-        }
 
-        private void OnAirtightReAnchor(EntityUid uid, AirtightComponent airtight, ref ReAnchorEvent args)
-        {
-            foreach (var gridId in new[] { args.OldGrid, args.Grid })
+            if (oldPosition != default && oldPosition != airtight.LastPosition)
             {
-                // Update and invalidate new position.
-                airtight.LastPosition = (gridId, args.TilePos);
-                InvalidatePosition(gridId, args.TilePos);
-
-                var airtightEv = new AirtightChanged(uid, airtight, false, (gridId, args.TilePos));
-                RaiseLocalEvent(uid, ref airtightEv, true);
+                InvalidatePosition(oldPosition.Grid, oldPosition.Tile);
+                var oldAirtightEv = new AirtightChanged(uid, airtight, false, oldPosition);
+                RaiseLocalEvent(uid, ref oldAirtightEv, true);
             }
         }
 
diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs
index cdecfa7c90..b2591abc25 100644
--- a/Content.Server/Construction/Completions/SetAnchor.cs
+++ b/Content.Server/Construction/Completions/SetAnchor.cs
@@ -18,11 +18,7 @@ namespace Content.Server.Construction.Completions
 
             var sys = entityManager.System<SharedTransformSystem>();
 
-            if (Value)
-                sys.AnchorEntity(uid, transform);
-            else
-                sys.Unanchor(uid, transform);
-
+            sys.TryAnchor((uid, transform, null), Value);
         }
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs
index 73e2855760..415fbf95fb 100644
--- a/Content.Server/Construction/ConstructionSystem.Graph.cs
+++ b/Content.Server/Construction/ConstructionSystem.Graph.cs
@@ -362,10 +362,13 @@ namespace Content.Server.Construction
 
             // Transform transferring.
             var newTransform = Transform(newUid);
-            TransformSystem.AttachToGridOrMap(newUid, newTransform); // in case in hands or a container
-#pragma warning disable CS0618 // Setting anchored state directly, AnchorEntity/Unanchor requires an initialized entity.
-            newTransform.Anchored = transform.Anchored;
-#pragma warning restore CS0618
+
+            TransformSystem.SetLocalRotationNoLerp(newUid, transform.LocalRotation);
+
+            // Prefer anchoring directly. If anchoring fails, attach to the grid or map only as a fallback.
+            // This avoids doing AttachToGridOrMap followed by TryAnchor, which can raise two transform updates.
+            if (!transform.Anchored || !TransformSystem.AnchorEntity((newUid, newTransform, null)))
+                TransformSystem.AttachToGridOrMap(newUid, newTransform);
 
             // Container transferring.
             if (containerManager != null)
diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
index ff20b5d7b6..7389024f34 100644
--- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
@@ -26,7 +26,6 @@ namespace Content.Server.NodeContainer.EntitySystems
             SubscribeLocalEvent<NodeContainerComponent, ComponentStartup>(OnStartupEvent);
             SubscribeLocalEvent<NodeContainerComponent, ComponentShutdown>(OnShutdownEvent);
             SubscribeLocalEvent<NodeContainerComponent, AnchorStateChangedEvent>(OnAnchorStateChanged);
-            SubscribeLocalEvent<NodeContainerComponent, ReAnchorEvent>(OnReAnchor);
             SubscribeLocalEvent<NodeContainerComponent, MoveEvent>(OnMoveEvent);
             SubscribeLocalEvent<NodeContainerComponent, ExaminedEvent>(OnExamine);
         }
@@ -165,15 +164,6 @@ namespace Content.Server.NodeContainer.EntitySystems
             }
         }
 
-        private void OnReAnchor(EntityUid uid, NodeContainerComponent component, ref ReAnchorEvent args)
-        {
-            foreach (var node in component.Nodes.Values)
-            {
-                _nodeGroupSystem.QueueNodeRemove(node);
-                _nodeGroupSystem.QueueReflood(node);
-            }
-        }
-
         private void OnMoveEvent(EntityUid uid, NodeContainerComponent container, ref MoveEvent ev)
         {
             if (ev.NewRotation == ev.OldRotation)
diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
index 062c81b9b4..fbdb99eb12 100644
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -23,10 +23,8 @@ namespace Content.Server.Power.EntitySystems
 
             //Anchoring
             SubscribeLocalEvent<ExtensionCableReceiverComponent, AnchorStateChangedEvent>(OnReceiverAnchorStateChanged);
-            SubscribeLocalEvent<ExtensionCableReceiverComponent, ReAnchorEvent>(OnReceiverReAnchor);
 
             SubscribeLocalEvent<ExtensionCableProviderComponent, AnchorStateChangedEvent>(OnProviderAnchorStateChanged);
-            SubscribeLocalEvent<ExtensionCableProviderComponent, ReAnchorEvent>(OnProviderReAnchor);
         }
 
         #region Provider
@@ -88,12 +86,6 @@ namespace Content.Server.Power.EntitySystems
             ResetReceivers(provider);
         }
 
-        private void OnProviderReAnchor(Entity<ExtensionCableProviderComponent> provider, ref ReAnchorEvent args)
-        {
-            Disconnect(provider);
-            Connect(provider);
-        }
-
         private void ResetReceivers(Entity<ExtensionCableProviderComponent> provider)
         {
             var providerId = provider.Owner;
@@ -203,12 +195,6 @@ namespace Content.Server.Power.EntitySystems
             }
         }
 
-        private void OnReceiverReAnchor(Entity<ExtensionCableReceiverComponent> receiver, ref ReAnchorEvent args)
-        {
-            Disconnect(receiver);
-            Connect(receiver);
-        }
-
         private void Connect(Entity<ExtensionCableReceiverComponent> receiver)
         {
             receiver.Comp.Connectable = true;
diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Blockers.cs b/Content.Server/Radiation/Systems/RadiationSystem.Blockers.cs
index 6a6cceb13a..a56ede8333 100644
--- a/Content.Server/Radiation/Systems/RadiationSystem.Blockers.cs
+++ b/Content.Server/Radiation/Systems/RadiationSystem.Blockers.cs
@@ -13,7 +13,6 @@ public partial class RadiationSystem
         SubscribeLocalEvent<RadiationBlockerComponent, ComponentInit>(OnInit);
         SubscribeLocalEvent<RadiationBlockerComponent, ComponentShutdown>(OnShutdown);
         SubscribeLocalEvent<RadiationBlockerComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<RadiationBlockerComponent, ReAnchorEvent>(OnReAnchor);
 
         SubscribeLocalEvent<RadiationBlockerComponent, DoorStateChangedEvent>(OnDoorChanged);
 
@@ -46,15 +45,6 @@ public partial class RadiationSystem
         }
     }
 
-    private void OnReAnchor(EntityUid uid, RadiationBlockerComponent component, ref ReAnchorEvent args)
-    {
-        // probably grid was split
-        // we need to remove entity from old resistance map
-        RemoveTile(uid, component);
-        // and move it to the new one
-        AddTile(uid, component);
-    }
-
     private void OnDoorChanged(EntityUid uid, RadiationBlockerComponent component, DoorStateChangedEvent args)
     {
         switch (args.State)
diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs
index 00eca5600f..d8ccea0016 100644
--- a/Content.Server/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Server/Shuttles/Systems/DockingSystem.cs
@@ -98,12 +98,12 @@ public sealed partial class DockingSystem : SharedDockingSystem
     }
 
     [SubscribeLocalEvent]
-    private void OnDockingReAnchor(Entity<DockingComponent> entity, ref ReAnchorEvent args)
+    private void OnDockingMove(Entity<DockingComponent> entity, ref MoveEvent args)
     {
         var uid = entity.Owner;
         var component = entity.Comp;
 
-        if (!component.Docked)
+        if (!component.Docked || args.OnlyRotation)
             return;
 
         var otherDock = component.DockedWith;
diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index 14868d6fde..66befe7299 100644
--- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -34,7 +34,6 @@ public sealed partial class ContainmentFieldGeneratorSystem : EntitySystem
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, ExaminedEvent>(OnExamine);
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, ActivateInWorldEvent>(OnActivate);
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, AnchorStateChangedEvent>(OnAnchorChanged);
-        SubscribeLocalEvent<ContainmentFieldGeneratorComponent, ReAnchorEvent>(OnReanchorEvent);
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, UnanchorAttemptEvent>(OnUnanchorAttempt);
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, ComponentRemove>(OnComponentRemoved);
         SubscribeLocalEvent<ContainmentFieldGeneratorComponent, EventHorizonAttemptConsumeEntityEvent>(PreventBreach);
@@ -115,11 +114,8 @@ public sealed partial class ContainmentFieldGeneratorSystem : EntitySystem
     {
         if (!args.Anchored)
             RemoveConnections(generator);
-    }
-
-    private void OnReanchorEvent(Entity<ContainmentFieldGeneratorComponent> generator, ref ReAnchorEvent args)
-    {
-        GridCheck(generator);
+        else
+            GridCheck(generator);
     }
 
     private void OnUnanchorAttempt(EntityUid uid, ContainmentFieldGeneratorComponent component,

From 55961aa603247026306b2dfd79215ef67a177d53 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 17:31:10 +1100
Subject: [PATCH 63/69] Update for new render API (#45883)

* Update for new render API

- Fix mob movement incorrectly causing rotation lerps sometimes.
- Update API calls to use the new render-specific methods.

* Thanks rider

* augh wrong event

* Buckle, vehicle, and mover fixes

* Rename render poses to render transforms

* garbage
---
 Content.Client/Access/AccessOverlay.cs        |   7 +-
 .../Commands/ShowAccessReadersCommand.cs      |   3 +-
 Content.Client/Buckle/BuckleSystem.cs         |  15 +-
 Content.Client/Chat/UI/SpeechBubble.cs        |   7 +-
 Content.Client/DoAfter/DoAfterOverlay.cs      |   8 +-
 Content.Client/Hands/Systems/HandsSystem.cs   |   9 +-
 .../Interactable/InteractionSystem.cs         |  17 +-
 Content.Client/Light/SunShadowOverlay.cs      |   7 +-
 Content.Client/MapText/MapTextOverlay.cs      |  10 +-
 Content.Client/MapText/MapTextSystem.cs       |   3 +-
 Content.Client/Mining/MiningOverlay.cs        |   2 +-
 .../MouseRotator/MouseRotatorSystem.cs        | 178 ++++++++++++++++--
 .../NetworkConfiguratorLinkOverlay.cs         |  10 +-
 .../Overlays/EntityHealthBarOverlay.cs        |   8 +-
 .../Overlays/ScreechShockWaveOverlay.cs       |   5 +-
 .../Physics/Controllers/MoverController.cs    |  17 ++
 .../Overlays/RadiationPulseOverlay.cs         |   4 +-
 .../Singularity/SingularityOverlay.cs         |   5 +-
 .../StatusIcon/StatusIconOverlay.cs           |   3 +-
 .../Wall/WallMountVisibilityOverlay.cs        |   6 +-
 .../Weapons/Misc/TetherGunOverlay.cs          |   7 +-
 .../Tests/Buckle/BuckleTest.cs                |  75 ++++++++
 .../Buckle/SharedBuckleSystem.Buckle.cs       |   9 +-
 .../Interaction/SharedInteractionSystem.cs    |   6 +-
 24 files changed, 356 insertions(+), 65 deletions(-)

diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs
index f0f2890d24..234164529c 100644
--- a/Content.Client/Access/AccessOverlay.cs
+++ b/Content.Client/Access/AccessOverlay.cs
@@ -1,6 +1,7 @@
 using System.Text;
 using Content.Client.Resources;
 using Content.Shared.Access.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Enums;
@@ -13,12 +14,12 @@ public sealed class AccessOverlay : Overlay
     private const int TextFontSize = 12;
 
     private readonly IEntityManager _entityManager;
-    private readonly SharedTransformSystem _transformSystem;
+    private readonly TransformSystem _transformSystem;
     private readonly Font _font;
 
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-    public AccessOverlay(IEntityManager entityManager, IResourceCache resourceCache, SharedTransformSystem transformSystem)
+    public AccessOverlay(IEntityManager entityManager, IResourceCache resourceCache, TransformSystem transformSystem)
     {
         _entityManager = entityManager;
         _transformSystem = transformSystem;
@@ -87,7 +88,7 @@ public sealed class AccessOverlay : Overlay
             }
 
             var accessInfoText = textBuffer.ToString();
-            var screenPos = args.ViewportControl.WorldToScreen(_transformSystem.GetWorldPosition(transform));
+            var screenPos = args.ViewportControl.WorldToScreen(_transformSystem.GetRenderWorldPosition((uid, transform)));
             args.ScreenHandle.DrawString(_font, screenPos, accessInfoText, 1, Color.Gold, TextOutline.Default);
         }
     }
diff --git a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
index f471975ba3..0ae6f1a7ea 100644
--- a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
+++ b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs
@@ -1,3 +1,4 @@
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Console;
@@ -8,7 +9,7 @@ public sealed partial class ShowAccessReadersCommand : LocalizedEntityCommands
 {
     [Dependency] private IOverlayManager _overlay = default!;
     [Dependency] private IResourceCache _cache = default!;
-    [Dependency] private SharedTransformSystem _xform = default!;
+    [Dependency] private TransformSystem _xform = default!;
 
     public override string Command => "showaccessreaders";
 
diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index 3e1b620df7..34823b949c 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -12,13 +12,22 @@ internal sealed partial class BuckleSystem : SharedBuckleSystem
 {
     [Dependency] private RotationVisualizerSystem _rotationVisualizerSystem = default!;
     [Dependency] private IEyeManager _eye = default!;
-    [Dependency] private SharedTransformSystem _xformSystem = default!;
+    [Dependency] private TransformSystem _xformSystem = default!;
     [Dependency] private SpriteSystem _sprite = default!;
 
     [Dependency] private EntityQuery<SpriteComponent> _spriteQuery = default!;
 
     #region Event Handlers
 
+    protected override void AfterBuckleParentChanged(Entity<BuckleComponent> ent, ref EntParentChangedMessage args)
+    {
+        if (HasComp<StrapComponent>(args.Transform.ParentUid) ||
+            args.OldParent is { } oldParent && HasComp<StrapComponent>(oldParent))
+        {
+            _xformSystem.SnapRenderTransformAfterParentChange(ent, true);
+        }
+    }
+
     [SubscribeLocalEvent]
     private void OnStrapMoveEvent(Entity<StrapComponent> ent, ref MoveEvent args)
     {
@@ -90,6 +99,8 @@ internal sealed partial class BuckleSystem : SharedBuckleSystem
     [SubscribeLocalEvent]
     private void OnBuckledEvent(Entity<BuckleComponent> ent, ref BuckledEvent args)
     {
+        _xformSystem.SnapRenderTransform(ent, true);
+
         if (!args.Strap.Comp.ModifyBuckleDrawDepth)
             return;
 
@@ -114,6 +125,8 @@ internal sealed partial class BuckleSystem : SharedBuckleSystem
     [SubscribeLocalEvent]
     private void OnUnbuckledEvent(Entity<BuckleComponent> ent, ref UnbuckledEvent args)
     {
+        _xformSystem.SnapRenderTransform(ent, true);
+
         if (!args.Strap.Comp.ModifyBuckleDrawDepth)
             return;
 
diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
index ac57d92f7e..e13eb92ef4 100644
--- a/Content.Client/Chat/UI/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -4,6 +4,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Chat;
 using Content.Shared.Speech;
 using Robust.Client.Graphics;
+using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
@@ -18,7 +19,7 @@ namespace Content.Client.Chat.UI
         [Dependency] private IEyeManager _eyeManager = default!;
         [Dependency] private IEntityManager _entityManager = default!;
         [Dependency] protected IConfigurationManager ConfigManager = default!;
-        private readonly SharedTransformSystem _transformSystem;
+        private readonly TransformSystem _transformSystem;
 
         public enum SpeechType : byte
         {
@@ -89,7 +90,7 @@ namespace Content.Client.Chat.UI
         {
             IoCManager.InjectDependencies(this);
             _senderEntity = senderEntity;
-            _transformSystem = _entityManager.System<SharedTransformSystem>();
+            _transformSystem = _entityManager.System<TransformSystem>();
 
             // Use text clipping so new messages don't overlap old ones being pushed up.
             RectClipContent = true;
@@ -153,7 +154,7 @@ namespace Content.Client.Chat.UI
                 baseOffset = speech.SpeechBubbleOffset;
 
             var offset = (-_eyeManager.CurrentEye.Rotation).ToWorldVec() * -(EntityVerticalOffset + baseOffset);
-            var worldPos = _transformSystem.GetWorldPosition(xform) + offset;
+            var worldPos = _transformSystem.GetRenderWorldPosition((_senderEntity, xform)) + offset;
 
             var lowerCenter = _eyeManager.WorldToScreen(worldPos) / UIScale;
             var screenPos = lowerCenter - new Vector2(ContentSize.X / 2, ContentSize.Y + _verticalOffsetAchieved);
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index 7d546fae0e..b0eb193bb6 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -19,7 +19,7 @@ public sealed class DoAfterOverlay : Overlay
     private readonly IEntityManager _entManager;
     private readonly IGameTiming _timing;
     private readonly IPlayerManager _player;
-    private readonly SharedTransformSystem _transform;
+    private readonly TransformSystem _transform;
     private readonly MetaDataSystem _meta;
     private readonly ProgressColorSystem _progressColor;
     private readonly SharedContainerSystem _container;
@@ -53,7 +53,7 @@ public sealed class DoAfterOverlay : Overlay
         _entManager = entManager;
         _timing = timing;
         _player = player;
-        _transform = _entManager.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
+        _transform = _entManager.EntitySysManager.GetEntitySystem<TransformSystem>();
         _meta = _entManager.EntitySysManager.GetEntitySystem<MetaDataSystem>();
         _container = _entManager.EntitySysManager.GetEntitySystem<SharedContainerSystem>();
         _progressColor = _entManager.System<ProgressColorSystem>();
@@ -68,8 +68,6 @@ public sealed class DoAfterOverlay : Overlay
     {
         var handle = args.WorldHandle;
         var rotation = args.Viewport.Eye?.Rotation ?? Angle.Zero;
-        var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
-
         // If you use the display UI scale then need to set max(1f, displayscale) because 0 is valid.
         const float scale = 1f;
         var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(scale, scale));
@@ -90,7 +88,7 @@ public sealed class DoAfterOverlay : Overlay
             if (comp.DoAfters.Count == 0)
                 continue;
 
-            var worldPosition = _transform.GetWorldPosition(xform, xformQuery);
+            var worldPosition = _transform.GetRenderWorldPosition((uid, xform));
             if (!bounds.Contains(worldPosition))
                 continue;
 
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index 75823d36a6..d63feb90eb 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -29,6 +29,7 @@ namespace Content.Client.Hands.Systems
 
         [Dependency] private StrippableSystem _stripSys = default!;
         [Dependency] private SpriteSystem _sprite = default!;
+        [Dependency] private TransformSystem _renderTransforms = default!;
         [Dependency] private ExamineSystem _examine = default!;
         [Dependency] private DisplacementMapSystem _displacement = default!;
 
@@ -112,9 +113,15 @@ namespace Content.Client.Hands.Systems
             EntityCoordinates? targetDropLocation = null
         )
         {
+            TryGetHeldItem(ent, handId, out var held);
             base.DoDrop(ent, handId, doDropInteraction, log, targetDropLocation);
 
-            if (TryGetHeldItem(ent, handId, out var held) && TryComp(held, out SpriteComponent? sprite))
+            if (held == null || IsHolding(ent, held.Value))
+                return;
+
+            _renderTransforms.SnapRenderTransform(held.Value, true);
+
+            if (TryComp(held, out SpriteComponent? sprite))
                 sprite.RenderOrder = EntityManager.CurrentTick.Value;
         }
 
diff --git a/Content.Client/Interactable/InteractionSystem.cs b/Content.Client/Interactable/InteractionSystem.cs
index 26ede7537d..d023c6c2ff 100644
--- a/Content.Client/Interactable/InteractionSystem.cs
+++ b/Content.Client/Interactable/InteractionSystem.cs
@@ -1,9 +1,24 @@
+using System.Numerics;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
+using Robust.Client.GameObjects;
 using Robust.Shared.Containers;
 
 namespace Content.Client.Interactable
 {
     // TODO Remove Shared prefix
-    public sealed partial class InteractionSystem : SharedInteractionSystem;
+    public sealed partial class InteractionSystem : SharedInteractionSystem
+    {
+        [Dependency] private TransformSystem _clientTransform = default!;
+
+        protected override bool TryFaceInteraction(EntityUid user, Vector2 coordinates)
+        {
+            var faced = base.TryFaceInteraction(user, coordinates);
+
+            if (faced)
+                _clientTransform.SnapRenderRotation(user);
+
+            return faced;
+        }
+    }
 }
diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs
index 4f16f63624..6c0651800b 100644
--- a/Content.Client/Light/SunShadowOverlay.cs
+++ b/Content.Client/Light/SunShadowOverlay.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Graphics;
 using Content.Shared.Light.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
@@ -21,7 +22,7 @@ public sealed partial class SunShadowOverlay : Overlay
     [Dependency] private IPrototypeManager _protoManager = default!;
     private readonly EntityLookupSystem _lookup;
     private readonly SharedMapSystem _mapSys;
-    private readonly SharedTransformSystem _xformSys;
+    private readonly TransformSystem _xformSys;
 
     private readonly HashSet<Entity<SunShadowCastComponent>> _shadows = new();
 
@@ -30,7 +31,7 @@ public sealed partial class SunShadowOverlay : Overlay
     public SunShadowOverlay()
     {
         IoCManager.InjectDependencies(this);
-        _xformSys = _entManager.System<SharedTransformSystem>();
+        _xformSys = _entManager.System<TransformSystem>();
         _mapSys = _entManager.System<SharedMapSystem>();
         _lookup = _entManager.System<EntityLookupSystem>();
         ZIndex = AfterLightTargetOverlay.ContentZIndex + 1;
@@ -119,7 +120,7 @@ public sealed partial class SunShadowOverlay : Overlay
                     foreach (var ent in _shadows)
                     {
                         var xform = _entManager.GetComponent<TransformComponent>(ent.Owner);
-                        var (worldPos, worldRot) = _xformSys.GetWorldPositionRotation(xform);
+                        var (worldPos, worldRot) = _xformSys.GetRenderWorldPositionRotation((ent.Owner, xform));
                         // Need no rotation on matrix as sun shadow direction doesn't care.
                         var worldMatrix = Matrix3x2.CreateTranslation(worldPos);
                         var renderMatrix = Matrix3x2.Multiply(worldMatrix, invMatrix);
diff --git a/Content.Client/MapText/MapTextOverlay.cs b/Content.Client/MapText/MapTextOverlay.cs
index 12afa1fa33..216bc1ba65 100644
--- a/Content.Client/MapText/MapTextOverlay.cs
+++ b/Content.Client/MapText/MapTextOverlay.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Shared.MapText;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -19,14 +20,13 @@ public sealed class MapTextOverlay : Overlay
     private readonly IConfigurationManager _configManager;
     private readonly IEntityManager _entManager;
     private readonly IUserInterfaceManager _uiManager;
-    private readonly SharedTransformSystem _transform;
+    private readonly TransformSystem _transform;
     public override OverlaySpace Space => OverlaySpace.ScreenSpace;
 
-    public MapTextOverlay(
-        IConfigurationManager configManager,
+    public MapTextOverlay(IConfigurationManager configManager,
         IEntityManager entManager,
         IUserInterfaceManager uiManager,
-        SharedTransformSystem transform,
+        TransformSystem transform,
         IResourceCache resourceCache,
         IPrototypeManager prototypeManager)
     {
@@ -66,7 +66,7 @@ public sealed class MapTextOverlay : Overlay
 
         while(query.MoveNext(out var uid, out var mapText))
         {
-            var mapPos = _transform.GetMapCoordinates(uid);
+            var mapPos = _transform.GetRenderMapCoordinates(uid);
 
             if (mapPos.MapId != args.MapId)
                 continue;
diff --git a/Content.Client/MapText/MapTextSystem.cs b/Content.Client/MapText/MapTextSystem.cs
index 82e31ce47d..89733f3d56 100644
--- a/Content.Client/MapText/MapTextSystem.cs
+++ b/Content.Client/MapText/MapTextSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.MapText;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -14,7 +15,7 @@ public sealed partial class MapTextSystem : SharedMapTextSystem
 {
     [Dependency] private IConfigurationManager _configManager = default!;
     [Dependency] private IUserInterfaceManager _uiManager = default!;
-    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private TransformSystem _transform = default!;
     [Dependency] private IResourceCache _resourceCache = default!;
     [Dependency] private IOverlayManager _overlayManager = default!;
 
diff --git a/Content.Client/Mining/MiningOverlay.cs b/Content.Client/Mining/MiningOverlay.cs
index bb5302f825..2a21709b8f 100644
--- a/Content.Client/Mining/MiningOverlay.cs
+++ b/Content.Client/Mining/MiningOverlay.cs
@@ -72,7 +72,7 @@ public sealed partial class MiningOverlay : Overlay
             var gridRot = xform.GridUid == null ? 0 : _xformQuery.CompOrNull(xform.GridUid.Value)?.LocalRotation ?? 0;
             var rotationMatrix = Matrix3Helpers.CreateRotation(gridRot);
 
-            var worldMatrix = Matrix3Helpers.CreateTranslation(_xform.GetWorldPosition(xform));
+            var worldMatrix = Matrix3Helpers.CreateTranslation(_xform.GetRenderWorldPosition((ore, xform)));
             var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
             var matty = Matrix3x2.Multiply(rotationMatrix, scaledWorld);
             handle.SetTransform(matty);
diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs
index 0fe88ff74b..21603dc4a9 100644
--- a/Content.Client/MouseRotator/MouseRotatorSystem.cs
+++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs
@@ -1,7 +1,9 @@
 using Content.Shared.MouseRotator;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Player;
+using Robust.Client.Timing;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
@@ -12,32 +14,126 @@ public sealed partial class MouseRotatorSystem : SharedMouseRotatorSystem
 {
     [Dependency] private IInputManager _input = default!;
     [Dependency] private IPlayerManager _player = default!;
-    [Dependency] private IGameTiming _timing = default!;
+    [Dependency] private IClientGameTiming _timing = default!;
     [Dependency] private IEyeManager _eye = default!;
-    [Dependency] private SharedTransformSystem _transform = default!;
+    [Dependency] private TransformSystem _transform = default!;
+
+    private EntityUid _renderRotationOverride;
+    private Angle _renderRotation;
+    private Angle _simulationRotationAtOverride;
+    private GameTick _renderRotationInactiveTick;
+    private bool _renderRotationInactive;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        UpdatesAfter.Add(typeof(EyeSystem));
+    }
+
+    public override void Shutdown()
+    {
+        ClearRenderRotationOverride();
+        base.Shutdown();
+    }
 
     public override void Update(float frameTime)
     {
+        var player = _player.LocalEntity;
+        var inactive = _renderRotationInactive && _timing.LastRealTick < _renderRotationInactiveTick;
+        MouseRotatorComponent? rotator = null;
+        TransformComponent? xform = null;
+        var snapRotation = false;
+        var oldWorldRotation = Angle.Zero;
+
+        if (player != null && TryComp(player, out rotator))
+        {
+            xform = Transform(player.Value);
+            snapRotation = rotator.Simple4DirMode;
+            if (snapRotation)
+                oldWorldRotation = _transform.GetWorldRotation(xform);
+        }
+
+        if (!inactive &&
+            _timing.IsFirstTimePredicted &&
+            _input.MouseScreenPosition.IsValid &&
+            player != null &&
+            rotator != null &&
+            xform != null)
+        {
+            UpdateMouseRotation(player.Value, rotator, xform);
+        }
+
         base.Update(frameTime);
 
-        if (!_timing.IsFirstTimePredicted || !_input.MouseScreenPosition.IsValid)
-            return;
+        if (!inactive &&
+            snapRotation &&
+            player != null &&
+            !oldWorldRotation.EqualsApprox(_transform.GetWorldRotation(player.Value)))
+        {
+            _transform.SnapRenderRotation(player.Value);
+        }
+    }
+
+    public override void FrameUpdate(float frameTime)
+    {
+        base.FrameUpdate(frameTime);
 
         var player = _player.LocalEntity;
+        if (player == null)
+        {
+            ClearRenderRotationOverride();
+            return;
+        }
 
-        if (player == null || !TryComp<MouseRotatorComponent>(player, out var rotator))
+        if (_renderRotationOverride.IsValid() && _renderRotationOverride != player.Value)
+            ClearRenderRotationOverride();
+
+        if (!TryComp(player, out MouseRotatorComponent? rotator))
+        {
+            if (_renderRotationOverride == player.Value && !_renderRotationInactive)
+            {
+                _renderRotationInactive = true;
+                _renderRotationInactiveTick = _timing.CurTick;
+            }
+
+            UpdateInactiveRenderRotationOverride(player.Value);
+            return;
+        }
+
+        if (_renderRotationInactive)
+        {
+            if (_timing.LastRealTick < _renderRotationInactiveTick)
+                return;
+
+            _renderRotationInactive = false;
+        }
+
+        if (!rotator.Simple4DirMode)
+        {
+            ClearRenderRotationOverride();
+            return;
+        }
+
+        if (!_input.MouseScreenPosition.IsValid)
             return;
 
         var xform = Transform(player.Value);
-
-        // Get mouse loc and convert to angle based on player location
-        var coords = _input.MouseScreenPosition;
-        var mapPos = _eye.PixelToMap(coords);
-
-        if (mapPos.MapId == MapId.Nullspace)
+        if (!TryGetMouseAngle(player.Value, xform, out var angle))
             return;
 
-        var angle = (mapPos.Position - _transform.GetMapCoordinates(player.Value, xform: xform).Position).ToWorldAngle();
+        var eyeRotation = _eye.CurrentEye.Rotation;
+        var rotation = GetCardinalRotation(angle, eyeRotation);
+
+        _transform.SetRenderRotationOverride(player.Value, rotation);
+        _renderRotationOverride = player.Value;
+        _renderRotation = rotation;
+        _simulationRotationAtOverride = _transform.GetWorldRotation(player.Value);
+    }
+
+    private void UpdateMouseRotation(EntityUid player, MouseRotatorComponent rotator, TransformComponent xform)
+    {
+        if (!TryGetMouseAngle(player, xform, out var angle))
+            return;
 
         var curRot = _transform.GetWorldRotation(xform);
 
@@ -50,11 +146,7 @@ public sealed partial class MouseRotatorSystem : SharedMouseRotatorSystem
             if (angleDir == (curRot + eyeRot).GetCardinalDir())
                 return;
 
-            var rotation = angleDir.ToAngle() - eyeRot; // convert back to world frame
-            if (rotation >= Math.PI) // convert to [-PI, +PI)
-                rotation -= 2 * Math.PI;
-            else if (rotation < -Math.PI)
-                rotation += 2 * Math.PI;
+            var rotation = GetCardinalRotation(angle, eyeRot);
             RaisePredictiveEvent(new RequestMouseRotatorRotationEvent
             {
                 Rotation = rotation,
@@ -82,4 +174,56 @@ public sealed partial class MouseRotatorSystem : SharedMouseRotatorSystem
             User = GetNetEntity(player)
         });
     }
+
+    private bool TryGetMouseAngle(EntityUid player, TransformComponent xform, out Angle angle)
+    {
+        var mapPos = _eye.PixelToMap(_input.MouseScreenPosition);
+        var playerPos = _transform.GetRenderMapCoordinates((player, xform));
+
+        if (mapPos.MapId == MapId.Nullspace || mapPos.MapId != playerPos.MapId)
+        {
+            angle = default;
+            return false;
+        }
+
+        angle = (mapPos.Position - playerPos.Position).ToWorldAngle();
+        return true;
+    }
+
+    private static Angle GetCardinalRotation(Angle angle, Angle eyeRotation)
+    {
+        var rotation = (angle + eyeRotation).GetCardinalDir().ToAngle() - eyeRotation;
+        if (rotation >= Math.PI)
+            rotation -= 2 * Math.PI;
+        else if (rotation < -Math.PI)
+            rotation += 2 * Math.PI;
+
+        return rotation;
+    }
+
+    private void ClearRenderRotationOverride()
+    {
+        if (!_renderRotationOverride.IsValid())
+            return;
+
+        _transform.ClearRenderRotationOverride(_renderRotationOverride);
+        _renderRotationOverride = EntityUid.Invalid;
+        _renderRotationInactive = false;
+    }
+
+    private void UpdateInactiveRenderRotationOverride(EntityUid player)
+    {
+        if (_renderRotationOverride != player)
+            return;
+
+        if (_renderRotationInactive && _timing.LastRealTick < _renderRotationInactiveTick)
+            return;
+
+        var simulationRotation = _transform.GetWorldRotation(player);
+        if (simulationRotation.EqualsApprox(_renderRotation) ||
+            !simulationRotation.EqualsApprox(_simulationRotationAtOverride))
+        {
+            ClearRenderRotationOverride();
+        }
+    }
 }
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
index 5f415a48c4..e4f6bd2a9d 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs
@@ -1,5 +1,6 @@
 using Content.Client.NetworkConfigurator.Systems;
 using Content.Shared.DeviceNetwork.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
@@ -12,7 +13,7 @@ public sealed partial class NetworkConfiguratorLinkOverlay : Overlay
     [Dependency] private IEntityManager _entityManager = default!;
     [Dependency] private IRobustRandom _random = default!;
     private readonly DeviceListSystem _deviceListSystem;
-    private readonly SharedTransformSystem _transformSystem;
+    private readonly TransformSystem _transformSystem;
 
     public Dictionary<EntityUid, Color> Colors = new();
     public EntityUid? Action;
@@ -24,7 +25,7 @@ public sealed partial class NetworkConfiguratorLinkOverlay : Overlay
         IoCManager.InjectDependencies(this);
 
         _deviceListSystem = _entityManager.System<DeviceListSystem>();
-        _transformSystem = _entityManager.System<SharedTransformSystem>();
+        _transformSystem = _entityManager.System<TransformSystem>();
     }
 
     protected override void Draw(in OverlayDrawArgs args)
@@ -68,7 +69,10 @@ public sealed partial class NetworkConfiguratorLinkOverlay : Overlay
                     continue;
                 }
 
-                args.WorldHandle.DrawLine(_transformSystem.GetWorldPosition(sourceTransform), _transformSystem.GetWorldPosition(linkTransform), Colors[uid]);
+                args.WorldHandle.DrawLine(
+                    _transformSystem.GetRenderWorldPosition((uid, sourceTransform)),
+                    _transformSystem.GetRenderWorldPosition((device, linkTransform)),
+                    Colors[uid]);
             }
         }
     }
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index 17f708a1d2..e08a263e96 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -25,7 +25,7 @@ public sealed class EntityHealthBarOverlay : Overlay
     private readonly IEntityManager _entManager;
     private readonly IPrototypeManager _prototype;
 
-    private readonly SharedTransformSystem _transform;
+    private readonly TransformSystem _transform;
     private readonly MobStateSystem _mobStateSystem;
     private readonly MobThresholdSystem _mobThresholdSystem;
     private readonly StatusIconSystem _statusIconSystem;
@@ -42,7 +42,7 @@ public sealed class EntityHealthBarOverlay : Overlay
     {
         _entManager = entManager;
         _prototype = prototype;
-        _transform = _entManager.System<SharedTransformSystem>();
+        _transform = _entManager.System<TransformSystem>();
         _mobStateSystem = _entManager.System<MobStateSystem>();
         _mobThresholdSystem = _entManager.System<MobThresholdSystem>();
         _statusIconSystem = _entManager.System<StatusIconSystem>();
@@ -87,7 +87,7 @@ public sealed class EntityHealthBarOverlay : Overlay
             // we use the status icon component bounds if specified otherwise use sprite
             var bounds = _entManager.GetComponentOrNull<StatusIconComponent>(uid)?.Bounds ?? _spriteSystem.GetLocalBounds(
                 (uid, sprite));
-            var worldPos = _transform.GetWorldPosition(xform, xformQuery);
+            var worldPos = _transform.GetRenderWorldPosition((uid, xform));
 
             if (!bounds.Translated(worldPos).Intersects(args.WorldAABB))
                 continue;
@@ -96,7 +96,7 @@ public sealed class EntityHealthBarOverlay : Overlay
             if (CalcProgress(uid, mobStateComponent, damageableComponent, mobThresholdsComponent) is not { } deathProgress)
                 continue;
 
-            var worldPosition = _transform.GetWorldPosition(xform);
+            var worldPosition = worldPos;
             var worldMatrix = Matrix3Helpers.CreateTranslation(worldPosition);
 
             var scaledWorld = Matrix3x2.Multiply(scaleMatrix, worldMatrix);
diff --git a/Content.Client/Overlays/ScreechShockWaveOverlay.cs b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
index 21b80c6e4b..08b1981931 100644
--- a/Content.Client/Overlays/ScreechShockWaveOverlay.cs
+++ b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
@@ -1,5 +1,6 @@
 using System.Numerics;
 using Content.Shared.Screech;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
@@ -13,7 +14,7 @@ public sealed partial class ScreechShockWaveOverlay : Overlay
     [Dependency] private IPrototypeManager _prototypeManager = default!;
     [Dependency] private IGameTiming _timing = default!;
 
-    private SharedTransformSystem? _xformSystem;
+    private TransformSystem? _xformSystem;
     public override OverlaySpace Space => OverlaySpace.WorldSpace;
     public override bool RequestScreenTexture => true;
     private readonly ShaderInstance _shader;
@@ -79,7 +80,7 @@ public sealed partial class ScreechShockWaveOverlay : Overlay
                 continue;
 
             // shorthand
-            var mapPos = _xformSystem.GetWorldPosition(xform);
+            var mapPos = _xformSystem.GetRenderWorldPosition((entityUid, xform));
             var tempCoords = args.Viewport.WorldToLocal(mapPos);
 
             // normalized coords, 0 - 1 plane. This is pure hell, we subtract 1 because fragment calculates from the bottom and local goes from the top of the viewport
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 4f67dffae4..9477cdd7dc 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -2,8 +2,10 @@ using Content.Shared.Alert;
 using Content.Shared.CCVar;
 using Content.Shared.Friction;
 using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Pulling.Components;
 using Content.Shared.Movement.Systems;
+using Robust.Client.GameObjects;
 using Robust.Client.Physics;
 using Robust.Client.Player;
 using Robust.Shared.Configuration;
@@ -18,6 +20,7 @@ public sealed partial class MoverController : SharedMoverController
     [Dependency] private IPlayerManager _playerManager = default!;
     [Dependency] private AlertsSystem _alerts = default!;
     [Dependency] private IConfigurationManager _cfg = default!;
+    [Dependency] private TransformSystem _transform = default!;
 
     public override void Initialize()
     {
@@ -26,10 +29,12 @@ public sealed partial class MoverController : SharedMoverController
         SubscribeLocalEvent<RelayInputMoverComponent, LocalPlayerDetachedEvent>(OnRelayPlayerDetached);
         SubscribeLocalEvent<InputMoverComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
         SubscribeLocalEvent<InputMoverComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+        SubscribeLocalEvent<InputMoverComponent, MoveInputEvent>(OnMoverMoveInput);
 
         SubscribeLocalEvent<InputMoverComponent, UpdateIsPredictedEvent>(OnUpdatePredicted);
         SubscribeLocalEvent<MovementRelayTargetComponent, UpdateIsPredictedEvent>(OnUpdateRelayTargetPredicted);
         SubscribeLocalEvent<PullableComponent, UpdateIsPredictedEvent>(OnUpdatePullablePredicted);
+        SubscribeLocalEvent<RelayInputMoverComponent, GetPredictionReconciliationTargetEvent>(OnGetReconciliationTarget);
     }
 
     private void OnUpdatePredicted(Entity<InputMoverComponent> entity, ref UpdateIsPredictedEvent args)
@@ -59,6 +64,13 @@ public sealed partial class MoverController : SharedMoverController
         // What if the entity is being pulled by a vehicle controlled by the player?
     }
 
+    private void OnGetReconciliationTarget(
+        Entity<RelayInputMoverComponent> entity,
+        ref GetPredictionReconciliationTargetEvent args)
+    {
+        args.Target = GetEffectiveMover((entity.Owner, entity.Comp));
+    }
+
     private void OnRelayPlayerAttached(Entity<RelayInputMoverComponent> entity, ref LocalPlayerAttachedEvent args)
     {
         PhysicsSystem.UpdateIsPredicted(entity.Owner);
@@ -85,6 +97,11 @@ public sealed partial class MoverController : SharedMoverController
         SetMoveInput(entity, MoveButtons.None);
     }
 
+    private void OnMoverMoveInput(Entity<InputMoverComponent> entity, ref MoveInputEvent args)
+    {
+        _transform.SnapRenderRotation(entity);
+    }
+
     public override void UpdateBeforeSolve(bool prediction, float frameTime)
     {
         base.UpdateBeforeSolve(prediction, frameTime);
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index 6b4c429e79..c44c930886 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -98,7 +98,7 @@ namespace Content.Client.Radiation.Overlays
                             (
                                 _baseShader.Duplicate(),
                                 new RadiationShaderInstance(
-                                    _transform.GetMapCoordinates(pulseEntity),
+                                    _transform.GetRenderMapCoordinates(pulseEntity),
                                     pulse.VisualRange,
                                     pulse.StartTime,
                                     pulse.VisualDuration
@@ -116,7 +116,7 @@ namespace Content.Client.Radiation.Overlays
                     _entityManager.TryGetComponent(pulseEntity, out RadiationPulseComponent? pulse))
                 {
                     var shaderInstance = _pulses[pulseEntity];
-                    shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(pulseEntity);
+                    shaderInstance.instance.CurrentMapCoords = _transform.GetRenderMapCoordinates(pulseEntity);
                     shaderInstance.instance.Range = pulse.VisualRange;
                 }
                 else
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index cd5ba5e23f..970d47b131 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Singularity.Components;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Configuration;
@@ -16,7 +17,7 @@ namespace Content.Client.Singularity
         [Dependency] private IEntityManager _entMan = default!;
         [Dependency] private IPrototypeManager _prototypeManager = default!;
         [Dependency] private IConfigurationManager _configManager = default!;
-        private SharedTransformSystem? _xformSystem = null;
+        private TransformSystem? _xformSystem = null;
 
         /// <summary>
         ///     Maximum number of distortions that can be shown on screen at a time.
@@ -65,7 +66,7 @@ namespace Content.Client.Singularity
                 if (xform.MapID != args.MapId)
                     continue;
 
-                var mapPos = _xformSystem.GetWorldPosition(uid);
+                var mapPos = _xformSystem.GetRenderWorldPosition((uid, xform));
 
                 // is the distortion in range?
                 if ((mapPos - args.WorldAABB.ClosestPoint(mapPos)).LengthSquared() > MaxDistance * MaxDistance)
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 4911558dbd..8d1bd38c7d 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -41,7 +41,6 @@ public sealed partial class StatusIconOverlay : Overlay
 
         var eyeRot = args.Viewport.Eye?.Rotation ?? default;
 
-        var xformQuery = _entity.GetEntityQuery<TransformComponent>();
         var scaleMatrix = Matrix3Helpers.CreateScale(new Vector2(1, 1));
         var rotationMatrix = Matrix3Helpers.CreateRotation(-eyeRot);
 
@@ -53,7 +52,7 @@ public sealed partial class StatusIconOverlay : Overlay
 
             var bounds = comp.Bounds ?? _sprite.GetLocalBounds((uid, sprite));
 
-            var worldPos = _transform.GetWorldPosition(xform, xformQuery);
+            var worldPos = _transform.GetRenderWorldPosition((uid, xform));
 
             if (!bounds.Translated(worldPos).Intersects(args.WorldAABB))
                 continue;
diff --git a/Content.Client/Wall/WallMountVisibilityOverlay.cs b/Content.Client/Wall/WallMountVisibilityOverlay.cs
index a989ed3cdf..57719ba262 100644
--- a/Content.Client/Wall/WallMountVisibilityOverlay.cs
+++ b/Content.Client/Wall/WallMountVisibilityOverlay.cs
@@ -148,7 +148,7 @@ public sealed partial class WallMountVisibilityOverlay : Overlay
 
             viewportState.SeenThisFrame.Add(uid);
 
-            var targetAlpha = ComputeTargetAlpha(wallmount, xform, eye, matrix);
+            var targetAlpha = ComputeTargetAlpha(uid, wallmount, xform, eye, matrix);
             UpdateFadeState(uid, originalAlpha, targetAlpha, fadeStep, viewportState);
         }
     }
@@ -156,7 +156,7 @@ public sealed partial class WallMountVisibilityOverlay : Overlay
     /// <summary>
     /// Returns 1 if the entity is within its facing arc relative to the eye, 0 otherwise.
     /// </summary>
-    private float ComputeTargetAlpha(WallMountComponent wallmount, TransformComponent xform, IEye eye, Matrix3x2 matrix)
+    private float ComputeTargetAlpha(EntityUid uid, WallMountComponent wallmount, TransformComponent xform, IEye eye, Matrix3x2 matrix)
     {
         if (!wallmount.DirectionalVisibility || wallmount.Arc >= Math.Tau)
             return 1f;
@@ -168,7 +168,7 @@ public sealed partial class WallMountVisibilityOverlay : Overlay
         if (!_visibility.IsTileBlocked((gridUid, grid), tile))
             return 1f;
 
-        var (pos, rot) = _xform.GetWorldPositionRotation(xform);
+        var (pos, rot) = _xform.GetRenderWorldPositionRotation((uid, xform));
         var facingAngle = rot + eye.Rotation + wallmount.Direction;
 
         var entityScreenPos = Vector2.Transform(pos, matrix);
diff --git a/Content.Client/Weapons/Misc/TetherGunOverlay.cs b/Content.Client/Weapons/Misc/TetherGunOverlay.cs
index 5765782903..d6f8870a67 100644
--- a/Content.Client/Weapons/Misc/TetherGunOverlay.cs
+++ b/Content.Client/Weapons/Misc/TetherGunOverlay.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Weapons.Misc;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 
@@ -22,7 +23,7 @@ public sealed class TetherGunOverlay : Overlay
         var tetherQuery = _entManager.GetEntityQuery<TetherGunComponent>();
         var forceQuery = _entManager.GetEntityQuery<ForceGunComponent>();
         var worldHandle = args.WorldHandle;
-        var xformSystem = _entManager.System<SharedTransformSystem>();
+        var xformSystem = _entManager.System<TransformSystem>();
 
         while (query.MoveNext(out var uid, out var tethered))
         {
@@ -37,8 +38,8 @@ public sealed class TetherGunOverlay : Overlay
             if (xform.MapID != gunXform.MapID)
                 continue;
 
-            var worldPos = xformSystem.GetWorldPosition(xform, xformQuery);
-            var gunWorldPos = xformSystem.GetWorldPosition(gunXform, xformQuery);
+            var worldPos = xformSystem.GetRenderWorldPosition((uid, xform));
+            var gunWorldPos = xformSystem.GetRenderWorldPosition((gun, gunXform));
             var diff = worldPos - gunWorldPos;
             var angle = diff.ToWorldAngle();
             var length = diff.Length() / 2f;
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 9c12da3fe8..9d01bf6ae2 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -6,6 +6,7 @@ using Content.Shared.Buckle.Components;
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Standing;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.Buckle
@@ -231,6 +232,80 @@ namespace Content.IntegrationTests.Tests.Buckle
             });
         }
 
+        [Test]
+        public async Task BuckleAndUnbuckleSnapClientRenderTransformTest()
+        {
+            var map = await Pair.CreateTestMap();
+            EntityUid human = default;
+            EntityUid chair = default;
+            NetEntity netHuman = default;
+            NetEntity netChair = default;
+
+            await Server.WaitAssertion(() =>
+            {
+                human = SEntMan.SpawnEntity(BuckleDummyId, map.GridCoords);
+                chair = SEntMan.SpawnEntity(StrapDummyId, map.GridCoords);
+                netHuman = SEntMan.GetNetEntity(human);
+                netChair = SEntMan.GetNetEntity(chair);
+            });
+
+            await Pair.RunTicksSync(5);
+
+            await Server.WaitAssertion(() =>
+            {
+                var buckle = SEntMan.GetComponent<BuckleComponent>(human);
+                Assert.That(SEntMan.System<SharedBuckleSystem>()
+                    .TryBuckle(human, human, chair, buckle, popup: false), Is.True);
+            });
+
+            var applied = false;
+            for (var i = 0; i < 5 && !applied; i++)
+            {
+                await Pair.RunTicksSync(1);
+                await Client.WaitAssertion(() =>
+                {
+                    var clientHuman = CEntMan.GetEntity(netHuman);
+                    var clientChair = CEntMan.GetEntity(netChair);
+                    var buckle = CEntMan.GetComponent<BuckleComponent>(clientHuman);
+                    var transformSystem = CEntMan.System<TransformSystem>();
+                    var xform = CEntMan.GetComponent<TransformComponent>(clientHuman);
+                    applied = buckle.Buckled && xform.ParentUid == clientChair;
+                    if (!applied)
+                        return;
+
+                    Assert.That(transformSystem.TryGetRenderTransformDebugData(clientHuman, out _), Is.False);
+                    Assert.That(transformSystem.GetRenderWorldPosition(clientHuman),
+                        Is.EqualTo(transformSystem.GetWorldPosition(clientHuman)));
+                });
+            }
+
+            Assert.That(applied, Is.True, "the authoritative buckle state was not applied!!!");
+
+            await Server.WaitAssertion(() =>
+                SEntMan.System<SharedBuckleSystem>().Unbuckle(human, human));
+
+            applied = false;
+            for (var i = 0; i < 5 && !applied; i++)
+            {
+                await Pair.RunTicksSync(1);
+                await Client.WaitAssertion(() =>
+                {
+                    var clientHuman = CEntMan.GetEntity(netHuman);
+                    var buckle = CEntMan.GetComponent<BuckleComponent>(clientHuman);
+                    var transformSystem = CEntMan.System<TransformSystem>();
+                    applied = !buckle.Buckled;
+                    if (!applied)
+                        return;
+
+                    Assert.That(transformSystem.TryGetRenderTransformDebugData(clientHuman, out _), Is.False);
+                    Assert.That(transformSystem.GetRenderWorldPosition(clientHuman),
+                        Is.EqualTo(transformSystem.GetWorldPosition(clientHuman)));
+                });
+            }
+
+            Assert.That(applied, Is.True, "the authoritative unbuckle state was not applied");
+        }
+
         [Test]
         public async Task BuckledDyingDropItemsTest()
         {
diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
index f413e5b689..834f3e4428 100644
--- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
@@ -101,6 +101,14 @@ public abstract partial class SharedBuckleSystem
     private void OnParentChanged(Entity<BuckleComponent> ent, ref EntParentChangedMessage args)
     {
         BuckleTransformCheck(ent, args.Transform);
+        AfterBuckleParentChanged(ent, ref args);
+    }
+
+    /// <summary>
+    /// Allows sided buckle systems to handle completed parent changes.
+    /// </summary>
+    protected virtual void AfterBuckleParentChanged(Entity<BuckleComponent> ent, ref EntParentChangedMessage args)
+    {
     }
 
     private void OnInserted(Entity<BuckleComponent> ent, ref EntGotInsertedIntoContainerMessage args)
@@ -466,7 +474,6 @@ public abstract partial class SharedBuckleSystem
         if (buckleXform.ParentUid == strap.Owner && !Terminating(oldBuckledXform.ParentUid))
         {
             _transform.PlaceNextTo((buckle, buckleXform), (strap.Owner, oldBuckledXform));
-            buckleXform.ActivelyLerping = false;
 
             var oldBuckledToWorldRot = _transform.GetWorldRotation(strap);
             _transform.SetWorldRotationNoLerp((buckle, buckleXform), oldBuckledToWorldRot);
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 552fc49297..ff54f81e14 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Numerics;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Administration.Logs;
 using Content.Shared.CCVar;
@@ -588,12 +589,15 @@ namespace Content.Shared.Interaction
             // Only rotate to face if they're not moving.
             if (!HasComp<NoRotateOnInteractComponent>(user) && (!TryComp(user, out InputMoverComponent? mover) || (mover.HeldMoveButtons & MoveButtons.AnyDirection) == 0x0))
             {
-                _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position);
+                TryFaceInteraction(user, _transform.ToMapCoordinates(coordinates).Position);
             }
 
             return true;
         }
 
+        protected virtual bool TryFaceInteraction(EntityUid user, Vector2 coordinates)
+            => _rotateToFaceSystem.TryFaceCoordinates(user, coordinates);
+
         /// <summary>
         ///     Traces a ray from coords to otherCoords and returns the length
         ///     of the vector between coords and the ray's first hit.

From 408ac850847e14abf75111332cd6abbb0629e1c5 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 17:43:35 +1100
Subject: [PATCH 64/69] Stop overlays resetting world transforms (#45547)

* Stop overlays resetting world transforms

* oop
---
 .../UI/SpawnExplosion/ExplosionDebugOverlay.cs    |  1 -
 .../Atmos/Overlays/AtmosDebugOverlay.cs           |  2 --
 .../GasTileDangerousTemperatureOverlay.cs         |  3 ---
 .../Atmos/Overlays/GasTileFireOverlay.cs          |  3 ---
 .../Atmos/Overlays/GasTileHeatBlurOverlay.cs      |  5 -----
 .../Atmos/Overlays/GasTileVisibleGasOverlay.cs    |  3 ---
 .../CombatMode/ColoredScreenBorderOverlay.cs      |  1 -
 Content.Client/DamageOverlay/DamageOverlay.cs     |  2 --
 Content.Client/Decals/Overlays/DecalOverlay.cs    |  2 --
 .../Decals/Overlays/DecalPlacementOverlay.cs      |  1 -
 Content.Client/DoAfter/DoAfterOverlay.cs          |  3 ---
 Content.Client/Drowsiness/DrowsinessOverlay.cs    |  1 -
 Content.Client/Drugs/RainbowOverlay.cs            |  1 -
 Content.Client/Drunk/DrunkOverlay.cs              |  1 -
 Content.Client/Explosion/ExplosionOverlay.cs      |  3 ---
 Content.Client/Eye/Blinding/BlindOverlay.cs       |  1 -
 .../Eye/Blinding/BlurryVisionOverlay.cs           |  2 --
 Content.Client/Flash/FlashOverlay.cs              |  1 -
 Content.Client/Fluids/PuddleOverlay.cs            |  2 --
 Content.Client/Light/AmbientOcclusionOverlay.cs   |  3 ---
 .../Light/EntitySystems/PlanetLightSystem.cs      | 15 +++++++--------
 Content.Client/Light/RoofOverlay.cs               |  2 --
 Content.Client/MapText/MapTextOverlay.cs          |  4 ----
 Content.Client/Mapping/MappingOverlay.cs          |  2 --
 Content.Client/Mining/MiningOverlay.cs            |  1 -
 Content.Client/NPC/PathfindingSystem.cs           |  2 --
 .../NodeContainer/NodeVisualizationOverlay.cs     |  2 --
 Content.Client/Overlays/BlackAndWhiteOverlay.cs   |  1 -
 Content.Client/Overlays/EntityHealthBarOverlay.cs |  2 --
 Content.Client/Overlays/NightVisionOverlay.cs     |  3 ---
 Content.Client/Overlays/NoirOverlay.cs            |  1 -
 .../Overlays/ScreechShockWaveOverlay.cs           |  3 ---
 Content.Client/Overlays/StencilOverlay.Weather.cs |  2 --
 Content.Client/Overlays/StencilOverlay.cs         |  3 ---
 Content.Client/Parallax/ParallaxOverlay.cs        |  2 --
 Content.Client/Physics/JointVisualsOverlay.cs     |  2 --
 Content.Client/Popups/PopupOverlay.cs             |  3 ---
 .../Radiation/Overlays/RadiationPulseOverlay.cs   |  2 --
 Content.Client/Shuttles/FtlArrivalOverlay.cs      |  3 ---
 .../Systems/ShuttleSystem.EmergencyConsole.cs     |  1 -
 .../Silicons/StationAi/StationAiOverlay.cs        |  4 ----
 Content.Client/Singularity/SingularityOverlay.cs  |  1 -
 Content.Client/StatusIcon/StatusIconOverlay.cs    |  3 ---
 43 files changed, 7 insertions(+), 98 deletions(-)

diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
index c4dd442311..65ed73d261 100644
--- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
+++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs
@@ -154,7 +154,6 @@ public sealed partial class ExplosionDebugOverlay : Overlay
         handle.SetTransform(SpaceMatrix);
 
         DrawTiles(handle, gridBounds, SpaceTiles, SpaceTileSize);
-        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawTiles(
diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
index d0aaeade89..a5c7671f5d 100644
--- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
+++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
@@ -65,8 +65,6 @@ public sealed partial class AtmosDebugOverlay : Overlay
             handle.SetTransform(_transform.GetWorldMatrix(grid));
             DrawData(msg, handle);
         }
-
-        handle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawData(DebugMessage msg,
diff --git a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs
index bdd62db9a8..fa0bbf58f4 100644
--- a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs
@@ -222,8 +222,6 @@ public sealed partial class GasTileDangerousTemperatureOverlay : Overlay
             },
             new Color(0, 0, 0, 0));
 
-        drawHandle.SetTransform(Matrix3x2.Identity);
-
         return true;
     }
 
@@ -233,7 +231,6 @@ public sealed partial class GasTileDangerousTemperatureOverlay : Overlay
 
         if (res.TemperatureTarget != null)
             args.WorldHandle.DrawTextureRect(res.TemperatureTarget.Texture, args.WorldBounds);
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 
     protected override void DisposeBehavior()
diff --git a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs
index 370ed2a792..82408284e1 100644
--- a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs
@@ -164,8 +164,5 @@ public sealed partial class GasTileFireOverlay : Overlay
 
                 return true;
             });
-
-        drawHandle.UseShader(null);
-        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs
index 43b95b975a..54e9351890 100644
--- a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs
@@ -198,8 +198,6 @@ public sealed partial class GasTileHeatBlurOverlay : Overlay
         // no distortion, no need to render
         if (!anyDistortion)
         {
-            args.WorldHandle.UseShader(null);
-            args.WorldHandle.SetTransform(Matrix3x2.Identity);
             return false;
         }
 
@@ -218,9 +216,6 @@ public sealed partial class GasTileHeatBlurOverlay : Overlay
 
         args.WorldHandle.UseShader(_shader);
         args.WorldHandle.DrawTextureRect(res.HeatTarget.Texture, args.WorldBounds);
-
-        args.WorldHandle.UseShader(null);
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 
     protected override void DisposeBehavior()
diff --git a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs
index 65d0b919d0..6f46fee98c 100644
--- a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs
+++ b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs
@@ -204,9 +204,6 @@ public sealed partial class GasTileVisibleGasOverlay : Overlay
 
                 return true;
             });
-
-        drawHandle.UseShader(null);
-        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawMapOverlay(
diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index d1ecc438da..ce264c2536 100644
--- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -27,7 +27,6 @@ namespace Content.Client.CombatMode
             worldHandle.UseShader(_shader);
             var viewport = args.WorldAABB;
             worldHandle.DrawRect(viewport, Color.White);
-            worldHandle.UseShader(null);
         }
     }
 }
diff --git a/Content.Client/DamageOverlay/DamageOverlay.cs b/Content.Client/DamageOverlay/DamageOverlay.cs
index 3ec1ef9c9f..36092a5d65 100644
--- a/Content.Client/DamageOverlay/DamageOverlay.cs
+++ b/Content.Client/DamageOverlay/DamageOverlay.cs
@@ -254,8 +254,6 @@ public sealed partial class DamageOverlay : Overlay
             handle.UseShader(_critShader);
             handle.DrawRect(viewport, Color.White);
         }
-
-        handle.UseShader(null);
     }
 
     private float GetDiff(float value, float lastFrameTime)
diff --git a/Content.Client/Decals/Overlays/DecalOverlay.cs b/Content.Client/Decals/Overlays/DecalOverlay.cs
index b0fc58d976..d19d3386f5 100644
--- a/Content.Client/Decals/Overlays/DecalOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalOverlay.cs
@@ -115,8 +115,6 @@ namespace Content.Client.Decals.Overlays
                 else
                     handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
-
-            handle.SetTransform(Matrix3x2.Identity);
         }
 
         private static int CompareDecalIndex(DecalIndex x, DecalIndex y)
diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
index a9e68b32f6..d9c4b826f0 100644
--- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
+++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs
@@ -64,6 +64,5 @@ public sealed partial class DecalPlacementOverlay : Overlay
         var box = new Box2Rotated(aabb, rotation, localPos);
 
         handle.DrawTextureRect(_sprite.Frame0(decal.Sprite), box, color);
-        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/DoAfter/DoAfterOverlay.cs b/Content.Client/DoAfter/DoAfterOverlay.cs
index b0eb193bb6..dfdda02109 100644
--- a/Content.Client/DoAfter/DoAfterOverlay.cs
+++ b/Content.Client/DoAfter/DoAfterOverlay.cs
@@ -174,9 +174,6 @@ public sealed class DoAfterOverlay : Overlay
                 offset += _barTexture.Height / scale;
             }
         }
-
-        handle.UseShader(null);
-        handle.SetTransform(Matrix3x2.Identity);
     }
 
     public Color GetProgressColor(float progress, float alpha = 1f)
diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs
index bb74c8bec2..0a9c2f80cc 100644
--- a/Content.Client/Drowsiness/DrowsinessOverlay.cs
+++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs
@@ -75,6 +75,5 @@ public sealed partial class DrowsinessOverlay : Overlay
         _drowsinessShader.SetParameter("Strength", _visualScale * Intensity);
         handle.UseShader(_drowsinessShader);
         handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs
index 1884ead4bb..06698aaa40 100644
--- a/Content.Client/Drugs/RainbowOverlay.cs
+++ b/Content.Client/Drugs/RainbowOverlay.cs
@@ -101,6 +101,5 @@ public sealed partial class RainbowOverlay : Overlay
         _rainbowShader.SetParameter("phase", Phase);
         handle.UseShader(_rainbowShader);
         handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs
index 80917c8970..731fc43be8 100644
--- a/Content.Client/Drunk/DrunkOverlay.cs
+++ b/Content.Client/Drunk/DrunkOverlay.cs
@@ -103,7 +103,6 @@ public sealed partial class DrunkOverlay : Overlay
         _drunkShader.SetParameter("phase", Phase);
         handle.UseShader(_drunkShader);
         handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
     }
 
     /// <summary>
diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs
index ffaf9a7db6..4360217b53 100644
--- a/Content.Client/Explosion/ExplosionOverlay.cs
+++ b/Content.Client/Explosion/ExplosionOverlay.cs
@@ -52,9 +52,6 @@ public sealed partial class ExplosionOverlay : Overlay
             index = Math.Min(index, visuals.Intensity.Count - 1);
             DrawExplosion(drawHandle, args.WorldBounds, visuals, index, xforms, textures);
         }
-
-        drawHandle.SetTransform(Matrix3x2.Identity);
-        drawHandle.UseShader(null);
     }
 
     private void DrawExplosion(
diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs
index f316b23678..812c1f4a16 100644
--- a/Content.Client/Eye/Blinding/BlindOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlindOverlay.cs
@@ -96,7 +96,6 @@ namespace Content.Client.Eye.Blinding
             worldHandle.DrawRect(viewport, Color.White);
             worldHandle.UseShader(_circleMaskShader);
             worldHandle.DrawRect(viewport, Color.White);
-            worldHandle.UseShader(null);
         }
     }
 }
diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
index 1c14dfd6d5..8af861afd4 100644
--- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
+++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs
@@ -100,7 +100,6 @@ namespace Content.Client.Eye.Blinding
 
                 worldHandle.UseShader(_circleMaskShader);
                 worldHandle.DrawRect(viewport, Color.White);
-                worldHandle.UseShader(null);
                 return;
             }
 
@@ -114,7 +113,6 @@ namespace Content.Client.Eye.Blinding
 
             worldHandle.UseShader(_cataractsShader);
             worldHandle.DrawRect(viewport, Color.White);
-            worldHandle.UseShader(null);
         }
     }
 }
diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
index 844c1c3f0c..eec9d8dcb4 100644
--- a/Content.Client/Flash/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -96,7 +96,6 @@ public sealed partial class FlashOverlay : Overlay
             _shader.SetParameter("percentComplete", PercentComplete);
             worldHandle.UseShader(_shader);
             worldHandle.DrawTextureRectRegion(ScreenshotTexture, args.WorldBounds);
-            worldHandle.UseShader(null);
         }
     }
 
diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs
index 488493e07a..63bf0d18c9 100644
--- a/Content.Client/Fluids/PuddleOverlay.cs
+++ b/Content.Client/Fluids/PuddleOverlay.cs
@@ -75,8 +75,6 @@ public sealed partial class PuddleOverlay : Overlay
                 drawHandle.DrawRect(box, ColorMap(debugOverlayData.CurrentVolume));
             }
         }
-
-        drawHandle.SetTransform(Matrix3x2.Identity);
     }
 
     private void DrawScreen(in OverlayDrawArgs args)
diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs
index b56ee5cc60..dcb855b594 100644
--- a/Content.Client/Light/AmbientOcclusionOverlay.cs
+++ b/Content.Client/Light/AmbientOcclusionOverlay.cs
@@ -127,9 +127,6 @@ public sealed partial class AmbientOcclusionOverlay : Overlay
 
         worldHandle.UseShader(_proto.Index(StencilEqualDrawShader).Instance());
         worldHandle.DrawTextureRect(res.AOTarget!.Texture, worldBounds, color);
-
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
-        args.WorldHandle.UseShader(null);
     }
 
     private void OnColorChanged(string value)
diff --git a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
index 7a71dfefbe..2535ed134b 100644
--- a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
+++ b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs
@@ -39,9 +39,7 @@ public sealed partial class PlanetLightSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<GetClearColorEvent>(OnClearColor);
-
-        _cfgManager.OnValueChanged(CCVars.AmbientOcclusion, val =>
+        Subs.CVar(_cfgManager, CCVars.AmbientOcclusion, val =>
         {
             AmbientOcclusion = val;
         }, true);
@@ -54,11 +52,6 @@ public sealed partial class PlanetLightSystem : EntitySystem
         _overlayMan.AddOverlay(new AfterLightTargetOverlay());
     }
 
-    private void OnClearColor(ref GetClearColorEvent ev)
-    {
-        ev.Color = Color.Transparent;
-    }
-
     public override void Shutdown()
     {
         base.Shutdown();
@@ -70,4 +63,10 @@ public sealed partial class PlanetLightSystem : EntitySystem
         _overlayMan.RemoveOverlay<AfterLightTargetOverlay>();
         _overlayMan.RemoveOverlay<AmbientOcclusionOverlay>();
     }
+
+    [SubscribeLocalEvent]
+    private void OnClearColor(ref GetClearColorEvent ev)
+    {
+        ev.Color = Color.Transparent;
+    }
 }
diff --git a/Content.Client/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs
index 2aa717a198..c27a4cbf18 100644
--- a/Content.Client/Light/RoofOverlay.cs
+++ b/Content.Client/Light/RoofOverlay.cs
@@ -132,7 +132,5 @@ public sealed partial class RoofOverlay : Overlay
                     }
                 }
             }, null);
-
-        worldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/MapText/MapTextOverlay.cs b/Content.Client/MapText/MapTextOverlay.cs
index 216bc1ba65..4defcdc861 100644
--- a/Content.Client/MapText/MapTextOverlay.cs
+++ b/Content.Client/MapText/MapTextOverlay.cs
@@ -41,16 +41,12 @@ public sealed class MapTextOverlay : Overlay
         if (args.ViewportControl == null)
             return;
 
-        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
-
         var scale = _configManager.GetCVar(CVars.DisplayUIScale);
 
         if (scale == 0f)
             scale = _uiManager.DefaultUIScale;
 
         DrawWorld(args.ScreenHandle, args, scale);
-
-        args.DrawingHandle.UseShader(null);
     }
 
     private void DrawWorld(DrawingHandleScreen handle, OverlayDrawArgs args, float scale)
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index 0adda6fcc0..0fd36406d5 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -84,7 +84,5 @@ public sealed partial class MappingOverlay : Overlay
                 break;
             }
         }
-
-        handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Mining/MiningOverlay.cs b/Content.Client/Mining/MiningOverlay.cs
index 2a21709b8f..31ea32d7ec 100644
--- a/Content.Client/Mining/MiningOverlay.cs
+++ b/Content.Client/Mining/MiningOverlay.cs
@@ -91,6 +91,5 @@ public sealed partial class MiningOverlay : Overlay
             handle.DrawTexture(texture, -(Vector2)texture.Size / 2f / EyeManager.PixelsPerMeter, layer.Rotation, modulate: color);
 
         }
-        handle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index b54e2bf1cd..b6f726e4d8 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -570,8 +570,6 @@ namespace Content.Client.NPC
                     }
                 }
             }
-
-            worldHandle.SetTransform(Matrix3x2.Identity);
         }
     }
 }
diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
index 0bb770e05d..bbc6167080 100644
--- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
+++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs
@@ -199,8 +199,6 @@ namespace Content.Client.NodeContainer
                 _nodeIndex.Clear();
             }
 
-
-            handle.SetTransform(Matrix3x2.Identity);
             _gridIndex.Clear();
         }
 
diff --git a/Content.Client/Overlays/BlackAndWhiteOverlay.cs b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
index 402162628e..73163e5b7b 100644
--- a/Content.Client/Overlays/BlackAndWhiteOverlay.cs
+++ b/Content.Client/Overlays/BlackAndWhiteOverlay.cs
@@ -30,6 +30,5 @@ public sealed partial class BlackAndWhiteOverlay : Overlay
         _greyscaleShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
         handle.UseShader(_greyscaleShader);
         handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/EntityHealthBarOverlay.cs b/Content.Client/Overlays/EntityHealthBarOverlay.cs
index e08a263e96..7ebd79f836 100644
--- a/Content.Client/Overlays/EntityHealthBarOverlay.cs
+++ b/Content.Client/Overlays/EntityHealthBarOverlay.cs
@@ -128,8 +128,6 @@ public sealed class EntityHealthBarOverlay : Overlay
             pixelDarken = pixelDarken.Translated(position);
             handle.DrawRect(pixelDarken, Black.WithAlpha(128));
         }
-
-        handle.SetTransform(Matrix3x2.Identity);
     }
 
     /// <summary>
diff --git a/Content.Client/Overlays/NightVisionOverlay.cs b/Content.Client/Overlays/NightVisionOverlay.cs
index 613c4500fa..9939251d04 100644
--- a/Content.Client/Overlays/NightVisionOverlay.cs
+++ b/Content.Client/Overlays/NightVisionOverlay.cs
@@ -65,8 +65,5 @@ public sealed partial class NightVisionOverlay : Overlay
 
         var drawingColor = isSpace ? OverlayColor : LightingColor;
         handle.DrawRect(args.WorldBounds, drawingColor);
-
-        if (isSpace)
-            handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/NoirOverlay.cs b/Content.Client/Overlays/NoirOverlay.cs
index 4978dae3b4..4bc27500b4 100644
--- a/Content.Client/Overlays/NoirOverlay.cs
+++ b/Content.Client/Overlays/NoirOverlay.cs
@@ -30,6 +30,5 @@ public sealed partial class NoirOverlay : Overlay
         _noirShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
         handle.UseShader(_noirShader);
         handle.DrawRect(args.WorldBounds, Color.White);
-        handle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/ScreechShockWaveOverlay.cs b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
index 08b1981931..b2a2f18505 100644
--- a/Content.Client/Overlays/ScreechShockWaveOverlay.cs
+++ b/Content.Client/Overlays/ScreechShockWaveOverlay.cs
@@ -126,9 +126,6 @@ public sealed partial class ScreechShockWaveOverlay : Overlay
         var worldHandle = args.WorldHandle;
         worldHandle.UseShader(_shader);
         worldHandle.DrawRect(args.WorldBounds, Color.White);
-
-        // i wonder what would happen if this line wasn't there :godo:
-        worldHandle.UseShader(null);
     }
 
     /// <summary>
diff --git a/Content.Client/Overlays/StencilOverlay.Weather.cs b/Content.Client/Overlays/StencilOverlay.Weather.cs
index f54b7891ba..4bd17cd80d 100644
--- a/Content.Client/Overlays/StencilOverlay.Weather.cs
+++ b/Content.Client/Overlays/StencilOverlay.Weather.cs
@@ -51,7 +51,5 @@ public sealed partial class StencilOverlay
                 modulate: (weather.Color ?? Color.White).WithAlpha(alpha));
         }
 
-        worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(null);
     }
 }
diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs
index efb22f5612..2387498e30 100644
--- a/Content.Client/Overlays/StencilOverlay.cs
+++ b/Content.Client/Overlays/StencilOverlay.cs
@@ -76,9 +76,6 @@ public sealed partial class StencilOverlay : Overlay
 
         if (_entManager.TryGetComponent<RestrictedRangeComponent>(mapUid, out var restrictedRangeComponent))
             DrawRestrictedRange(args, res, restrictedRangeComponent, invMatrix);
-
-        args.WorldHandle.UseShader(null);
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 
     protected override void DisposeBehavior()
diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs
index 78775c83b2..d00748e506 100644
--- a/Content.Client/Parallax/ParallaxOverlay.cs
+++ b/Content.Client/Parallax/ParallaxOverlay.cs
@@ -113,8 +113,6 @@ public sealed partial class ParallaxOverlay : Overlay
                 worldHandle.DrawTextureRect(tex, Box2.FromDimensions(originBL, size));
             }
         }
-
-        worldHandle.UseShader(null);
     }
 }
 
diff --git a/Content.Client/Physics/JointVisualsOverlay.cs b/Content.Client/Physics/JointVisualsOverlay.cs
index ddac71f4ea..5ac70b98a9 100644
--- a/Content.Client/Physics/JointVisualsOverlay.cs
+++ b/Content.Client/Physics/JointVisualsOverlay.cs
@@ -29,8 +29,6 @@ public sealed class JointVisualsOverlay : Overlay
         var joints = _entManager.EntityQueryEnumerator<JointVisualsComponent, TransformComponent>();
         var xformQuery = _entManager.GetEntityQuery<TransformComponent>();
 
-        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
-
         while (joints.MoveNext(out var visuals, out var xform))
         {
             if (xform.MapID != args.MapId)
diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs
index 739fa02a91..0c4f2f8e5c 100644
--- a/Content.Client/Popups/PopupOverlay.cs
+++ b/Content.Client/Popups/PopupOverlay.cs
@@ -58,7 +58,6 @@ public sealed class PopupOverlay : Overlay
         if (args.ViewportControl == null)
             return;
 
-        args.DrawingHandle.SetTransform(Matrix3x2.Identity);
         args.DrawingHandle.UseShader(_shader);
         var scale = _configManager.GetCVar(CVars.DisplayUIScale);
 
@@ -66,8 +65,6 @@ public sealed class PopupOverlay : Overlay
             scale = _uiManager.DefaultUIScale;
 
         DrawWorld(args.ScreenHandle, args, scale);
-
-        args.DrawingHandle.UseShader(null);
     }
 
     private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, float scale)
diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
index c44c930886..070a402172 100644
--- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
+++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs
@@ -70,8 +70,6 @@ namespace Content.Client.Radiation.Overlays
                 worldHandle.UseShader(shd);
                 worldHandle.DrawRect(Box2.CenteredAround(instance.CurrentMapCoords.Position, new Vector2(instance.Range, instance.Range) * 2f), Color.White);
             }
-
-            worldHandle.UseShader(null);
         }
 
         //Queries all pulses on the map and either adds or removes them from the list of rendered pulses based on whether they should be drawn (in range? on the same z-level/map? pulse entity still exists?)
diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs
index 29688f10da..5bbb551d24 100644
--- a/Content.Client/Shuttles/FtlArrivalOverlay.cs
+++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs
@@ -77,8 +77,5 @@ public sealed partial class FtlArrivalOverlay : Overlay
                 args.WorldHandle.DrawTextureRect(texture, bounds);
             }
         }
-
-        args.WorldHandle.UseShader(null);
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
index f6e6594af5..8e65c3ec42 100644
--- a/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
+++ b/Content.Client/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
@@ -78,6 +78,5 @@ public sealed class EmergencyShuttleOverlay : Overlay
 
         args.WorldHandle.SetTransform(_transformSystem.GetWorldMatrix(xform));
         args.WorldHandle.DrawRect(Position.Value, Color.Red.WithAlpha(100));
-        args.WorldHandle.SetTransform(Matrix3x2.Identity);
     }
 }
diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
index 4db8965868..163534c303 100644
--- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs
+++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs
@@ -138,10 +138,6 @@ public sealed partial class StationAiOverlay : Overlay
         // Draw the static
         worldHandle.UseShader(_proto.Index(StencilDrawShader).Instance());
         worldHandle.DrawTextureRect(res.StaticTexture!.Texture, worldBounds);
-
-        worldHandle.SetTransform(Matrix3x2.Identity);
-        worldHandle.UseShader(null);
-
     }
 
     protected override void DisposeBehavior()
diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
index 970d47b131..b6186d8b48 100644
--- a/Content.Client/Singularity/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -104,7 +104,6 @@ namespace Content.Client.Singularity
             var worldHandle = args.WorldHandle;
             worldHandle.UseShader(_shader);
             worldHandle.DrawRect(args.WorldAABB, Color.White);
-            worldHandle.UseShader(null);
         }
 
         /// <summary>
diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs
index 8d1bd38c7d..dee65068f8 100644
--- a/Content.Client/StatusIcon/StatusIconOverlay.cs
+++ b/Content.Client/StatusIcon/StatusIconOverlay.cs
@@ -125,9 +125,6 @@ public sealed partial class StatusIconOverlay : Overlay
                 var position = new Vector2(xOffset, yOffset);
                 handle.DrawTexture(texture, position);
             }
-
-            handle.UseShader(null);
-            handle.SetTransform(Matrix3x2.Identity);
         }
     }
 }

From f762b4b23fd203f8bb9cd2edae629caeede8d69f Mon Sep 17 00:00:00 2001
From: Perry Fraser <perryprog@users.noreply.github.com>
Date: Mon, 5 Oct 2026 02:46:47 -0400
Subject: [PATCH 65/69] Slightly rework pathfinding obstacle avoidance and
 handling (#38056)

* fix: fix NPC route cost overlay mode

* feat: adjust pathfinding weights

Plus drive-by import trim.

* feat: rework pathfinding obstacle avoidance

* review by Pok

* fix merge

* Update NPCSteeringSystem.Obstacles.cs

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 Content.Client/NPC/PathfindingSystem.cs       |   3 +
 .../Pathfinding/PathfindingSystem.Common.cs   |  22 +-
 .../NPC/Systems/NPCCombatSystem.Melee.cs      |   6 +
 .../NPC/Systems/NPCSteeringSystem.Context.cs  | 134 +++++++--
 .../Systems/NPCSteeringSystem.Obstacles.cs    | 257 ++++++++----------
 .../NPC/Systems/NPCSteeringSystem.cs          |   6 +-
 6 files changed, 244 insertions(+), 184 deletions(-)

diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs
index b6f726e4d8..716360f256 100644
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -551,6 +551,9 @@ namespace Content.Client.NPC
 
                 foreach (var route in _system.Routes)
                 {
+                    if (route.Message.Costs.Values.Count == 0)
+                        continue;
+
                     var highestGScore = route.Message.Costs.Values.Max();
 
                     foreach (var (node, cost) in route.Message.Costs)
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Common.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Common.cs
index 5d31f47e26..f3e7123a78 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Common.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Common.cs
@@ -1,8 +1,4 @@
-using Content.Shared.Gravity;
-using Content.Shared.Maps;
 using Content.Shared.NPC;
-using Robust.Shared.Map.Components;
-using Robust.Shared.Spawners;
 
 namespace Content.Server.NPC.Pathfinding;
 
@@ -61,18 +57,20 @@ public sealed partial class PathfindingSystem
 
             // TODO: Handling power + door prying
             // Door we should be able to open
-            if (isDoor && !isAccess && (request.Flags & PathFlags.Interact) != 0x0)
+            if (isDoor)
             {
-                modifier += 0.5f;
-            }
-            // Door we can force open one way or another
-            else if (isDoor && isAccess && (request.Flags & PathFlags.Prying) != 0x0)
-            {
-                modifier += 10f;
+                if (!isAccess && (request.Flags & PathFlags.Interact) != 0x0)
+                    modifier += 0.5f;
+                else if (isAccess && (request.Flags & PathFlags.Prying) != 0x0)
+                    modifier += 10f;
+                else
+                    // Last ditch—try to bump the door if it's the only feasible option.
+                    modifier += 20f;
             }
             else if ((request.Flags & PathFlags.Smashing) != 0x0 && end.Data.Damage > 0f)
             {
-                modifier += 10f + end.Data.Damage / 100f;
+                // Breaking stuff should be usually last resort, especially because we WILL try to punch walls.
+                modifier += 10f + end.Data.Damage / 10f;
             }
             else if (isClimb && (request.Flags & PathFlags.Climbing) != 0x0)
             {
diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
index f6cf49c14d..c5480ba160 100644
--- a/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
+++ b/Content.Server/NPC/Systems/NPCCombatSystem.Melee.cs
@@ -97,6 +97,12 @@ public sealed partial class NPCCombatSystem
             return;
         }
 
+        if (!_interaction.InRangeUnobstructed(uid, component.Target, distance + 0.1f))
+        {
+            component.Status = CombatStatus.TargetUnreachable;
+            return;
+        }
+
         if (weapon.NextAttack > curTime || !Enabled)
             return;
 
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 40a3b43ea6..7d20b5b1b8 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -1,9 +1,11 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Numerics;
-using Content.Server.Examine;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Pathfinding;
-using Content.Shared.Climbing;
+using Content.Shared.Climbing.Components;
+using Content.Shared.CombatMode;
+using Content.Shared.Doors.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Movement.Components;
 using Content.Shared.NPC;
@@ -208,19 +210,9 @@ public sealed partial class NPCSteeringSystem
             {
                 // Ignore stuck while handling obstacles.
                 ResetStuck(steering, ourCoordinates);
-                SteeringObstacleStatus status;
 
                 // Breaking behaviours and the likes.
-                lock (_obstacles)
-                {
-                    // We're still coming to a stop so wait for the do_after.
-                    if (body.LinearVelocity.LengthSquared() > 0.01f)
-                    {
-                        return true;
-                    }
-
-                    status = TryHandleFlags(uid, steering, node);
-                }
+                var status = TryHandleFlags(uid, steering, node);
 
                 // TODO: Need to handle re-pathing in case the target moves around.
                 switch (status)
@@ -497,6 +489,7 @@ public sealed partial class NPCSteeringSystem
     /// </summary>
     private void CollisionAvoidance(
         EntityUid uid,
+        NPCSteeringComponent steering,
         Angle offsetRot,
         Vector2 worldPos,
         float agentRadius,
@@ -509,20 +502,10 @@ public sealed partial class NPCSteeringSystem
         var detectionRadius = MathF.Max(0.35f, agentRadius + objectRadius);
         var ents = _entSetPool.Get();
         _lookup.GetEntitiesInRange(uid, detectionRadius, ents, LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.Approximate);
-
+        // Filter out stuff that we can pry/vault/bash through
+        FilterObstacleEntities((uid, steering), mask, layer, ents, false);
         foreach (var ent in ents)
         {
-            // TODO: If we can access the door or smth.
-            if (!_physicsQuery.TryGetComponent(ent, out var otherBody) ||
-                !otherBody.Hard ||
-                !otherBody.CanCollide ||
-                otherBody.BodyType == BodyType.KinematicController ||
-                (mask & otherBody.CollisionLayer) == 0x0 &&
-                (layer & otherBody.CollisionMask) == 0x0)
-            {
-                continue;
-            }
-
             var xformB = _xformQuery.GetComponent(ent);
 
             if (!_physics.TryGetNearest(uid, ent,
@@ -564,6 +547,107 @@ public sealed partial class NPCSteeringSystem
         _entSetPool.Return(ents);
     }
 
+    /// <summary>
+    /// Filter down a list of entities into what can be considered obstacles.
+    ///
+    /// If allObstacles is set to false, don't filter out obstacles that can
+    /// be avoided by prying/vaulting/punching.
+    /// </summary>
+    private void FilterObstacleEntities(
+        Entity<NPCSteeringComponent> ent,
+        int mask,
+        int layer,
+        HashSet<EntityUid> nearbyEntities,
+        bool allObstacles = true)
+    {
+        if (!ent.Comp.CurrentPath.TryPeek(out var poly))
+            return;
+
+        var climbing = CompOrNull<ClimbingComponent>(ent.Owner);
+        var combatMode = CompOrNull<CombatModeComponent>(ent.Owner);
+
+        var checkDoors = (poly.Data.Flags & PathfindingBreadcrumbFlag.Door) != 0x0;
+        var checkClimbs = (poly.Data.Flags & PathfindingBreadcrumbFlag.Climb) != 0x0 &&
+                          (ent.Comp.Flags & PathFlags.Climbing) != 0x0 &&
+                          climbing != null;
+        var checkSmash = (ent.Comp.Flags & PathFlags.Smashing) != 0x0 &&
+                         combatMode != null &&
+                         _melee.TryGetWeapon(ent, out _, out var weapon) &&
+                         weapon.NextAttack <= _timing.CurTime;
+
+
+        nearbyEntities.RemoveWhere(nearbyEnt =>
+        {
+            // Get rid of stuff we can phase through.
+            if (!_physicsQuery.TryGetComponent(nearbyEnt, out var otherBody) ||
+                !otherBody.Hard ||
+                !otherBody.CanCollide ||
+                otherBody.BodyType == BodyType.KinematicController ||
+                (mask & otherBody.CollisionLayer) == 0x0 &&
+                (layer & otherBody.CollisionMask) == 0x0)
+            {
+                return true;
+            }
+
+            // If we just care about physical obstacles then this entity's checks are done.
+            if (allObstacles)
+                return false;
+
+            // If we're walking into a door we can handle...
+            if (checkDoors &&
+                CanHandleDoor(ent, poly.Data.Flags, nearbyEnt))
+                return true;
+
+            // Then check climbability.
+            if (checkClimbs &&
+                CanHandleClimb((ent, climbing!), nearbyEnt, out _))
+                return true;
+
+            // Check if we can smash. Should also check if we can even damage the entity at some point.
+            return checkSmash && _destructibleQuery.HasComponent(nearbyEnt);
+        });
+    }
+
+    private bool CanHandleDoor(Entity<NPCSteeringComponent> ent,
+        PathfindingBreadcrumbFlag flags,
+        EntityUid doorUid,
+        bool allowPrying = true)
+    {
+        if (!_doorQuery.TryComp(doorUid, out var door))
+            return false;
+
+        if (door.State == DoorState.Opening)
+            return true;
+
+        var isAccessRequired = (flags & PathfindingBreadcrumbFlag.Access) != 0x0 &&
+                               !_access.IsAllowed(ent, doorUid);
+        var canInteract = (ent.Comp.Flags & PathFlags.Interact) != 0x0;
+
+        // If not access locked we're fine if it can be bumped open or we can interact.
+        if (!isAccessRequired
+            && (door.BumpOpen || canInteract))
+            return true;
+
+        // Last possibility is that we can pry it open.
+        return allowPrying && (ent.Comp.Flags & PathFlags.Prying) != 0x0;
+    }
+
+    private bool CanHandleClimb(
+        Entity<ClimbingComponent> ent,
+        EntityUid climbableUid,
+        [NotNullWhen(true)] out ClimbableComponent? climbable)
+    {
+        if (!_climbableQuery.TryComp(climbableUid, out climbable))
+            return false;
+
+        // We're already climbing something, we're fine.
+        if (ent.Comp.IsClimbing || ent.Comp.NextTransition != null)
+            return true;
+
+        // Actually check if we can climb this
+        return _climb.CanVault(climbable, ent, climbableUid, out _);
+    }
+
     #endregion
 
     #region Dynamic Avoidance
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
index b84f2cdaee..eb583b8a56 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Obstacles.cs
@@ -58,160 +58,129 @@ public sealed partial class NPCSteeringSystem
 
         // TODO: Should cache the fact we're doing this somewhere.
         // See https://github.com/space-wizards/space-station-14/issues/11475
-        if ((poly.Data.CollisionLayer & mask) != 0x0 ||
-            (poly.Data.CollisionMask & layer) != 0x0)
+        if ((poly.Data.CollisionLayer & mask) == 0x0 &&
+            (poly.Data.CollisionMask & layer) == 0x0)
+            return SteeringObstacleStatus.Completed;
+
+        var id = component.DoAfterId;
+
+        // Still doing what we were doing before.
+        var doAfterStatus = _doAfter.GetStatus(id);
+
+        switch (doAfterStatus)
         {
-            var id = component.DoAfterId;
-
-            // Still doing what we were doing before.
-            var doAfterStatus = _doAfter.GetStatus(id);
-
-            switch (doAfterStatus)
-            {
-                case DoAfterStatus.Running:
-                    return SteeringObstacleStatus.Continuing;
-                case DoAfterStatus.Cancelled:
-                    return SteeringObstacleStatus.Failed;
-            }
-
-            var obstacleEnts = new List<EntityUid>();
-
-            GetObstacleEntities(poly, mask, layer, obstacleEnts);
-            var isDoor = (poly.Data.Flags & PathfindingBreadcrumbFlag.Door) != 0x0;
-            var isAccessRequired = (poly.Data.Flags & PathfindingBreadcrumbFlag.Access) != 0x0;
-            var isClimbable = (poly.Data.Flags & PathfindingBreadcrumbFlag.Climb) != 0x0;
-
-            // Just walk into it stupid
-            if (isDoor && !isAccessRequired)
-            {
-                // ... At least if it's not a bump open.
-                foreach (var ent in obstacleEnts)
-                {
-                    if (!_doorQuery.TryGetComponent(ent, out var door))
-                        continue;
-
-                    if (!door.BumpOpen && (component.Flags & PathFlags.Interact) != 0x0)
-                    {
-                        if (door.State != DoorState.Opening)
-                        {
-                            _interaction.InteractionActivate(uid, ent);
-                            return SteeringObstacleStatus.Continuing;
-                        }
-                    }
-                }
-
-                // If we get to here then didn't succeed for reasons.
-            }
-
-            if ((component.Flags & PathFlags.Prying) != 0x0 && isDoor)
-            {
-                // Get the relevant obstacle
-                foreach (var ent in obstacleEnts)
-                {
-                    if (_doorQuery.TryGetComponent(ent, out var door) && door.State != DoorState.Open)
-                    {
-                        // TODO: Use the verb.
-
-                        if (door.State != DoorState.Opening)
-                            _pryingSystem.TryPry(ent, uid, out id, uid);
-
-                        component.DoAfterId = id;
-                        return SteeringObstacleStatus.Continuing;
-                    }
-                }
-
-                if (obstacleEnts.Count == 0)
-                    return SteeringObstacleStatus.Completed;
-            }
-            // Try climbing obstacles
-            else if ((component.Flags & PathFlags.Climbing) != 0x0 && isClimbable)
-            {
-                if (TryComp<ClimbingComponent>(uid, out var climbing))
-                {
-                    if (climbing.IsClimbing)
-                    {
-                        return SteeringObstacleStatus.Completed;
-                    }
-                    else if (climbing.NextTransition != null)
-                    {
-                        return SteeringObstacleStatus.Continuing;
-                    }
-
-                    // Get the relevant obstacle
-                    foreach (var ent in obstacleEnts)
-                    {
-                        if (_climbableQuery.TryGetComponent(ent, out var table) &&
-                            _climb.CanVault(table, uid, uid, out _) &&
-                            _climb.TryClimb(uid, uid, ent, out id, table, climbing))
-                        {
-                            component.DoAfterId = id;
-                            return SteeringObstacleStatus.Continuing;
-                        }
-                    }
-                }
-
-                if (obstacleEnts.Count == 0)
-                    return SteeringObstacleStatus.Completed;
-            }
-            // Try smashing obstacles.
-            else if ((component.Flags & PathFlags.Smashing) != 0x0)
-            {
-                if (_melee.TryGetWeapon(uid, out _, out var meleeWeapon) && meleeWeapon.NextAttack <= _timing.CurTime && TryComp<CombatModeComponent>(uid, out var combatMode))
-                {
-                    _combat.SetInCombatMode(uid, true, combatMode);
-                    // TODO: This is a hack around grilles and windows.
-                    _random.Shuffle(obstacleEnts);
-                    var attackResult = false;
-
-                    foreach (var ent in obstacleEnts)
-                    {
-                        // TODO: Validate we can damage it
-                        if (_destructibleQuery.HasComponent(ent))
-                        {
-                            attackResult = _melee.AttemptLightAttack(uid, uid, meleeWeapon, ent);
-                            break;
-                        }
-                    }
-
-                    _combat.SetInCombatMode(uid, false, combatMode);
-
-                    // Blocked or the likes?
-                    if (!attackResult)
-                        return SteeringObstacleStatus.Failed;
-
-                    if (obstacleEnts.Count == 0)
-                        return SteeringObstacleStatus.Completed;
-
-                    return SteeringObstacleStatus.Continuing;
-                }
-            }
-
-            return SteeringObstacleStatus.Failed;
+            case DoAfterStatus.Running:
+                return SteeringObstacleStatus.Continuing;
+            case DoAfterStatus.Cancelled:
+                return SteeringObstacleStatus.Failed;
         }
 
-        return SteeringObstacleStatus.Completed;
-    }
-
-    private void GetObstacleEntities(PathPoly poly, int mask, int layer, List<EntityUid> ents)
-    {
-        // TODO: Can probably re-use this from pathfinding or something
         if (!TryComp<MapGridComponent>(poly.GraphUid, out var grid))
-        {
-            return;
-        }
+            return SteeringObstacleStatus.Completed;
 
-        foreach (var ent in _mapSystem.GetLocalAnchoredEntities(poly.GraphUid, grid, poly.Box))
+        var obstacleEnts = new HashSet<EntityUid>(_mapSystem.GetLocalAnchoredEntities(poly.GraphUid, grid, poly.Box));
+        FilterObstacleEntities((uid, component), mask, layer, obstacleEnts);
+
+        // Nothing actually near us.
+        if (obstacleEnts.Count == 0)
+            return SteeringObstacleStatus.Completed;
+
+        var isDoor = (poly.Data.Flags & PathfindingBreadcrumbFlag.Door) != 0x0;
+        var isClimbable = (poly.Data.Flags & PathfindingBreadcrumbFlag.Climb) != 0x0;
+
+        // Just walk into it stupid.
+        if (isDoor)
         {
-            if (!_physicsQuery.TryGetComponent(ent, out var body) ||
-                !body.Hard ||
-                !body.CanCollide ||
-                (body.CollisionMask & layer) == 0x0 && (body.CollisionLayer & mask) == 0x0)
+            foreach (var ent in obstacleEnts)
             {
-                continue;
+                // Includes checking if we have access:
+                if (!CanHandleDoor((uid, component), poly.Data.Flags, ent, false))
+                    continue;
+
+                // Interacts are bit nicer than bumps, so try interacting regardless.
+                _interaction.InteractionActivate(uid, ent);
+
+                return SteeringObstacleStatus.Continuing;
             }
 
-            ents.Add(ent);
+            // Couldn't normal-open the door, and can't pry. Give up.
+            if ((component.Flags & PathFlags.Prying) == 0x0)
+                return SteeringObstacleStatus.Failed;
+
+            foreach (var ent in obstacleEnts)
+            {
+                if (!CanHandleDoor((uid, component), poly.Data.Flags, ent))
+                    continue;
+
+                // Should be able to pry from CanHandleDoor:
+                // TODO: Use the verb.
+                _pryingSystem.TryPry(ent, uid, out id, uid);
+
+                if (id == null)
+                    return SteeringObstacleStatus.Failed;
+
+                component.DoAfterId = id;
+                return SteeringObstacleStatus.Continuing;
+            }
         }
+        // Try climbing obstacles
+        else if ((component.Flags & PathFlags.Climbing) != 0x0 && isClimbable)
+        {
+            if (!TryComp<ClimbingComponent>(uid, out var climbing))
+                return SteeringObstacleStatus.Failed;
+
+            if (climbing.IsClimbing)
+                return SteeringObstacleStatus.Completed;
+
+            if (climbing.NextTransition != null)
+                return SteeringObstacleStatus.Continuing;
+
+            // Get the relevant obstacle.
+            foreach (var ent in obstacleEnts)
+            {
+                if (CanHandleClimb((uid, climbing), ent, out var climbable) &&
+                    _climb.TryClimb(uid, uid, ent, out id, climbable, climbing))
+                {
+                    component.DoAfterId = id;
+                    return SteeringObstacleStatus.Continuing;
+                }
+            }
+        }
+        // Try smashing obstacles.
+        else if ((component.Flags & PathFlags.Smashing) != 0x0)
+        {
+            // Check we have a weapon, can (probably) swing it, and have combat mode.
+            if (!_melee.TryGetWeapon(uid, out var weaponUid, out var weaponComp) ||
+                weaponComp.NextAttack > _timing.CurTime ||
+                !TryComp<CombatModeComponent>(uid, out var combatMode))
+                return SteeringObstacleStatus.Failed;
+
+            _combat.SetInCombatMode(uid, true, combatMode);
+
+            var attackResult = false;
+            foreach (var ent in obstacleEnts)
+            {
+                if (!_destructibleQuery.HasComponent(ent) ||
+                    !_interaction.InRangeUnobstructed(uid, ent, weaponComp.Range))
+                    continue;
+
+                if (_melee.AttemptLightAttack(uid, weaponUid, weaponComp, ent))
+                {
+                    attackResult = true;
+                    break;
+                }
+            }
+
+            _combat.SetInCombatMode(uid, false, combatMode);
+
+            // Blocked or the likes?
+            if (!attackResult)
+                return SteeringObstacleStatus.Failed;
+
+            return SteeringObstacleStatus.Continuing;
+        }
+
+        return SteeringObstacleStatus.Failed;
     }
 
     private enum SteeringObstacleStatus : byte
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 3487548c27..36c46fe206 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -6,6 +6,7 @@ using Content.Server.DoAfter;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.Events;
 using Content.Server.NPC.Pathfinding;
+using Content.Shared.Access.Systems;
 using Content.Shared.CCVar;
 using Content.Shared.Climbing.Systems;
 using Content.Shared.CombatMode;
@@ -54,6 +55,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
     [Dependency] private IConfigurationManager _configManager = default!;
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
+    [Dependency] private AccessReaderSystem _access = default!;
     [Dependency] private ClimbSystem _climb = default!;
     [Dependency] private DoAfterSystem _doAfter = default!;
     [Dependency] private EntityLookupSystem _lookup = default!;
@@ -90,8 +92,6 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
 
     private readonly HashSet<ICommonSession> _subscribedSessions = new();
 
-    private object _obstacles = new();
-
     private int _activeSteeringCount;
 
     public override void Initialize()
@@ -373,7 +373,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
         }
 
         // Avoid static objects like walls
-        CollisionAvoidance(uid, offsetRot, worldPos, agentRadius, layer, mask, xform, danger);
+        CollisionAvoidance(uid, steering, offsetRot, worldPos, agentRadius, layer, mask, xform, danger);
         DebugTools.Assert(!float.IsNaN(danger[0]));
 
         Separation(uid, offsetRot, worldPos, agentRadius, layer, mask, body, xform, danger);

From 5612c530d469a5cd340bace47d39de1c8d26e0b9 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 18:07:59 +1100
Subject: [PATCH 66/69] Update submodule to 292.0.0 (#46329)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 3708c7a310..b8185556b6 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 3708c7a31094649d60cecdab11a0a6c3aa96223e
+Subproject commit b8185556b610da84d3f93559bbd7778fdae58811

From e22cf425cfd92fe3f64db737bdfc4a0056cc6725 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 5 Oct 2026 12:34:10 +0000
Subject: [PATCH 67/69] Remove MathHelper.TwoPi (#46330)

Getting removed in Angle PR as the dotnet constants are better to use.
---
 Content.Server/Solar/EntitySystems/PowerSolarSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
index c7aff7e25a..abe5058fc4 100644
--- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
@@ -82,7 +82,7 @@ namespace Content.Server.Solar.EntitySystems
         private void RandomizeSun()
         {
             // Initialize the sun to something random
-            TowardsSun = MathHelper.TwoPi * _robustRandom.NextDouble();
+            TowardsSun = Math.Tau * _robustRandom.NextDouble();
             SunAngularVelocity = Angle.FromDegrees(0.1 + ((_robustRandom.NextDouble() - 0.5) * 0.05));
         }
 

From d57d9447516a1028caddc29a8a2319ad49791fe6 Mon Sep 17 00:00:00 2001
From: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
Date: Mon, 5 Oct 2026 20:58:26 +0700
Subject: [PATCH 68/69] upstream fix

---
 .../ExportSprites/EntityScreenshotGenerator.cs    |   4 ++--
 Resources/ConfigPresets/Corvax/common.toml        |   3 ---
 Resources/ConfigPresets/Corvax/main.toml          |   3 ---
 .../objects/consumable/food/baked/vulpkanin.ftl   |   2 ++
 .../entities/objects/consumable/food/soup.ftl     |   2 ++
 .../Corvax/Entities/Clothing/Ears/headsets.yml    |   2 +-
 .../Objects/Devices/portable_screen_timer.yml     |   4 ++--
 .../Corvax/Recipes/Cooking/meat_recipes.yml       |   4 ++--
 .../Prototypes/Entities/Objects/Devices/radio.yml |   3 +--
 .../Consumable/Drinks/grapesoda.rsi/icon_open.png | Bin 525 -> 0 bytes
 .../Drinks/grapesoda.rsi/inhand-left.png          | Bin 446 -> 0 bytes
 .../Drinks/grapesoda.rsi/inhand-right.png         | Bin 466 -> 0 bytes
 .../Objects/Devices/pinpointer.rsi/meta.json      |   2 +-
 .../Objects/Misc/stock_parts.rsi/meta.json        |  11 +----------
 14 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png
 delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png

diff --git a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
index 8fe6439753..bc0ea5d89c 100644
--- a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
+++ b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
@@ -142,7 +142,7 @@ public sealed partial class EntityScreenshotGenerator
 
                 try
                 {
-                    if (proto.HasComponent<SpriteComponent>(_entityManager.ComponentFactory))
+                    if (proto.HasComp<SpriteComponent>(_entityManager.ComponentFactory))
                     {
                         entity = _entityManager.SpawnEntity(proto.ID, new EntityCoordinates(previewGrid.Owner, default));
 
@@ -257,7 +257,7 @@ public sealed partial class EntityScreenshotGenerator
 
     private bool HasExportableSprite(EntityPrototype prototype)
     {
-        if (prototype.HasComponent<SpriteComponent>(_entityManager.ComponentFactory))
+        if (prototype.HasComp<SpriteComponent>(_entityManager.ComponentFactory))
             return true;
 
         return TryGetPrototypeIcon(prototype, out _);
diff --git a/Resources/ConfigPresets/Corvax/common.toml b/Resources/ConfigPresets/Corvax/common.toml
index 4eb7357755..507edae01d 100644
--- a/Resources/ConfigPresets/Corvax/common.toml
+++ b/Resources/ConfigPresets/Corvax/common.toml
@@ -40,6 +40,3 @@ server_hub_enabled = true
 [afk]
 time = 1800
 confirm_timeout = 300
-
-[res]
-validate_prototype_upload = false
diff --git a/Resources/ConfigPresets/Corvax/main.toml b/Resources/ConfigPresets/Corvax/main.toml
index 90a4dafa3a..5240be8ed8 100644
--- a/Resources/ConfigPresets/Corvax/main.toml
+++ b/Resources/ConfigPresets/Corvax/main.toml
@@ -23,9 +23,6 @@ deny_vpn = true
 enable_without_admins = true
 disable_with_admins = true
 
-[skills]
-enabled = true
-
 [rules]
 time = 180.0
 
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl
index 0974898142..a8bbfbc860 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/baked/vulpkanin.ftl
@@ -1,2 +1,4 @@
 ent-FoodBakedVulpkaninPlate = запечённый вульпканин
     .desc = На поверхности блюда всё ещё виднеются клочки шерсти..
+
+microwave-meal-Vulpkanin-name = рецепт вульпканина
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/soup.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/soup.ftl
index 2a152e42e0..a565bd218a 100644
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/soup.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/consumable/food/soup.ftl
@@ -1,2 +1,4 @@
 ent-FoodPelmeniBowl = пельмени
     .desc = Много мяса, мало теста.
+
+microwave-meal-Pelmeni-name = рецепт пельменей
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml
index d839823633..8ab4e8f49a 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/Ears/headsets.yml
@@ -9,7 +9,7 @@
         key_slots:
         - EncryptionKeyIAA
     - type: Sprite
-      sprite: Clothing/Ears/Headsets/servicesecurity.rsi
+      sprite: Clothing/Ears/Headsets/command.rsi
 
 - type: entity
   parent: ClothingHeadset
diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Devices/portable_screen_timer.yml b/Resources/Prototypes/Corvax/Entities/Objects/Devices/portable_screen_timer.yml
index 5b4cd6c2b5..df833f50ab 100644
--- a/Resources/Prototypes/Corvax/Entities/Objects/Devices/portable_screen_timer.yml
+++ b/Resources/Prototypes/Corvax/Entities/Objects/Devices/portable_screen_timer.yml
@@ -6,12 +6,12 @@
   components:
   - type: SignalTimer
     canEditLabel: true
+  - type: TextScreenTimerVisuals
   - type: TextScreenVisuals
     color: Gold
     textOffset: 0,0
-    timerOffset: 0,0
     rowOffset: 5
-    rows: 1
+    rowData: [{}]
   - type: Appearance
   - type: Sprite
     sprite: Corvax/Objects/Devices/portable_screen_timer.rsi
diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
index fac8b598da..8c59567576 100644
--- a/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
+++ b/Resources/Prototypes/Corvax/Recipes/Cooking/meat_recipes.yml
@@ -1,6 +1,6 @@
 - type: microwaveMealRecipe
   id: RecipePelmeni
-  name: pelmeni recipe
+  name: microwave-meal-Pelmeni-name
   result: FoodPelmeniBowl
   time: 10
   reagents:
@@ -12,7 +12,7 @@
 
 - type: microwaveMealRecipe
   id: RecipeBakedCorvaxVulpkanin
-  name: baked vulpkanin recipe
+  name: microwave-meal-Vulpkanin-name
   result: FoodBakedVulpkaninPlate
   time: 15
   reagents:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index df36137759..ee2f3c27ae 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -43,11 +43,10 @@
     - Radio
 
 - type: entity
-  parent: [ RadioHandheld, BaseSecurityContraband ]
+  parent: [ BaseCorvaxContraband433DepartmentsCommandSecurity, RadioHandheld, BaseSecurityContraband ] # Corvax-Contraband
   id: RadioHandheldSecurity
   name: security radio
   description: A handy security radio.
-  parent: [BaseCorvaxContraband433DepartmentsCommandSecurity, RadioHandheld, BaseSecurityContraband] # Corvax-Contraband
   components:
   - type: RadioMicrophone
     broadcastChannel: Security
diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/icon_open.png
deleted file mode 100644
index 576162576bd5746a85f83bbca1e42fa443af5a5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkPzez+vR9J=W*1t<zQ53-OZ-Q%Zk>Vx<hhpiA0f!C>iGP5E3{6~I
zYOzB>A2c|Kg4lF0gM(PYBSC5fTaltc*Px4wKc8sK6cjhnK`k1Da9s4Ew#&V0q$LL)
zhj-tP^SOt2AJ-)!JZHF{wR#0m0X!67#^Pee;^hYff)O!eaoJei0+2v3qP>=t0fAsd
z-hJo*;C9wUC;@I4zn;C5brH%P@V%}FU}<rhbaH~F#pyfas!^qKv%kr}@YXoz_lx_R
z3}t{)2Z|{Rvp<R9twAo1uy^v<J9z-c$7d*}EM<UF2X;%Bd`+e?|8nh>Wict2PYVE8
zc9(dcO#d-HS_PDp>#G9*8qNx=tl8MDZ2+u2;CH6J3bGk;9<NjUCI%BN<pJD8=gB_4
zY{n^G{o-YL0jcUb01k|H?c!PhyS0smvjV<shWVZ;x|fIflK9QZVO|TM^%3SgUbY+G
z5)Fr#1ES#&W8Y?<9^mi#2$n_d`5t=!zh<2r4Tm^=<53rgh|)3fV_u4LLvrkP$v|_j
zlY2gW7S(r&2riv%`S+g-&O_^~n*fX?`dsSMM-T9r@o(=5D}V~%zW`hTtTpFOB~Q)-
P00000NkvXXu0mjfWpd-z

diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-left.png
deleted file mode 100644
index 1e9f4ce4c0437dc816115d553cc1f606fda38773..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R4$
zr;B4q#hkaZY_nPdMBMD1%O<9IWGk;XJo`qmC1Lt4U7zWt8I#Q-T5^<ocQD7cEUDG}
zbXleGV0k*<BipwJj(>b`reUAXu@$<-j@%b27@``EF<)RZk!uiJ@R4B)LofRR)(jg4
zU5Cev8H}^evhUa;lYQH)O+dx7_WtU1uXRc{XU<w|KHcWdNuBu|wr}}2%2;_`iVjqb
z|6~62!qN4<p1-z6^UeKK86$Gw3*QWtl`BmCD$d*z9dgsJ>$3g)>72Kp?PoME-+pbf
z`dw504}U&o*;ZbPy}Z7mC;xA8PX53A3pgDk#qWU2y=L+UeqFs0xwC3VpCZfN*Kxl0
zy}9G&&z#3!aYz2lw!TF5zjNGAJTJVsb<HnrgO{H#xY+e~$In@3)i9+lFX1a=(0Se&
m|Jc?{yn3H;B}RapWtWNbyEAR|wkTkPFnGH9xvX<aXaWF&wz)<C

diff --git a/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/grapesoda.rsi/inhand-right.png
deleted file mode 100644
index af6cea1382ee7945ba4bf646b242b768adab91dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R4=
zr;B4q#hkaZ41<~-B;59wZuu+_wLCE+X`-`*rbPp*%mJtV1+DB2hi-XJJgIo;f<fk*
z!-|*IyIx9ROLaW!edvFbh8%xH+K=m%?@d$mG8m<}9k?$<Fhn&RW4gd(BGw?bU?am8
zhF;bMtQk5Cx(>!a7^df{i?}{~Y%xtGG<2!X={x(Qzp9-7Y<u0rH##=<w!Gr=Id<#w
z_o_?{T=X%kYzyNljgOD7`b;vpwI+JKFIPQljHK$S-@9d7qHfPt(fpytx}LH8^6zs_
zEU~uD%r$4kWkV%)Rkf{S+#ir6k$dgeY10QeC=N(wB<Mzvl354YGw#Y?IP&RjWj>#M
zWsT*niIviOncnE#@V<1lOr~}d3$MHC%i2#@N^V@AlxKD3G5^8CpF$@!wJkpAf1teh
zd(}RReS4XAGbpmK|Hyn-r&Y~9i{qAi@j0G<#u*qci0@PmTXH^9Egcw144$rjF6*2U
FngFm7w2uG)

diff --git a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
index d8bb87cd9e..42d5638b93 100644
--- a/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json
@@ -2,11 +2,11 @@
     "version": 1,
     "license": "CC-BY-SA-3.0",
     "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, station and syndicate pinpointer resprited by Ubaser, inhands by TiniestShark (github). xenoborg by Samuka-C (github). Modified by @whatston3 and @Quantum-cross (github) to center the sprite so arrow rotation is around the proper axis.",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/82303/commits/1b6801499eb39433e8ea855e6a081ad757fc6e08, station and xenoborg pinpointers by _Svist_. (Discord), inhands by TiniestShark (github).",
     "size": {
         "x": 32,
         "y": 32
     },
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/82303/commits/1b6801499eb39433e8ea855e6a081ad757fc6e08, station and xenoborg pinpointers by _Svist_. (Discord), inhands by TiniestShark (github).",
     "states": [
         {
             "name": "pinonclose",
diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index 5de4190a36..eb63955fe1 100644
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -29,16 +29,7 @@
             "name": "romos2"
         },
         {
-            "name": "scan_module",
-            "delays": [
-                [
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1,
-                    0.1
-                ]
-            ]
+            "name": "scan_module"
         }
     ]
 }

From 1979e66cdc0e1c82cd1434f506fe6e17f3ea3c21 Mon Sep 17 00:00:00 2001
From: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
Date: Mon, 5 Oct 2026 21:15:48 +0700
Subject: [PATCH 69/69] corvax_terminal update

---
 .../Maps/Corvax/Misc/corvax_terminal.yml      | 9141 +++++++++--------
 1 file changed, 4847 insertions(+), 4294 deletions(-)

diff --git a/Resources/Maps/Corvax/Misc/corvax_terminal.yml b/Resources/Maps/Corvax/Misc/corvax_terminal.yml
index 12a18c8308..27c4728621 100644
--- a/Resources/Maps/Corvax/Misc/corvax_terminal.yml
+++ b/Resources/Maps/Corvax/Misc/corvax_terminal.yml
@@ -1,10 +1,29 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Map
+  engineVersion: 292.0.0
+  forkId: ""
+  forkVersion: ""
+  time: 10/05/2026 14:13:51
+  entityCount: 1594
+maps:
+- 23
+grids:
+- 2
+orphans: []
+nullspace:
+- 1586
+- 1587
+- 1588
+- 1589
+- 1590
+- 1591
+- 1592
+- 1593
+- 1594
 tilemap:
   0: Space
   20: FloorArcadeBlue
-  21: FloorArcadeBlue2
   7: FloorAsteroidSand
   1: FloorAstroGrass
   24: FloorBlue
@@ -30,10 +49,8 @@ tilemap:
   15: FloorSteelCheckerDark
   19: FloorSteelHerringbone
   27: FloorSteelLime
-  18: FloorSteelMono
   12: FloorSteelOffset
-  104: FloorTechMaint
-  105: FloorTechMaint2
+  104: FloorTechMaint2
   9: FloorWoodChessDark
   6: FloorWoodDark
   8: FloorWoodLargeDark
@@ -48,1582 +65,78 @@ entities:
     - type: MetaData
       name: NT-EM Terminal
     - type: Transform
-      parent: invalid
+      parent: 23
     - type: MapGrid
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAwAAAAAACwAAAAAACwAAAAAACwAAAAAABAAAAAAADgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAACwAAAAAACwAAAAAACwAAAAAABAAAAAAADgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAACwAAAAAACwAAAAAACwAAAAAABAAAAAAADgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABAAAAAAACgAAAAAACgAAAAAABAAAAAAAHQAAAAAADAAAAAAADAAAAAAADQAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAQAAAAAABgAAAAAACAAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAQAAAAAABgAAAAAACAAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAAQAAAAAABgAAAAAACAAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAADQAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAADQAAAAAADQAAAAAADQAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAADQAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAQAAAAAABgAAAAAACAAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAABgAAAAAACAAAAAAABgAAAAAAeQAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAAAwAAAAAAAAsAAAAAAAALAAAAAAAACwAAAAAAAAQAAAAAAAAOAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAMAAAAAAAALAAAAAAAACwAAAAAAAAsAAAAAAAAEAAAAAAAADgAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAACwAAAAAAAAsAAAAAAAALAAAAAAAABAAAAAAAAA4AAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAeQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAABAAAAAAAAAoAAAAAAAAKAAAAAAAABAAAAAAAAB0AAAAAAAAMAAAAAAAADAAAAAAAAA0AAAAAAAANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAB5AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAAAYAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAABAAAAAAAABgAAAAAAAAgAAAAAAAAGAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAAQAAAAAAAAYAAAAAAAAIAAAAAAAABgAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAADQAAAAAAAAYAAAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADQAAAAAAAA0AAAAAAAANAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAANAAAAAAAABgAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAEAAAAAAAAGAAAAAAAACAAAAAAAAAYAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABEAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAB5AAAAAAAABgAAAAAAAAgAAAAAAAAGAAAAAAAAeQAAAAAAAA==
+          version: 7
         0,0:
           ind: 0,0
-          tiles: DwAAAAAADwAAAAAADwAAAAAADwAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAAAAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAAwAAAAAAAwAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAWQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAeQAAAAAADQAAAAAADQAAAAAADAAAAAAADAAAAAAAEgAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAeQAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALwAAAAAALwAAAAAAHQAAAAAAHQAAAAAAHQAAAAAALwAAAAAALwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAACAAAAAAACAAAAAAAHQAAAAAADgAAAAAAHQAAAAAACAAAAAAACAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAACAAAAAAACAAAAAAAHQAAAAAADgAAAAAAHQAAAAAACAAAAAAACAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAACAAAAAAACAAAAAAAHQAAAAAADgAAAAAAHQAAAAAACAAAAAAACAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAALwAAAAAALwAAAAAAHQAAAAAADgAAAAAAHQAAAAAALwAAAAAALwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: DwAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAHkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAWQAAAAAAAFkAAAAAAAAMAAAAAAAATAAAAAAAAAwAAAAAAAB5AAAAAAAAAAAAAAAAAA8AAAAAAAAPAAAAAAAADwAAAAAAAA8AAAAAAAB5AAAAAAAAWQAAAAAAAAwAAAAAAABMAAAAAAAADAAAAAAAAFkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAFkAAAAAAAAMAAAAAAAATAAAAAAAAAwAAAAAAABZAAAAAAAAWQAAAAAAAAwAAAAAAABMAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAABZAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAWQAAAAAAAFkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAB5AAAAAAAAeQAAAAAAAA0AAAAAAAANAAAAAAAADAAAAAAAAAwAAAAAAABZAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAeQAAAAAAAAAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAeQAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAAAAHkAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAALwAAAAAAAC8AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAvAAAAAAAALwAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAgAAAAAAAAIAAAAAAAAHQAAAAAAAA4AAAAAAAAdAAAAAAAACAAAAAAAAAgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAIAAAAAAAACAAAAAAAAB0AAAAAAAAOAAAAAAAAHQAAAAAAAAgAAAAAAAAIAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAACAAAAAAAAAgAAAAAAAAdAAAAAAAADgAAAAAAAB0AAAAAAAAIAAAAAAAACAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAC8AAAAAAAAvAAAAAAAAHQAAAAAAAA4AAAAAAAAdAAAAAAAALwAAAAAAAC8AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         0,-1:
           ind: 0,-1
-          tiles: BAAAAAAABAAAAAAABAAAAAAAAwAAAAAAeQAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAeQAAAAAAeQAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABAAAAAAABAAAAAAABAAAAAAAAwAAAAAAeQAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAEgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAAAAAAAAADQAAAAAADQAAAAAADAAAAAAADAAAAAAAEgAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAeQAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAWQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAAwAAAAAAAwAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAeQAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAAAAAAAAABQAAAAAABQAAAAAABQAAAAAABQAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAeQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAWQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAAAAAAAAACAAAAAAACAAAAAAACAAAAAAACAAAAAAAEgAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAeQAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAEgAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAEwAAAAAAeQAAAAAAeQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAeQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAWQAAAAAAWQAAAAAADAAAAAAADAAAAAAADAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAeQAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAEgAAAAAAEgAAAAAADAAAAAAATAAAAAAADAAAAAAAeQAAAAAAeQAAAAAA
-          version: 6
+          tiles: BAAAAAAAAAQAAAAAAAAEAAAAAAAAAwAAAAAAAHkAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAB5AAAAAAAAeQAAAAAAAAwAAAAAAAATAAAAAAAADAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAAMAAAAAAAB5AAAAAAAAFgAAAAAAABYAAAAAAAAWAAAAAAAAFgAAAAAAAHkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAB5AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAeQAAAAAAAHkAAAAAAABZAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAB5AAAAAAAAWQAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAABZAAAAAAAAWQAAAAAAAFkAAAAAAABZAAAAAAAAeQAAAAAAAAAAAAAAAAANAAAAAAAADQAAAAAAAAwAAAAAAAAMAAAAAAAAWQAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAAHkAAAAAAAAAAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAABZAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAWQAAAAAAAFkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAWQAAAAAAAAwAAAAAAABMAAAAAAAADAAAAAAAAFkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAAwAAAAAAAAMAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAAeQAAAAAAAFkAAAAAAAAMAAAAAAAATAAAAAAAAAwAAAAAAABZAAAAAAAAWQAAAAAAAAwAAAAAAABMAAAAAAAADAAAAAAAAHkAAAAAAAB5AAAAAAAABQAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAHkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAWQAAAAAAAFkAAAAAAAAMAAAAAAAATAAAAAAAAAwAAAAAAAB5AAAAAAAAAAAAAAAAAAUAAAAAAAAFAAAAAAAABQAAAAAAAAUAAAAAAAB5AAAAAAAAWQAAAAAAAAwAAAAAAABMAAAAAAAADAAAAAAAAFkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAeQAAAAAAAAAAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAeQAAAAAAAFkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABZAAAAAAAAWQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAAAAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAFkAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAB5AAAAAAAAAAAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAABZAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAEwAAAAAAABMAAAAAAAATAAAAAAAAeQAAAAAAAHkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAeQAAAAAAAFkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAABZAAAAAAAAWQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAHkAAAAAAABZAAAAAAAADAAAAAAAAEwAAAAAAAAMAAAAAAAAWQAAAAAAAFkAAAAAAAAMAAAAAAAATAAAAAAAAAwAAAAAAAB5AAAAAAAAeQAAAAAAAA==
+          version: 7
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAwAAAAAABgAAAAAACAAAAAAABgAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAeQAAAAAABgAAAAAACAAAAAAABgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEgAAAAAADAAAAAAADAAAAAAADQAAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAADAAAAAAAABgAAAAAAAAgAAAAAAAAGAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAARAAAAAAAAEQAAAAAAABEAAAAAAAARAAAAAAAAeQAAAAAAAAYAAAAAAAAIAAAAAAAABgAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAwAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAAB5AAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAWQAAAAAAAAwAAAAAAAAMAAAAAAAADQAAAAAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAHkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAMAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAYAAAAAAAAGAAAAAAAABgAAAAAAAAYAAAAAAAAGAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAaAAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAeQAAAAAAAA==
+          version: 7
         0,-2:
           ind: 0,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAGgAAAAAAHQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACQAAAAAACQAAAAAAHQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAACQAAAAAACQAAAAAAHQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAHQAAAAAAAwAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAADAAAAAAADAAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAACQAAAAAACQAAAAAAAwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAABAAAAAAAeQAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAeQAAAAAAJgAAAAAADAAAAAAAEwAAAAAADAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAAMAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAADAAAAAAAABMAAAAAAAAMAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAHQAAAAAAABoAAAAAAAAdAAAAAAAAAwAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAJgAAAAAAAAwAAAAAAAATAAAAAAAADAAAAAAAAAMAAAAAAAADAAAAAAAAAwAAAAAAAAkAAAAAAAAJAAAAAAAAHQAAAAAAAAMAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAACYAAAAAAAAMAAAAAAAAEwAAAAAAAAwAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAJAAAAAAAACQAAAAAAAB0AAAAAAAADAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAmAAAAAAAADAAAAAAAABMAAAAAAAAMAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAkAAAAAAAAdAAAAAAAAAwAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAAAAAJAAAAAAAAAwAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAACYAAAAAAAAMAAAAAAAAEwAAAAAAAAwAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAmAAAAAAAADAAAAAAAABMAAAAAAAAMAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAAAAABkAAAAAAAAZAAAAAAAABAAAAAAAAHkAAAAAAAAWAAAAAAAAFgAAAAAAABYAAAAAAAB5AAAAAAAAJgAAAAAAAAwAAAAAAAATAAAAAAAADAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         -1,-2:
           ind: -1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAHQAAAAAAGgAAAAAAHQAAAAAAGgAAAAAAHQAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAHQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAHQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAwAAAAAAHQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAwAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAADgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAABAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAABAAAAAAADgAAAAAABAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAeQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAB0AAAAAAAB5AAAAAAAAHQAAAAAAAHkAAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAAAB0AAAAAAAAaAAAAAAAAHQAAAAAAABoAAAAAAAAdAAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAMAAAAAAAAdAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAADAAAAAAAAHQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAwAAAAAAAB0AAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAHkAAAAAAAADAAAAAAAACQAAAAAAAAkAAAAAAAAJAAAAAAAACQAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAEAAAAAAAABAAAAAAAAAQAAAAAAAAEAAAAAAAABAAAAAAAAA4AAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAGgAAAAAAAB5AAAAAAAABAAAAAAAABkAAAAAAAAZAAAAAAAAGQAAAAAAAAQAAAAAAAAOAAAAAAAABAAAAAAAAA==
+          version: 7
         1,0:
           ind: 1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         1,-1:
           ind: 1,-1
-          tiles: eQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: eQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         -1,1:
           ind: -1,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAaAAAAAAAAGgAAAAAAABoAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAB5AAAAAAAAeQAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          version: 7
     - type: Broadphase
     - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
+      bodyStatus: InAir
+      angularDamping: 0.05
     - type: Fixtures
       fixtures: {}
     - type: BecomesStation
       id: Empty
     - type: OccluderTree
     - type: Shuttle
+      dampingModifier: 0.25
     - type: Gravity
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Arrows
-          decals:
-            648: 14,-9
-            649: 14,-2
-            650: 14,2
-            651: 14,-15
-            652: 14,-23
-            667: 3,4
-            668: 3,-11
-            669: 7,-11
-            670: 11,-11
-            671: 7,-4
-            672: 7,-3
-            673: 11,-3
-            674: 11,-4
-            675: 7,4
-            676: 11,4
-            681: -4,4
-            682: -4,-11
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: ArrowsGreyscale
-          decals:
-            677: -6,-4
-            678: -8,-4
-            679: 0,-4
-            680: 2,-4
-        - node:
-            color: '#9FED5895'
-            id: Bot
-          decals:
-            684: 2,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: BotGreyscale
-          decals:
-            683: -6,-19
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BotGreyscale
-          decals:
-            636: 7,-13
-            637: 6,-13
-            639: 8,-13
-        - node:
-            color: '#3EB38896'
-            id: BrickLineOverlayE
-          decals:
-            528: -9,-11
-        - node:
-            color: '#3EB38896'
-            id: BrickLineOverlayN
-          decals:
-            525: -8,-12
-            526: -7,-12
-        - node:
-            color: '#3EB38896'
-            id: BrickLineOverlayS
-          decals:
-            529: -8,-10
-            530: -7,-10
-        - node:
-            color: '#3EB38896'
-            id: BrickLineOverlayW
-          decals:
-            527: -6,-11
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkBox
-          decals:
-            47: -1,0
-            430: -5,-11
-            484: -2,-13
-            614: -3,6
-            615: -3,2
-            641: -3,-9
-            653: 11,-31
-            654: 11,-27
-            769: -5,0
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNe
-          decals:
-            77: 3,1
-            224: 13,3
-            225: 13,-5
-            226: 8,-5
-            227: 8,3
-            432: -6,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerNw
-          decals:
-            73: 0,1
-            220: 6,-5
-            221: 11,-5
-            222: 6,3
-            223: 11,3
-            431: -9,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSe
-          decals:
-            229: 8,-10
-            230: 13,-10
-            231: 13,-2
-            232: 8,-2
-            433: -6,-12
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkCornerSw
-          decals:
-            216: 6,-2
-            217: 11,-2
-            218: 6,-10
-            219: 11,-10
-            434: -9,-12
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkEndE
-          decals:
-            56: 3,-1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkEndN
-          decals:
-            604: 9,-17
-            605: 9,-21
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkEndS
-          decals:
-            602: 9,-23
-            603: 9,-19
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkEndW
-          decals:
-            51: 0,-1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNe
-          decals:
-            235: 6,-10
-            236: 11,-10
-            237: 6,-2
-            238: 11,-2
-            439: -6,-11
-            481: 1,4
-            522: 1,-11
-            596: 11,-21
-            597: 11,-16
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNe
-          decals:
-            389: 8,-5
-            390: 13,-5
-            391: 13,3
-            392: 8,3
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNw
-          decals:
-            84: 0,0
-            233: 8,-2
-            234: 13,-2
-            248: 8,-10
-            249: 13,-10
-            480: -2,4
-            521: -2,-11
-            594: 11,-16
-            595: 11,-21
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerNw
-          decals:
-            385: 6,-5
-            386: 11,-5
-            387: 6,3
-            388: 11,3
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSe
-          decals:
-            239: 6,3
-            240: 11,3
-            241: 11,-5
-            242: 6,-5
-            438: -6,-11
-            479: 1,4
-            523: 1,-11
-            600: 11,-19
-            601: 11,-24
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSe
-          decals:
-            393: 8,-2
-            394: 13,-2
-            395: 13,-10
-            396: 8,-10
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSw
-          decals:
-            86: 0,0
-            243: 8,-5
-            244: 13,-5
-            245: 8,3
-            246: 13,3
-            482: -2,4
-            524: -2,-11
-            598: 11,-24
-            599: 11,-19
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: BrickTileDarkInnerSw
-          decals:
-            397: 6,-10
-            398: 11,-10
-            399: 11,-2
-            400: 6,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineE
-          decals:
-            83: 3,0
-            88: -1,0
-            152: 6,-6
-            153: 6,-7
-            154: 6,-8
-            155: 6,-9
-            156: 8,-9
-            157: 8,-8
-            158: 8,-7
-            159: 8,-6
-            160: 13,-9
-            161: 13,-8
-            162: 13,-7
-            163: 13,-6
-            164: 13,-1
-            165: 13,0
-            166: 13,1
-            167: 13,2
-            168: 8,-1
-            169: 8,0
-            170: 8,1
-            171: 8,2
-            173: 6,2
-            174: 6,1
-            175: 6,0
-            176: 6,-1
-            177: 11,-1
-            178: 11,0
-            179: 11,2
-            182: 11,-6
-            183: 11,-7
-            184: 11,-8
-            185: 11,-9
-            198: 11,1
-            471: -3,4
-            515: -3,-11
-            580: 10,-24
-            581: 10,-23
-            582: 10,-22
-            583: 10,-21
-            584: 10,-19
-            585: 10,-19
-            586: 10,-18
-            587: 10,-17
-            588: 10,-17
-            589: 10,-16
-            608: 9,-18
-            609: 9,-22
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineN
-          decals:
-            59: 1,-1
-            60: 2,-1
-            78: 1,1
-            79: 2,1
-            89: 0,-1
-            90: 1,-1
-            91: 2,-1
-            92: 3,-1
-            109: 7,-10
-            111: 12,-10
-            112: 12,-2
-            113: 7,-2
-            114: 7,3
-            115: 12,3
-            117: 12,-5
-            118: 7,-5
-            259: 5,-5
-            260: 9,-5
-            261: 10,-5
-            262: 10,3
-            263: 9,3
-            264: 5,3
-            367: 5,-12
-            368: 6,-12
-            369: 7,-12
-            370: 8,-12
-            371: 9,-12
-            372: 10,-12
-            373: 11,-12
-            374: 12,-12
-            375: 13,-12
-            428: -8,-10
-            429: -7,-10
-            472: -2,3
-            473: -2,3
-            474: -1,3
-            475: 0,3
-            476: 0,3
-            477: 0,3
-            478: 1,3
-            517: -2,-12
-            518: -1,-12
-            519: 0,-12
-            520: 1,-12
-            592: 11,-25
-            593: 11,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineS
-          decals:
-            57: 1,-1
-            58: 2,-1
-            120: 7,-10
-            121: 12,-10
-            122: 12,-2
-            123: 7,-2
-            124: 7,3
-            125: 12,3
-            126: 12,-5
-            127: 7,-5
-            253: 5,-2
-            254: 9,-2
-            255: 10,-2
-            256: 9,-10
-            257: 10,-10
-            258: 5,-10
-            376: 13,5
-            377: 12,5
-            378: 10,5
-            379: 11,5
-            380: 9,5
-            381: 8,5
-            382: 7,5
-            383: 6,5
-            384: 5,5
-            436: -8,-12
-            437: -7,-12
-            466: -2,5
-            467: -1,5
-            468: -1,5
-            469: 0,5
-            470: 1,5
-            511: -2,-10
-            512: -1,-10
-            513: 0,-10
-            514: 1,-10
-            590: 11,-15
-            591: 11,-20
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileDarkLineW
-          decals:
-            128: 6,-9
-            129: 6,-8
-            130: 6,-7
-            131: 6,-6
-            132: 11,-9
-            133: 11,-8
-            134: 11,-7
-            135: 11,-6
-            136: 13,-9
-            137: 13,-8
-            138: 13,-7
-            139: 13,-6
-            140: 6,-1
-            141: 6,0
-            142: 6,1
-            143: 6,2
-            144: 8,-1
-            145: 8,0
-            146: 8,1
-            147: 8,2
-            148: 13,-1
-            149: 13,0
-            150: 13,1
-            151: 13,2
-            188: 8,-9
-            189: 8,-8
-            190: 8,-7
-            191: 8,-6
-            193: 11,-1
-            194: 11,0
-            195: 11,0
-            196: 11,1
-            197: 11,2
-            435: -9,-11
-            516: 2,-11
-            571: 12,-16
-            572: 12,-17
-            573: 12,-17
-            574: 12,-18
-            575: 12,-19
-            576: 12,-21
-            577: 12,-22
-            578: 12,-22
-            579: 12,-24
-            606: 9,-22
-            607: 9,-18
-            645: 12,-23
-            666: 2,4
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelBox
-          decals:
-            483: -5,-11
-            535: 11,-13
-            612: 4,4
-            613: 4,-11
-            640: -5,4
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelCornerNe
-          decals:
-            331: -2,13
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerNe
-          decals:
-            442: 3,5
-            504: 3,-10
-            553: 12,-14
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerNw
-          decals:
-            443: -4,5
-            505: -4,-10
-            552: 10,-14
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelCornerSe
-          decals:
-            339: -2,7
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerSe
-          decals:
-            441: 3,3
-            486: 3,-12
-            555: 12,-26
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelCornerSw
-          decals:
-            440: -4,3
-            485: -4,-12
-            554: 10,-26
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelEndN
-          decals:
-            610: 4,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelEndS
-          decals:
-            611: 4,-4
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelEndW
-          decals:
-            411: -6,7
-            412: -6,9
-            413: -6,11
-            414: -6,13
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerNe
-          decals:
-            426: -7,-11
-            445: -3,5
-            455: 3,4
-            457: 2,5
-            489: 3,-11
-            507: -3,-10
-            569: 11,-14
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelInnerNw
-          decals:
-            357: -4,11
-            358: -4,9
-            359: -4,7
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerNw
-          decals:
-            427: -8,-11
-            444: -3,5
-            447: -4,4
-            458: 2,5
-            487: -4,-11
-            506: -3,-10
-            568: 11,-14
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelInnerSe
-          decals:
-            361: -3,7
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerSe
-          decals:
-            424: -7,-11
-            456: 3,4
-            465: -3,3
-            490: 3,-11
-            510: -2,-12
-            566: 11,-26
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelInnerSw
-          decals:
-            340: -3,7
-            341: -4,9
-            342: -4,11
-            343: -4,13
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerSw
-          decals:
-            425: -8,-11
-            446: -4,4
-            464: -3,3
-            488: -4,-11
-            509: -2,-12
-            567: 11,-26
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelLineE
-          decals:
-            332: -2,12
-            333: -2,11
-            334: -2,10
-            335: -2,9
-            336: -2,9
-            337: -2,8
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelLineE
-          decals:
-            418: -9,-11
-            556: 12,-25
-            557: 12,-24
-            558: 12,-22
-            559: 12,-22
-            560: 12,-21
-            561: 12,-20
-            562: 12,-19
-            563: 12,-18
-            564: 12,-17
-            565: 12,-16
-            646: 12,-23
-            647: 12,-15
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelLineN
-          decals:
-            323: -6,13
-            324: -5,13
-            325: -4,13
-            326: -3,13
-            348: -6,7
-            349: -5,7
-            350: -6,9
-            351: -5,9
-            352: -6,11
-            353: -5,11
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelLineN
-          decals:
-            422: -8,-12
-            423: -7,-12
-            459: -2,5
-            460: -1,5
-            461: -1,5
-            462: 0,5
-            463: 1,5
-            497: -2,-10
-            498: -1,-10
-            499: 0,-10
-            500: 0,-10
-            501: 1,-10
-            502: 1,-10
-            503: 2,-10
-            508: -2,-13
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelLineS
-          decals:
-            314: -6,7
-            315: -5,7
-            316: -4,7
-            317: -6,9
-            318: -5,9
-            319: -6,11
-            320: -5,11
-            321: -6,13
-            322: -5,13
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelLineS
-          decals:
-            419: -8,-10
-            420: -7,-10
-            448: -2,3
-            449: -1,3
-            450: 0,3
-            451: 0,3
-            452: 1,3
-            453: 2,3
-            454: 2,3
-            491: -1,-12
-            492: 0,-12
-            493: 1,-12
-            494: 1,-12
-            495: 2,-12
-            496: -3,-12
-            570: 11,-13
-        - node:
-            color: '#00FFFFFF'
-            id: BrickTileSteelLineW
-          decals:
-            345: -4,10
-            346: -4,8
-            355: -4,12
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelLineW
-          decals:
-            421: -6,-11
-            536: 10,-23
-            537: 10,-24
-            538: 10,-24
-            539: 10,-25
-            540: 10,-23
-            541: 10,-22
-            542: 10,-21
-            543: 10,-21
-            544: 10,-20
-            545: 10,-19
-            546: 10,-18
-            547: 10,-18
-            548: 10,-17
-            549: 10,-16
-            550: 10,-16
-            551: 10,-15
-        - node:
-            color: '#FFFFFFFF'
-            id: Bushh3
-          decals:
-            282: -5.001849,-7.7211533
-        - node:
-            color: '#FFFFFFFF'
-            id: Bushk1
-          decals:
-            284: -4.954974,-6.7836533
-        - node:
-            color: '#FFFFFFFF'
-            id: Bushk2
-          decals:
-            285: -1.0018489,-7.1586533
-        - node:
-            color: '#FFFFFFFF'
-            id: Bushm4
-          decals:
-            286: -1.0330989,-5.9242783
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: Caution
-          decals:
-            661: 13.595629,2.003996
-            662: 13.595629,-2.0041823
-            663: 13.600033,-9.000203
-            664: 13.600033,-15.003099
-            665: 13.600033,-23.005238
-        - node:
-            color: '#9FED585D'
-            id: CheckerNESW
-          decals:
-            745: 3,-22
-            746: 3,-21
-        - node:
-            color: '#FFFFFFFF'
-            id: CheckerNWSE
-          decals:
-            747: -7,-22
-            748: -7,-21
-        - node:
-            color: '#422E23FF'
-            id: ConcreteTrimCornerNe
-          decals:
-            292: -4,-4
-        - node:
-            color: '#422E23FF'
-            id: ConcreteTrimCornerSe
-          decals:
-            293: -3,-3
-        - node:
-            color: '#422E23FF'
-            id: ConcreteTrimCornerSw
-          decals:
-            291: -2,-4
-        - node:
-            color: '#422E23FF'
-            id: ConcreteTrimInnerNw
-          decals:
-            295: -3,-4
-        - node:
-            color: '#422E23FF'
-            id: ConcreteTrimInnerSe
-          decals:
-            294: -3,-4
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: DeliveryGreyscale
-          decals:
-            638: 5,-13
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            804: -9,-17
-            805: -9,-16
-            806: -9,-17
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtHeavy
-          decals:
-            802: -9,-17
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtHeavyMonotile
-          decals:
-            803: -9,-16
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: FlowersBROne
-          decals:
-            405: 6.8216906,10.010503
-        - node:
-            color: '#FFFFFFFF'
-            id: FlowersBRThree
-          decals:
-            24: -0.9850607,-1.9918964
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: FlowersBRThree
-          decals:
-            406: 11.132726,9.995637
-            408: 5.9594836,5.9358044
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: FlowersBRTwo
-          decals:
-            407: 12.128723,5.903023
-        - node:
-            color: '#FFFFFFFF'
-            id: Flowersbr1
-          decals:
-            274: -4.986224,-6.3617783
-        - node:
-            color: '#FFFFFFFF'
-            id: Flowerspv1
-          decals:
-            23: -5.0475607,-1.9762714
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowerspv1
-          decals:
-            416: 11.146828,5.949858
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowerspv2
-          decals:
-            409: 6.47978,5.9506707
-            415: 12.12796,10.008332
-            417: 11.205407,9.958935
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowerspv3
-          decals:
-            410: 6.34599,10.052931
-        - node:
-            color: '#FFFFFFFF'
-            id: Flowersy1
-          decals:
-            279: -0.98622394,-6.4242783
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowersy1
-          decals:
-            401: 5.9743495,10.0997
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowersy2
-          decals:
-            402: 11.786814,10.02537
-        - node:
-            color: '#FFFFFFFF'
-            id: Flowersy3
-          decals:
-            278: -0.98622394,-7.9711533
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowersy3
-          decals:
-            403: 6.9257503,5.937163
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: Flowersy4
-          decals:
-            404: 11.311113,5.9074306
-        - node:
-            color: '#FFFFFFFF'
-            id: Grassc1
-          decals:
-            21: -5.0006857,-1.9450214
-            273: -5.017474,-7.9711533
-            276: -1.0330989,-6.1274033
-        - node:
-            color: '#FFFFFFFF'
-            id: Grassd1
-          decals:
-            271: -5.001849,-6.1742783
-        - node:
-            color: '#FFFFFFFF'
-            id: Grassd2
-          decals:
-            277: -1.0174739,-7.9242783
-            643: 6.818325,5.9747634
-        - node:
-            color: '#FFFFFFFF'
-            id: Grassd3
-          decals:
-            20: -5.0319357,-1.9450214
-            272: -5.017474,-6.9711533
-            275: -1.0487239,-7.0649033
-            642: 6.08395,6.0060134
-            644: 11.4277,6.0685134
-        - node:
-            color: '#FFFFFFFF'
-            id: Grasse3
-          decals:
-            22: -1.0163107,-1.9293964
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimInnerNe
-          decals:
-            1: -6,-3
-            5: -2,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimInnerNw
-          decals:
-            3: -4,-3
-            4: 0,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimInnerSe
-          decals:
-            35: -2,-1
-            46: -6,-5
-            201: -6,-5
-            778: -2,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimInnerSw
-          decals:
-            9: 0,-1
-            32: -4,-1
-            49: -4,-5
-            50: 0,-5
-            61: 0,-1
-            68: 0,-1
-            202: 0,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimLineE
-          decals:
-            8: -2,-2
-            43: -2,-8
-            44: -2,-7
-            45: -2,-6
-            94: -6,-6
-            95: -6,-7
-            106: -2,-8
-            251: -6,-8
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimLineN
-          decals:
-            2: -5,-3
-            6: -1,-3
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimLineS
-          decals:
-            48: -5,-5
-            52: -1,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: GrayConcreteTrimLineW
-          decals:
-            0: -4,-2
-            7: 0,-2
-            53: -4,-6
-            54: -4,-7
-            55: -4,-8
-            96: 0,-6
-            97: 0,-7
-            98: 0,-8
-            107: -4,-8
-            228: 0,-8
-            269: 0,-2
-        - node:
-            color: '#639137FF'
-            id: MiniTileBoxOverlay
-          decals:
-            618: 3,-15
-            619: 3,-16
-        - node:
-            color: '#FFFFFFA4'
-            id: MiniTileBoxOverlay
-          decals:
-            616: -7,-16
-            617: -7,-15
-        - node:
-            color: '#FFFFFF5D'
-            id: MiniTileCornerOverlaySE
-          decals:
-            632: -3,-18
-        - node:
-            color: '#639137FF'
-            id: MiniTileCornerOverlaySW
-          decals:
-            623: -1,-18
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkEndE
-          decals:
-            685: 2,-17
-            687: -4,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkEndW
-          decals:
-            686: -6,-17
-            688: 0,-17
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineE
-          decals:
-            689: -1,-17
-            690: -1,-16
-            691: -1,-15
-            724: -3,-16
-            730: -7,-17
-            743: -1,-14
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineN
-          decals:
-            741: -5,-17
-            742: 1,-17
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineN
-          decals:
-            780: -9,1
-            781: -8,1
-            782: -7,1
-            783: -6,1
-            784: -6,0
-            785: -7,0
-            786: -8,0
-            787: -9,0
-            788: -9,0
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineS
-          decals:
-            739: -5,-17
-            740: 1,-17
-        - node:
-            zIndex: 1
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineS
-          decals:
-            789: -9,0
-            790: -8,0
-            791: -7,0
-            792: -6,0
-            793: -6,0
-            794: -6,-1
-            795: -8,-1
-            796: -9,-1
-            797: -7,-1
-        - node:
-            color: '#FFFFFFFF'
-            id: MiniTileDarkLineW
-          decals:
-            697: -3,-17
-            698: -3,-16
-            699: -3,-15
-            717: -1,-16
-            732: 3,-17
-            744: -3,-14
-        - node:
-            color: '#3EB38896'
-            id: MiniTileInnerOverlayNE
-          decals:
-            532: -7,-11
-        - node:
-            color: '#3EB38896'
-            id: MiniTileInnerOverlayNW
-          decals:
-            531: -8,-11
-        - node:
-            color: '#3EB38896'
-            id: MiniTileInnerOverlaySE
-          decals:
-            534: -7,-11
-        - node:
-            color: '#3EB38896'
-            id: MiniTileInnerOverlaySW
-          decals:
-            533: -8,-11
-        - node:
-            color: '#FFFFFF5D'
-            id: MiniTileLineOverlayE
-          decals:
-            633: -3,-17
-            634: -3,-15
-            635: -3,-14
-        - node:
-            color: '#639137FF'
-            id: MiniTileLineOverlayS
-          decals:
-            624: 0,-18
-            625: 1,-18
-            626: 2,-18
-            627: 3,-18
-        - node:
-            color: '#FFFFFF5D'
-            id: MiniTileLineOverlayS
-          decals:
-            628: -7,-18
-            629: -6,-18
-            630: -5,-18
-            631: -4,-18
-        - node:
-            color: '#639137FF'
-            id: MiniTileLineOverlayW
-          decals:
-            620: -1,-14
-            621: -1,-15
-            622: -1,-17
-        - node:
-            zIndex: 1
-            color: '#5C473CFF'
-            id: OldConcreteTrimCornerNw
-          decals:
-            777: -3,-5
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineE
-          decals:
-            655: 11,-30
-            656: 11,-29
-            657: 11,-28
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineN
-          decals:
-            759: 15,-23
-            760: 16,-23
-            761: 15,-15
-            762: 16,-15
-            763: 15,-9
-            764: 16,-9
-            765: 15,-2
-            766: 16,-2
-            767: 15,2
-            768: 16,2
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            658: 11,-30
-            659: 11,-29
-            660: 11,-28
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            749: 15,2
-            750: 16,2
-            751: 15,-2
-            752: 16,-2
-            753: 15,-9
-            754: 16,-9
-            755: 15,-15
-            756: 16,-15
-            757: 15,-23
-            758: 16,-23
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinCornerNeWhite
-          decals:
-            25: -2,1
-            280: -4,-5
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinCornerNeWhite
-          decals:
-            302: 7,9
-            303: 12,9
-            725: 1,-19
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinCornerNwWhite
-          decals:
-            26: -4,1
-        - node:
-            color: '#463126FF'
-            id: WoodTrimThinCornerNwWhite
-          decals:
-            770: -2,-5
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinCornerNwWhite
-          decals:
-            304: 6,9
-            305: 11,9
-            726: -5,-19
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinCornerNwWhite
-          decals:
-            338: 5,-15
-        - node:
-            color: '#281E18FF'
-            id: WoodTrimThinCornerSeWhite
-          decals:
-            212: 3,-8
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinCornerSeWhite
-          decals:
-            172: 3,-5
-            281: -4,-3
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinCornerSeWhite
-          decals:
-            306: 12,7
-            307: 7,7
-            727: 1,-22
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinCornerSeWhite
-          decals:
-            344: 8,-15
-            347: 7,-17
-        - node:
-            color: '#281E18FF'
-            id: WoodTrimThinCornerSwWhite
-          decals:
-            207: -9,-8
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinCornerSwWhite
-          decals:
-            192: -9,-5
-            283: -2,-3
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinCornerSwWhite
-          decals:
-            308: 6,7
-            309: 11,7
-            728: -5,-22
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinCornerSwWhite
-          decals:
-            354: 5,-17
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinInnerNeWhite
-          decals:
-            13: -6,-3
-            14: -2,-3
-            27: -3,1
-            38: -2,0
-            42: 3,-3
-            299: -3,-3
-            300: -2,-4
-        - node:
-            zIndex: 1
-            color: '#463126FF'
-            id: WoodTrimThinInnerNeWhite
-          decals:
-            776: -4,-5
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinInnerNeWhite
-          decals:
-            729: -5,-22
-            731: 1,-19
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinInnerNwWhite
-          decals:
-            11: -4,-3
-            15: 0,-3
-            28: -3,1
-            29: -4,0
-            39: -9,-3
-            297: -3,-3
-            298: -4,-4
-        - node:
-            zIndex: 1
-            color: '#463126FF'
-            id: WoodTrimThinInnerNwWhite
-          decals:
-            775: -2,-5
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinInnerNwWhite
-          decals:
-            733: 1,-22
-            734: -5,-19
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinInnerNwWhite
-          decals:
-            366: 6,-15
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinInnerSeWhite
-          decals:
-            36: -2,0
-            37: -2,-1
-            41: 3,-4
-            69: -6,-5
-            119: -3,-8
-            204: -6,-5
-            301: -2,-4
-        - node:
-            zIndex: 1
-            color: '#463126FF'
-            id: WoodTrimThinInnerSeWhite
-          decals:
-            772: -3,-5
-            773: -4,-3
-            779: -2,-5
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinInnerSeWhite
-          decals:
-            735: -5,-19
-            736: 1,-22
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinInnerSeWhite
-          decals:
-            365: 7,-15
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinInnerSwWhite
-          decals:
-            19: 0,-1
-            30: -4,0
-            33: -4,-1
-            40: -9,-4
-            70: 0,-1
-            72: -4,-5
-            87: 0,-5
-            116: -3,-8
-            203: 0,-5
-            296: -4,-4
-        - node:
-            zIndex: 1
-            color: '#463126FF'
-            id: WoodTrimThinInnerSwWhite
-          decals:
-            771: -3,-5
-            774: -2,-3
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinInnerSwWhite
-          decals:
-            737: 1,-19
-            738: -5,-22
-        - node:
-            color: '#281E18FF'
-            id: WoodTrimThinLineEWhite
-          decals:
-            213: 3,-7
-            214: 3,-6
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinLineEWhite
-          decals:
-            17: -2,-2
-            34: -2,-1
-            66: 3,-2
-            67: 3,-5
-            80: -2,-8
-            81: -2,-7
-            82: -2,-6
-            99: -6,-6
-            100: -6,-7
-            108: -2,-8
-            252: -6,-8
-            289: -5,-4
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinLineEWhite
-          decals:
-            310: 12,8
-            311: 7,8
-            720: -5,-21
-            721: -5,-20
-            722: 1,-21
-            723: 1,-20
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinLineEWhite
-          decals:
-            362: 7,-16
-            364: 8,-14
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinLineNWhite
-          decals:
-            10: -5,-3
-            16: -1,-3
-            287: -3,-6
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinLineNWhite
-          decals:
-            705: -4,-22
-            706: -3,-22
-            707: -2,-22
-            708: -1,-22
-            709: 0,-22
-            710: 0,-19
-            711: -1,-19
-            712: -2,-19
-            713: -3,-19
-            714: -4,-19
-        - node:
-            color: '#281E18FF'
-            id: WoodTrimThinLineSWhite
-          decals:
-            208: -8,-8
-            209: -7,-8
-            210: 1,-8
-            211: 2,-8
-            215: 0,-8
-            250: -6,-8
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinLineSWhite
-          decals:
-            62: 0,-1
-            63: 1,-1
-            64: 2,-1
-            65: 3,-1
-            71: -5,-5
-            85: -1,-5
-            102: -4,-8
-            105: -2,-8
-            180: 2,-5
-            181: 1,-5
-            186: -8,-5
-            187: -7,-5
-            199: 0,-5
-            200: -6,-5
-            265: 0,-2
-            266: 1,-2
-            267: 2,-2
-            268: 3,-2
-            290: -3,-2
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinLineSWhite
-          decals:
-            692: -4,-22
-            693: -3,-22
-            694: -2,-22
-            695: -1,-22
-            696: 0,-22
-            700: -4,-19
-            701: -3,-19
-            702: -2,-19
-            703: -1,-19
-            704: 0,-19
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinLineSWhite
-          decals:
-            327: 5,-13
-            328: 6,-13
-            329: 7,-13
-            330: 8,-13
-            363: 6,-17
-        - node:
-            color: '#281E18FF'
-            id: WoodTrimThinLineWWhite
-          decals:
-            205: -9,-6
-            206: -9,-7
-        - node:
-            color: '#422E23FF'
-            id: WoodTrimThinLineWWhite
-          decals:
-            12: -4,-2
-            18: 0,-2
-            31: -4,-1
-            74: -4,-6
-            75: -4,-7
-            76: -4,-8
-            93: -1,0
-            101: 0,-6
-            103: 0,-7
-            104: 0,-8
-            110: -4,-8
-            247: 0,-8
-            270: 0,-2
-            288: -1,-4
-        - node:
-            color: '#4B362BFF'
-            id: WoodTrimThinLineWWhite
-          decals:
-            312: 6,8
-            313: 11,8
-            715: 1,-21
-            716: 1,-20
-            718: -5,-21
-            719: -5,-20
-        - node:
-            color: '#DE3A3A41'
-            id: WoodTrimThinLineWWhite
-          decals:
-            356: 5,-16
-            360: 6,-14
-        - node:
-            cleanable: True
-            color: '#57121292'
-            id: splatter
-          decals:
-            800: -9.013203,-16.087303
-            801: -9.060078,-16.212303
-        - node:
-            cleanable: True
-            color: '#9B000066'
-            id: splatter
-          decals:
-            798: -9.075703,-16.024803
-            799: -8.825703,-16.196678
     - type: GridAtmosphere
       version: 2
       data:
+        uniqueMixes:
+        - volume: 2500
+          moles: {}
+          immutable: True
+        - temperature: 293.15
+          volume: 2500
+          moles:
+            Oxygen: 21.824879
+            Nitrogen: 82.10312
         tiles:
           -3,-3:
             0: 8192
@@ -1774,37 +287,6 @@ entities:
             1: 61160
           -2,-7:
             1: 34816
-        uniqueMixes:
-        - volume: 2500
-          immutable: True
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1813,14 +295,42 @@ entities:
     - type: NavMap
     - type: RestrictedRange
       range: 48
+    - type: GridSplitNode
+    - type: ChunkContainer
+      chunkEntities:
+      - 1586
+      - 1587
+      - 1588
+      - 1589
+      - 1590
+      - 1591
+      - 1592
+      - 1593
+      - 1594
+    - type: TileHistory
+      chunkHistory: {}
+    - type: ImplicitRoof
+    - type: ExplosionAirtightGrid
+  - uid: 23
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: GridTree
+    - type: Broadphase
+    - type: ChunkContainer
+      chunkEntities: []
+    - type: OccluderTree
 - proto: AirAlarm
   entities:
   - uid: 3
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-12.5
-      parent: 2
     - type: DeviceList
       devices:
       - 894
@@ -1832,14 +342,14 @@ entities:
   - uid: 4
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-15.5
-      parent: 2
   - uid: 5
     components:
     - type: Transform
-      pos: 0.5,-12.5
       parent: 2
+      pos: 0.5,-12.5
     - type: DeviceList
       devices:
       - 882
@@ -1852,8 +362,8 @@ entities:
   - uid: 6
     components:
     - type: Transform
-      pos: -3.5,6.5
       parent: 2
+      pos: -3.5,6.5
     - type: DeviceList
       devices:
       - 591
@@ -1871,9 +381,9 @@ entities:
   - uid: 7
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 14.5,-6.5
-      parent: 2
     - type: DeviceList
       devices:
       - 867
@@ -1892,9 +402,9 @@ entities:
   - uid: 8
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -6.5,-12.5
-      parent: 2
     - type: DeviceList
       devices:
       - 889
@@ -1903,9 +413,9 @@ entities:
   - uid: 9
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,1.5
-      parent: 2
     - type: DeviceList
       devices:
       - 893
@@ -1930,284 +440,213 @@ entities:
   - uid: 10
     components:
     - type: Transform
-      pos: 4.5,-3.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
   - uid: 11
     components:
     - type: Transform
-      pos: 4.5,-2.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
   - uid: 12
     components:
     - type: Transform
-      pos: 4.5,-10.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
   - uid: 13
     components:
     - type: Transform
-      pos: 4.5,4.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,4.5
   - uid: 14
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,0.5
-      parent: 2
   - uid: 15
     components:
     - type: Transform
-      pos: -4.5,13.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,13.5
     missingComponents:
     - AccessReader
   - uid: 16
     components:
     - type: Transform
-      pos: -4.5,9.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,9.5
     missingComponents:
     - AccessReader
   - uid: 17
     components:
     - type: Transform
-      pos: -4.5,7.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,7.5
     missingComponents:
     - AccessReader
   - uid: 18
     components:
     - type: Transform
-      pos: -4.5,11.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,11.5
     missingComponents:
     - AccessReader
   - uid: 19
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,6.5
       parent: 2
+      pos: -2.5,6.5
 - proto: AirlockAtmosphericsLocked
   entities:
   - uid: 20
     components:
     - type: Transform
-      pos: -4.5,-10.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-10.5
 - proto: AirlockBarGlassLocked
   entities:
   - uid: 21
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
       parent: 2
+      rot: 4.71238898038469 rad
+      pos: -0.5,0.5
 - proto: AirlockEngineeringLocked
   entities:
   - uid: 22
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,4.5
-      parent: 2
-- proto: AirlockExternal
+- proto: AirlockExternalGlass
   entities:
-  - uid: 23
-    components:
-    - type: Transform
-      pos: 15.5,-14.5
-      parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        916:
-        - DoorStatus: InputA
   - uid: 24
     components:
     - type: Transform
-      pos: 15.5,2.5
       parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        918:
-        - DoorStatus: InputB
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-14.5
   - uid: 25
     components:
     - type: Transform
-      pos: 15.5,-22.5
       parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        915:
-        - DoorStatus: InputA
+      rot: -1.5707963267948966 rad
+      pos: 15.5,2.5
   - uid: 26
     components:
     - type: Transform
-      pos: 15.5,-1.5
       parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        919:
-        - DoorStatus: InputB
+      rot: 1.5707963267948966 rad
+      pos: 14.5,-22.5
   - uid: 27
     components:
     - type: Transform
-      pos: 15.5,-8.5
       parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        920:
-        - DoorStatus: InputA
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-8.5
   - uid: 28
     components:
     - type: Transform
-      pos: 11.5,-26.5
       parent: 2
-    - type: DoorBolt
-      boltsDown: True
-    - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        917:
-        - DoorStatus: InputA
+      rot: -1.5707963267948966 rad
+      pos: 15.5,-1.5
+  - uid: 1585
+    components:
+    - type: Transform
+      parent: 2
+      rot: 3.141592653589793 rad
+      pos: 11.5,-28.5
 - proto: AirlockExternalShuttleLocked
   entities:
   - uid: 29
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,2.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        918:
-        - DockStatus: InputA
-        1575:
-        - DockStatus: Trigger
   - uid: 30
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-22.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        915:
-        - DockStatus: InputB
-        1576:
-        - DockStatus: Trigger
   - uid: 31
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-14.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        916:
-        - DockStatus: InputB
-        1224:
-        - DockStatus: Trigger
   - uid: 32
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-8.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        920:
-        - DockStatus: InputB
-        1226:
-        - DockStatus: Trigger
   - uid: 33
     components:
     - type: Transform
-      pos: 11.5,-30.5
       parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        917:
-        - DockStatus: InputB
+      pos: 11.5,-30.5
   - uid: 34
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 16.5,-1.5
-      parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        919:
-        - DockStatus: InputA
-        1225:
-        - DockStatus: Trigger
 - proto: AirlockGlass
   entities:
   - uid: 35
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,2.5
       parent: 2
+      pos: -2.5,2.5
   - uid: 36
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-12.5
       parent: 2
+      pos: 11.5,-12.5
   - uid: 37
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-12.5
       parent: 2
+      pos: -1.5,-12.5
   - uid: 38
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-8.5
-      parent: 2
 - proto: AirlockMaint
   entities:
   - uid: 39
     components:
     - type: Transform
-      pos: -2.5,14.5
       parent: 2
+      pos: -2.5,14.5
 - proto: AirlockSecurityGlassLocked
   entities:
   - uid: 40
     components:
     - type: Transform
-      pos: 8.5,-13.5
       parent: 2
+      pos: 8.5,-13.5
 - proto: AirSensor
   entities:
   - uid: 41
     components:
     - type: Transform
-      pos: -2.5,-3.5
       parent: 2
+      pos: -2.5,-3.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -2216,119 +655,119 @@ entities:
   - uid: 42
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-16.5
-      parent: 2
 - proto: APCBasic
   entities:
   - uid: 43
     components:
     - type: Transform
-      pos: -0.5,6.5
       parent: 2
+      pos: -0.5,6.5
   - uid: 44
     components:
     - type: Transform
-      pos: 1.5,-12.5
       parent: 2
+      pos: 1.5,-12.5
   - uid: 45
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 4.5,-4.5
-      parent: 2
   - uid: 46
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-14.5
-      parent: 2
   - uid: 47
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 14.5,-2.5
-      parent: 2
 - proto: ArrivalsShuttleTimer
   entities:
   - uid: 48
     components:
     - type: Transform
-      pos: 13.5,-21.5
       parent: 2
+      pos: 13.5,-21.5
   - uid: 49
     components:
     - type: Transform
-      pos: 14.5,-0.5
       parent: 2
+      pos: 14.5,-0.5
   - uid: 50
     components:
     - type: Transform
-      pos: 14.5,3.5
       parent: 2
+      pos: 14.5,3.5
   - uid: 51
     components:
     - type: Transform
-      pos: 13.5,-13.5
       parent: 2
+      pos: 13.5,-13.5
   - uid: 52
     components:
     - type: Transform
-      pos: 14.5,-7.5
       parent: 2
+      pos: 14.5,-7.5
 - proto: Ash
   entities:
   - uid: 53
     components:
     - type: Transform
-      pos: -1.54991,12.886424
       parent: 2
+      pos: -1.54991,12.886424
 - proto: Ashtray
   entities:
   - uid: 54
     components:
     - type: Transform
-      pos: -1.596785,12.459861
       parent: 2
+      pos: -1.596785,12.459861
 - proto: AtmosDeviceFanTiny
   entities:
   - uid: 55
     components:
     - type: Transform
-      pos: 16.5,2.5
       parent: 2
+      pos: 16.5,2.5
   - uid: 56
     components:
     - type: Transform
-      pos: 16.5,-8.5
       parent: 2
+      pos: 16.5,-8.5
   - uid: 57
     components:
     - type: Transform
-      pos: 16.5,-14.5
       parent: 2
+      pos: 16.5,-14.5
   - uid: 58
     components:
     - type: Transform
-      pos: 16.5,-1.5
       parent: 2
+      pos: 16.5,-1.5
   - uid: 59
     components:
     - type: Transform
-      pos: 16.5,-22.5
       parent: 2
+      pos: 16.5,-22.5
   - uid: 60
     components:
     - type: Transform
-      pos: 11.5,-30.5
       parent: 2
+      pos: 11.5,-30.5
 - proto: BarSign
   entities:
   - uid: 61
     components:
     - type: Transform
-      pos: 2.5,2.5
       parent: 2
+      pos: 2.5,2.5
 - proto: BaseComputer
   entities:
   - uid: 62
@@ -2336,177 +775,177 @@ entities:
     - type: MetaData
       name: касса
     - type: Transform
-      pos: -1.5,-19.5
       parent: 2
+      pos: -1.5,-19.5
 - proto: BenchRedComfy
   entities:
   - uid: 63
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-6.5
-      parent: 2
   - uid: 64
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-5.5
-      parent: 2
   - uid: 65
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,1.5
-      parent: 2
   - uid: 66
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,2.5
-      parent: 2
   - uid: 67
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-8.5
-      parent: 2
   - uid: 68
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-6.5
-      parent: 2
   - uid: 69
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-0.5
-      parent: 2
   - uid: 70
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-7.5
-      parent: 2
   - uid: 71
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,1.5
-      parent: 2
   - uid: 72
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-8.5
-      parent: 2
   - uid: 73
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-7.5
-      parent: 2
   - uid: 74
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-0.5
-      parent: 2
   - uid: 75
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,2.5
-      parent: 2
   - uid: 76
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,0.5
-      parent: 2
   - uid: 77
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,2.5
-      parent: 2
   - uid: 78
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-6.5
-      parent: 2
   - uid: 79
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,1.5
-      parent: 2
   - uid: 80
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-0.5
-      parent: 2
   - uid: 81
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,0.5
-      parent: 2
   - uid: 82
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-5.5
-      parent: 2
   - uid: 83
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-7.5
-      parent: 2
   - uid: 84
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-5.5
-      parent: 2
   - uid: 85
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-8.5
-      parent: 2
   - uid: 86
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,0.5
-      parent: 2
 - proto: BlockGameArcade
   entities:
   - uid: 87
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-0.5
-      parent: 2
 - proto: BookRandomStory
   entities:
   - uid: 88
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.68713,-1.3668416
-      parent: 2
 - proto: BoozeDispenser
   entities:
   - uid: 89
     components:
     - type: Transform
-      pos: 1.5,1.5
       parent: 2
+      pos: 1.5,1.5
 - proto: BowImprovised
   entities:
   - uid: 91
@@ -2521,1712 +960,3864 @@ entities:
   - uid: 97
     components:
     - type: Transform
-      pos: 11.5,-27.5
       parent: 2
+      pos: 11.5,-27.5
   - uid: 98
     components:
     - type: Transform
-      pos: 11.5,-26.5
       parent: 2
+      pos: 11.5,-26.5
   - uid: 99
     components:
     - type: Transform
-      pos: -2.5,-2.5
       parent: 2
+      pos: -2.5,-2.5
   - uid: 100
     components:
     - type: Transform
-      pos: -0.5,-15.5
       parent: 2
+      pos: -0.5,-15.5
   - uid: 101
     components:
     - type: Transform
-      pos: 11.5,-25.5
       parent: 2
+      pos: 11.5,-25.5
   - uid: 102
     components:
     - type: Transform
-      pos: 0.5,-15.5
       parent: 2
+      pos: 0.5,-15.5
   - uid: 103
     components:
     - type: Transform
-      pos: 13.5,-22.5
       parent: 2
+      pos: 13.5,-22.5
   - uid: 104
     components:
     - type: Transform
-      pos: 13.5,-2.5
       parent: 2
+      pos: 13.5,-2.5
   - uid: 105
     components:
     - type: Transform
-      pos: 14.5,-2.5
       parent: 2
+      pos: 14.5,-2.5
   - uid: 106
     components:
     - type: Transform
-      pos: -1.5,-15.5
       parent: 2
+      pos: -1.5,-15.5
   - uid: 107
     components:
     - type: Transform
-      pos: 12.5,-2.5
       parent: 2
+      pos: 12.5,-2.5
   - uid: 108
     components:
     - type: Transform
-      pos: 1.5,-15.5
       parent: 2
+      pos: 1.5,-15.5
   - uid: 109
     components:
     - type: Transform
-      pos: -1.5,-14.5
       parent: 2
+      pos: -1.5,-14.5
   - uid: 110
     components:
     - type: Transform
-      pos: -2.5,-15.5
       parent: 2
+      pos: -2.5,-15.5
   - uid: 111
     components:
     - type: Transform
-      pos: -0.5,6.5
       parent: 2
+      pos: -0.5,6.5
   - uid: 112
     components:
     - type: Transform
-      pos: -0.5,5.5
       parent: 2
+      pos: -0.5,5.5
   - uid: 113
     components:
     - type: Transform
-      pos: -0.5,4.5
       parent: 2
+      pos: -0.5,4.5
   - uid: 114
     components:
     - type: Transform
-      pos: 1.5,-13.5
       parent: 2
+      pos: 1.5,-13.5
   - uid: 115
     components:
     - type: Transform
-      pos: 1.5,-14.5
       parent: 2
+      pos: 1.5,-14.5
   - uid: 116
     components:
     - type: Transform
-      pos: -1.5,4.5
       parent: 2
+      pos: -1.5,4.5
   - uid: 117
     components:
     - type: Transform
-      pos: -2.5,4.5
       parent: 2
+      pos: -2.5,4.5
   - uid: 118
     components:
     - type: Transform
-      pos: -3.5,4.5
       parent: 2
+      pos: -3.5,4.5
   - uid: 119
     components:
     - type: Transform
-      pos: -4.5,4.5
       parent: 2
+      pos: -4.5,4.5
   - uid: 120
     components:
     - type: Transform
-      pos: -5.5,4.5
       parent: 2
+      pos: -5.5,4.5
   - uid: 121
     components:
     - type: Transform
-      pos: -6.5,4.5
       parent: 2
+      pos: -6.5,4.5
   - uid: 122
     components:
     - type: Transform
-      pos: 0.5,4.5
       parent: 2
+      pos: 0.5,4.5
   - uid: 123
     components:
     - type: Transform
-      pos: 1.5,4.5
       parent: 2
+      pos: 1.5,4.5
   - uid: 124
     components:
     - type: Transform
-      pos: 2.5,4.5
       parent: 2
+      pos: 2.5,4.5
   - uid: 125
     components:
     - type: Transform
-      pos: -2.5,5.5
       parent: 2
+      pos: -2.5,5.5
   - uid: 126
     components:
     - type: Transform
-      pos: -2.5,6.5
       parent: 2
+      pos: -2.5,6.5
   - uid: 127
     components:
     - type: Transform
-      pos: -2.5,7.5
       parent: 2
+      pos: -2.5,7.5
   - uid: 128
     components:
     - type: Transform
-      pos: -2.5,8.5
       parent: 2
+      pos: -2.5,8.5
   - uid: 129
     components:
     - type: Transform
-      pos: -2.5,9.5
       parent: 2
+      pos: -2.5,9.5
   - uid: 130
     components:
     - type: Transform
-      pos: -2.5,10.5
       parent: 2
+      pos: -2.5,10.5
   - uid: 131
     components:
     - type: Transform
-      pos: -2.5,11.5
       parent: 2
+      pos: -2.5,11.5
   - uid: 132
     components:
     - type: Transform
-      pos: -2.5,12.5
       parent: 2
+      pos: -2.5,12.5
   - uid: 133
     components:
     - type: Transform
-      pos: -2.5,13.5
       parent: 2
+      pos: -2.5,13.5
   - uid: 134
     components:
     - type: Transform
-      pos: 11.5,-2.5
       parent: 2
+      pos: 11.5,-2.5
   - uid: 135
     components:
     - type: Transform
-      pos: 10.5,-2.5
       parent: 2
+      pos: 10.5,-2.5
   - uid: 136
     components:
     - type: Transform
-      pos: 9.5,-2.5
       parent: 2
+      pos: 9.5,-2.5
   - uid: 137
     components:
     - type: Transform
-      pos: 8.5,-2.5
       parent: 2
+      pos: 8.5,-2.5
   - uid: 138
     components:
     - type: Transform
-      pos: 12.5,-1.5
       parent: 2
+      pos: 12.5,-1.5
   - uid: 139
     components:
     - type: Transform
-      pos: 12.5,-0.5
       parent: 2
+      pos: 12.5,-0.5
   - uid: 140
     components:
     - type: Transform
-      pos: 12.5,0.5
       parent: 2
+      pos: 12.5,0.5
   - uid: 141
     components:
     - type: Transform
-      pos: 12.5,1.5
       parent: 2
+      pos: 12.5,1.5
   - uid: 142
     components:
     - type: Transform
-      pos: 12.5,2.5
       parent: 2
+      pos: 12.5,2.5
   - uid: 143
     components:
     - type: Transform
-      pos: 13.5,2.5
       parent: 2
+      pos: 13.5,2.5
   - uid: 144
     components:
     - type: Transform
-      pos: 7.5,-2.5
       parent: 2
+      pos: 7.5,-2.5
   - uid: 145
     components:
     - type: Transform
-      pos: 6.5,-2.5
       parent: 2
+      pos: 6.5,-2.5
   - uid: 146
     components:
     - type: Transform
-      pos: 12.5,-3.5
       parent: 2
+      pos: 12.5,-3.5
   - uid: 147
     components:
     - type: Transform
-      pos: 12.5,-4.5
       parent: 2
+      pos: 12.5,-4.5
   - uid: 148
     components:
     - type: Transform
-      pos: 12.5,-5.5
       parent: 2
+      pos: 12.5,-5.5
   - uid: 149
     components:
     - type: Transform
-      pos: 12.5,-6.5
       parent: 2
+      pos: 12.5,-6.5
   - uid: 150
     components:
     - type: Transform
-      pos: 12.5,-7.5
       parent: 2
+      pos: 12.5,-7.5
   - uid: 151
     components:
     - type: Transform
-      pos: 12.5,-8.5
       parent: 2
+      pos: 12.5,-8.5
   - uid: 152
     components:
     - type: Transform
-      pos: 12.5,-9.5
       parent: 2
+      pos: 12.5,-9.5
   - uid: 153
     components:
     - type: Transform
-      pos: 13.5,-8.5
       parent: 2
+      pos: 13.5,-8.5
   - uid: 154
     components:
     - type: Transform
-      pos: 10.5,-14.5
       parent: 2
+      pos: 10.5,-14.5
   - uid: 155
     components:
     - type: Transform
-      pos: 9.5,-14.5
       parent: 2
+      pos: 9.5,-14.5
   - uid: 156
     components:
     - type: Transform
-      pos: 8.5,-14.5
       parent: 2
+      pos: 8.5,-14.5
   - uid: 157
     components:
     - type: Transform
-      pos: 7.5,-14.5
       parent: 2
+      pos: 7.5,-14.5
   - uid: 158
     components:
     - type: Transform
-      pos: 6.5,-3.5
       parent: 2
+      pos: 6.5,-3.5
   - uid: 159
     components:
     - type: Transform
-      pos: 6.5,-4.5
       parent: 2
+      pos: 6.5,-4.5
   - uid: 160
     components:
     - type: Transform
-      pos: 6.5,-5.5
       parent: 2
+      pos: 6.5,-5.5
   - uid: 161
     components:
     - type: Transform
-      pos: 6.5,-6.5
       parent: 2
+      pos: 6.5,-6.5
   - uid: 162
     components:
     - type: Transform
-      pos: 6.5,-7.5
       parent: 2
+      pos: 6.5,-7.5
   - uid: 163
     components:
     - type: Transform
-      pos: 6.5,-8.5
       parent: 2
+      pos: 6.5,-8.5
   - uid: 164
     components:
     - type: Transform
-      pos: 6.5,-9.5
       parent: 2
+      pos: 6.5,-9.5
   - uid: 165
     components:
     - type: Transform
-      pos: 6.5,-10.5
       parent: 2
+      pos: 6.5,-10.5
   - uid: 166
     components:
     - type: Transform
-      pos: 12.5,-10.5
       parent: 2
+      pos: 12.5,-10.5
   - uid: 167
     components:
     - type: Transform
-      pos: 6.5,-1.5
       parent: 2
+      pos: 6.5,-1.5
   - uid: 168
     components:
     - type: Transform
-      pos: 6.5,-0.5
       parent: 2
+      pos: 6.5,-0.5
   - uid: 169
     components:
     - type: Transform
-      pos: 6.5,0.5
       parent: 2
+      pos: 6.5,0.5
   - uid: 170
     components:
     - type: Transform
-      pos: 6.5,1.5
       parent: 2
+      pos: 6.5,1.5
   - uid: 171
     components:
     - type: Transform
-      pos: 6.5,2.5
       parent: 2
+      pos: 6.5,2.5
   - uid: 172
     components:
     - type: Transform
-      pos: 6.5,3.5
       parent: 2
+      pos: 6.5,3.5
   - uid: 173
     components:
     - type: Transform
-      pos: 6.5,4.5
       parent: 2
+      pos: 6.5,4.5
   - uid: 174
     components:
     - type: Transform
-      pos: 7.5,4.5
       parent: 2
+      pos: 7.5,4.5
   - uid: 175
     components:
     - type: Transform
-      pos: 8.5,4.5
       parent: 2
+      pos: 8.5,4.5
   - uid: 176
     components:
     - type: Transform
-      pos: 9.5,4.5
       parent: 2
+      pos: 9.5,4.5
   - uid: 177
     components:
     - type: Transform
-      pos: 9.5,5.5
       parent: 2
+      pos: 9.5,5.5
   - uid: 178
     components:
     - type: Transform
-      pos: 9.5,6.5
       parent: 2
+      pos: 9.5,6.5
   - uid: 179
     components:
     - type: Transform
-      pos: 9.5,7.5
       parent: 2
+      pos: 9.5,7.5
   - uid: 180
     components:
     - type: Transform
-      pos: 9.5,8.5
       parent: 2
+      pos: 9.5,8.5
   - uid: 181
     components:
     - type: Transform
-      pos: 9.5,9.5
       parent: 2
+      pos: 9.5,9.5
   - uid: 182
     components:
     - type: Transform
-      pos: 8.5,8.5
       parent: 2
+      pos: 8.5,8.5
   - uid: 183
     components:
     - type: Transform
-      pos: 10.5,8.5
       parent: 2
+      pos: 10.5,8.5
   - uid: 184
     components:
     - type: Transform
-      pos: 11.5,-14.5
       parent: 2
+      pos: 11.5,-14.5
   - uid: 185
     components:
     - type: Transform
-      pos: 11.5,-15.5
       parent: 2
+      pos: 11.5,-15.5
   - uid: 186
     components:
     - type: Transform
-      pos: 11.5,-16.5
       parent: 2
+      pos: 11.5,-16.5
   - uid: 187
     components:
     - type: Transform
-      pos: 11.5,-17.5
       parent: 2
+      pos: 11.5,-17.5
   - uid: 188
     components:
     - type: Transform
-      pos: 11.5,-18.5
       parent: 2
+      pos: 11.5,-18.5
   - uid: 189
     components:
     - type: Transform
-      pos: 11.5,-19.5
       parent: 2
+      pos: 11.5,-19.5
   - uid: 190
     components:
     - type: Transform
-      pos: 11.5,-20.5
       parent: 2
+      pos: 11.5,-20.5
   - uid: 191
     components:
     - type: Transform
-      pos: 11.5,-21.5
       parent: 2
+      pos: 11.5,-21.5
   - uid: 192
     components:
     - type: Transform
-      pos: 11.5,-22.5
       parent: 2
+      pos: 11.5,-22.5
   - uid: 193
     components:
     - type: Transform
-      pos: 11.5,-23.5
       parent: 2
+      pos: 11.5,-23.5
   - uid: 194
     components:
     - type: Transform
-      pos: 11.5,-24.5
       parent: 2
+      pos: 11.5,-24.5
   - uid: 195
     components:
     - type: Transform
-      pos: 12.5,-22.5
       parent: 2
+      pos: 12.5,-22.5
   - uid: 196
     components:
     - type: Transform
-      pos: -7.5,-4.5
       parent: 2
+      pos: -7.5,-4.5
   - uid: 197
     components:
     - type: Transform
-      pos: 13.5,-14.5
       parent: 2
+      pos: 13.5,-14.5
   - uid: 198
     components:
     - type: Transform
-      pos: 12.5,-14.5
       parent: 2
+      pos: 12.5,-14.5
   - uid: 199
     components:
     - type: Transform
-      pos: 4.5,-4.5
       parent: 2
+      pos: 4.5,-4.5
   - uid: 200
     components:
     - type: Transform
-      pos: 3.5,-4.5
       parent: 2
+      pos: 3.5,-4.5
   - uid: 201
     components:
     - type: Transform
-      pos: 2.5,-3.5
       parent: 2
+      pos: 2.5,-3.5
   - uid: 202
     components:
     - type: Transform
-      pos: 2.5,-4.5
       parent: 2
+      pos: 2.5,-4.5
   - uid: 203
     components:
     - type: Transform
-      pos: -1.5,0.5
       parent: 2
+      pos: -1.5,0.5
   - uid: 204
     components:
     - type: Transform
-      pos: 1.5,-3.5
       parent: 2
+      pos: 1.5,-3.5
   - uid: 205
     components:
     - type: Transform
-      pos: 0.5,-3.5
       parent: 2
+      pos: 0.5,-3.5
   - uid: 206
     components:
     - type: Transform
-      pos: -0.5,-3.5
       parent: 2
+      pos: -0.5,-3.5
   - uid: 207
     components:
     - type: Transform
-      pos: -1.5,-3.5
       parent: 2
+      pos: -1.5,-3.5
   - uid: 208
     components:
     - type: Transform
-      pos: -2.5,-3.5
       parent: 2
+      pos: -2.5,-3.5
   - uid: 209
     components:
     - type: Transform
-      pos: -3.5,-3.5
       parent: 2
+      pos: -3.5,-3.5
   - uid: 210
     components:
     - type: Transform
-      pos: -4.5,-3.5
       parent: 2
+      pos: -4.5,-3.5
   - uid: 211
     components:
     - type: Transform
-      pos: -5.5,-3.5
       parent: 2
+      pos: -5.5,-3.5
   - uid: 212
     components:
     - type: Transform
-      pos: -6.5,-3.5
       parent: 2
+      pos: -6.5,-3.5
   - uid: 213
     components:
     - type: Transform
-      pos: -7.5,-3.5
       parent: 2
+      pos: -7.5,-3.5
   - uid: 214
     components:
     - type: Transform
-      pos: -2.5,-1.5
       parent: 2
+      pos: -2.5,-1.5
   - uid: 215
     components:
     - type: Transform
-      pos: -2.5,-0.5
       parent: 2
+      pos: -2.5,-0.5
   - uid: 216
     components:
     - type: Transform
-      pos: -2.5,0.5
       parent: 2
+      pos: -2.5,0.5
   - uid: 217
     components:
     - type: Transform
-      pos: -2.5,-4.5
       parent: 2
+      pos: -2.5,-4.5
   - uid: 218
     components:
     - type: Transform
-      pos: -2.5,-5.5
       parent: 2
+      pos: -2.5,-5.5
   - uid: 219
     components:
     - type: Transform
-      pos: -2.5,-6.5
       parent: 2
+      pos: -2.5,-6.5
   - uid: 220
     components:
     - type: Transform
-      pos: -7.5,-2.5
       parent: 2
+      pos: -7.5,-2.5
   - uid: 221
     components:
     - type: Transform
-      pos: 2.5,-2.5
       parent: 2
+      pos: 2.5,-2.5
   - uid: 222
     components:
     - type: Transform
-      pos: -0.5,0.5
       parent: 2
+      pos: -0.5,0.5
   - uid: 223
     components:
     - type: Transform
-      pos: 0.5,0.5
       parent: 2
+      pos: 0.5,0.5
   - uid: 224
     components:
     - type: Transform
-      pos: -3.5,0.5
       parent: 2
+      pos: -3.5,0.5
   - uid: 225
     components:
     - type: Transform
-      pos: -4.5,0.5
       parent: 2
+      pos: -4.5,0.5
   - uid: 226
     components:
     - type: Transform
-      pos: -5.5,0.5
       parent: 2
+      pos: -5.5,0.5
   - uid: 227
     components:
     - type: Transform
-      pos: -6.5,0.5
       parent: 2
+      pos: -6.5,0.5
   - uid: 228
     components:
     - type: Transform
-      pos: 1.5,0.5
       parent: 2
+      pos: 1.5,0.5
   - uid: 229
     components:
     - type: Transform
-      pos: -0.5,-10.5
       parent: 2
+      pos: -0.5,-10.5
   - uid: 230
     components:
     - type: Transform
-      pos: 1.5,-12.5
       parent: 2
+      pos: 1.5,-12.5
   - uid: 231
     components:
     - type: Transform
-      pos: 1.5,-11.5
       parent: 2
+      pos: 1.5,-11.5
   - uid: 232
     components:
     - type: Transform
-      pos: 1.5,-10.5
       parent: 2
+      pos: 1.5,-10.5
   - uid: 233
     components:
     - type: Transform
-      pos: 0.5,-10.5
       parent: 2
+      pos: 0.5,-10.5
   - uid: 234
     components:
     - type: Transform
-      pos: 2.5,-10.5
       parent: 2
+      pos: 2.5,-10.5
   - uid: 235
     components:
     - type: Transform
-      pos: -1.5,-10.5
       parent: 2
+      pos: -1.5,-10.5
   - uid: 236
     components:
     - type: Transform
-      pos: -2.5,-10.5
       parent: 2
+      pos: -2.5,-10.5
   - uid: 237
     components:
     - type: Transform
-      pos: -3.5,-10.5
       parent: 2
+      pos: -3.5,-10.5
   - uid: 238
     components:
     - type: Transform
-      pos: -4.5,-10.5
       parent: 2
+      pos: -4.5,-10.5
   - uid: 239
     components:
     - type: Transform
-      pos: -5.5,-10.5
       parent: 2
+      pos: -5.5,-10.5
   - uid: 240
     components:
     - type: Transform
-      pos: -6.5,-10.5
       parent: 2
+      pos: -6.5,-10.5
   - uid: 241
     components:
     - type: Transform
-      pos: -7.5,-10.5
       parent: 2
+      pos: -7.5,-10.5
   - uid: 242
     components:
     - type: Transform
-      pos: -1.5,-19.5
       parent: 2
+      pos: -1.5,-19.5
   - uid: 243
     components:
     - type: Transform
-      pos: -3.5,-15.5
       parent: 2
+      pos: -3.5,-15.5
   - uid: 244
     components:
     - type: Transform
-      pos: -4.5,-15.5
       parent: 2
+      pos: -4.5,-15.5
   - uid: 245
     components:
     - type: Transform
-      pos: -1.5,-16.5
       parent: 2
+      pos: -1.5,-16.5
   - uid: 246
     components:
     - type: Transform
-      pos: -1.5,-17.5
       parent: 2
+      pos: -1.5,-17.5
   - uid: 247
     components:
     - type: Transform
-      pos: -1.5,-18.5
       parent: 2
+      pos: -1.5,-18.5
   - uid: 248
     components:
     - type: Transform
-      pos: -1.5,-20.5
       parent: 2
+      pos: -1.5,-20.5
   - uid: 249
     components:
     - type: Transform
-      pos: -1.5,-21.5
       parent: 2
+      pos: -1.5,-21.5
   - uid: 250
     components:
     - type: Transform
-      pos: -4.5,-20.5
       parent: 2
+      pos: -4.5,-20.5
   - uid: 251
     components:
     - type: Transform
-      pos: -4.5,-23.5
       parent: 2
+      pos: -4.5,-23.5
   - uid: 252
     components:
     - type: Transform
-      pos: -4.5,-22.5
       parent: 2
+      pos: -4.5,-22.5
   - uid: 253
     components:
     - type: Transform
-      pos: -2.5,-23.5
       parent: 2
+      pos: -2.5,-23.5
   - uid: 254
     components:
     - type: Transform
-      pos: 1.5,-22.5
       parent: 2
+      pos: 1.5,-22.5
   - uid: 255
     components:
     - type: Transform
-      pos: -2.5,-22.5
       parent: 2
+      pos: -2.5,-22.5
   - uid: 256
     components:
     - type: Transform
-      pos: -0.5,-22.5
       parent: 2
+      pos: -0.5,-22.5
   - uid: 257
     components:
     - type: Transform
-      pos: -0.5,-23.5
       parent: 2
+      pos: -0.5,-23.5
   - uid: 258
     components:
     - type: Transform
-      pos: 1.5,-23.5
       parent: 2
+      pos: 1.5,-23.5
   - uid: 259
     components:
     - type: Transform
-      pos: -4.5,-21.5
       parent: 2
+      pos: -4.5,-21.5
   - uid: 260
     components:
     - type: Transform
-      pos: -3.5,-21.5
       parent: 2
+      pos: -3.5,-21.5
   - uid: 261
     components:
     - type: Transform
-      pos: -2.5,-21.5
       parent: 2
+      pos: -2.5,-21.5
   - uid: 262
     components:
     - type: Transform
-      pos: -0.5,-21.5
       parent: 2
+      pos: -0.5,-21.5
   - uid: 263
     components:
     - type: Transform
-      pos: 0.5,-21.5
       parent: 2
+      pos: 0.5,-21.5
   - uid: 264
     components:
     - type: Transform
-      pos: 1.5,-21.5
       parent: 2
+      pos: 1.5,-21.5
   - uid: 265
     components:
     - type: Transform
-      pos: -4.5,-19.5
       parent: 2
+      pos: -4.5,-19.5
   - uid: 266
     components:
     - type: Transform
-      pos: 1.5,-20.5
       parent: 2
+      pos: 1.5,-20.5
   - uid: 267
     components:
     - type: Transform
-      pos: 1.5,-19.5
       parent: 2
+      pos: 1.5,-19.5
   - uid: 268
     components:
     - type: Transform
-      pos: -2.5,14.5
       parent: 2
+      pos: -2.5,14.5
   - uid: 269
     components:
     - type: Transform
-      pos: -2.5,15.5
       parent: 2
+      pos: -2.5,15.5
   - uid: 270
     components:
     - type: Transform
-      pos: -3.5,15.5
       parent: 2
+      pos: -3.5,15.5
   - uid: 271
     components:
     - type: Transform
-      pos: -4.5,15.5
       parent: 2
+      pos: -4.5,15.5
   - uid: 272
     components:
     - type: Transform
-      pos: -8.5,-10.5
       parent: 2
+      pos: -8.5,-10.5
   - uid: 273
     components:
     - type: Transform
-      pos: -8.5,-11.5
       parent: 2
+      pos: -8.5,-11.5
   - uid: 1577
     components:
     - type: Transform
-      pos: 14.5,2.5
       parent: 2
+      pos: 14.5,2.5
   - uid: 1578
     components:
     - type: Transform
-      pos: 14.5,-8.5
       parent: 2
+      pos: 14.5,-8.5
   - uid: 1579
     components:
     - type: Transform
-      pos: 15.5,-8.5
       parent: 2
+      pos: 15.5,-8.5
   - uid: 1580
     components:
     - type: Transform
-      pos: 14.5,-14.5
       parent: 2
+      pos: 14.5,-14.5
   - uid: 1581
     components:
     - type: Transform
-      pos: 15.5,2.5
       parent: 2
+      pos: 15.5,2.5
   - uid: 1582
     components:
     - type: Transform
-      pos: 15.5,-14.5
       parent: 2
+      pos: 15.5,-14.5
   - uid: 1583
     components:
     - type: Transform
-      pos: 14.5,-22.5
       parent: 2
+      pos: 14.5,-22.5
   - uid: 1584
     components:
     - type: Transform
-      pos: 15.5,-22.5
       parent: 2
+      pos: 15.5,-22.5
 - proto: CableHV
   entities:
   - uid: 274
     components:
     - type: Transform
-      pos: -5.5,3.5
       parent: 2
+      pos: -5.5,3.5
   - uid: 275
     components:
     - type: Transform
-      pos: -5.5,4.5
       parent: 2
+      pos: -5.5,4.5
   - uid: 276
     components:
     - type: Transform
-      pos: -5.5,5.5
       parent: 2
+      pos: -5.5,5.5
   - uid: 277
     components:
     - type: Transform
-      pos: -6.5,5.5
       parent: 2
+      pos: -6.5,5.5
   - uid: 278
     components:
     - type: Transform
-      pos: -7.5,5.5
       parent: 2
+      pos: -7.5,5.5
   - uid: 279
     components:
     - type: Transform
-      pos: -8.5,5.5
       parent: 2
+      pos: -8.5,5.5
 - proto: CableMV
   entities:
   - uid: 280
     components:
     - type: Transform
-      pos: -5.5,4.5
       parent: 2
+      pos: -5.5,4.5
   - uid: 281
     components:
     - type: Transform
-      pos: 7.5,-4.5
       parent: 2
+      pos: 7.5,-4.5
   - uid: 282
     components:
     - type: Transform
-      pos: -8.5,5.5
       parent: 2
+      pos: -8.5,5.5
   - uid: 283
     components:
     - type: Transform
-      pos: 6.5,-4.5
       parent: 2
+      pos: 6.5,-4.5
   - uid: 284
     components:
     - type: Transform
-      pos: -7.5,4.5
       parent: 2
+      pos: -7.5,4.5
   - uid: 285
     components:
     - type: Transform
-      pos: 6.5,-10.5
       parent: 2
+      pos: 6.5,-10.5
   - uid: 286
     components:
     - type: Transform
-      pos: -8.5,4.5
       parent: 2
+      pos: -8.5,4.5
   - uid: 287
     components:
     - type: Transform
-      pos: -6.5,4.5
       parent: 2
+      pos: -6.5,4.5
   - uid: 288
     components:
     - type: Transform
-      pos: -4.5,4.5
       parent: 2
+      pos: -4.5,4.5
   - uid: 289
     components:
     - type: Transform
-      pos: -3.5,4.5
       parent: 2
+      pos: -3.5,4.5
   - uid: 290
     components:
     - type: Transform
-      pos: -2.5,4.5
       parent: 2
+      pos: -2.5,4.5
   - uid: 291
     components:
     - type: Transform
-      pos: -1.5,4.5
       parent: 2
+      pos: -1.5,4.5
   - uid: 292
     components:
     - type: Transform
-      pos: -0.5,4.5
       parent: 2
+      pos: -0.5,4.5
   - uid: 293
     components:
     - type: Transform
-      pos: -0.5,5.5
       parent: 2
+      pos: -0.5,5.5
   - uid: 294
     components:
     - type: Transform
-      pos: -0.5,6.5
       parent: 2
+      pos: -0.5,6.5
   - uid: 295
     components:
     - type: Transform
-      pos: 0.5,4.5
       parent: 2
+      pos: 0.5,4.5
   - uid: 296
     components:
     - type: Transform
-      pos: 1.5,4.5
       parent: 2
+      pos: 1.5,4.5
   - uid: 297
     components:
     - type: Transform
-      pos: 2.5,4.5
       parent: 2
+      pos: 2.5,4.5
   - uid: 298
     components:
     - type: Transform
-      pos: 3.5,4.5
       parent: 2
+      pos: 3.5,4.5
   - uid: 299
     components:
     - type: Transform
-      pos: 4.5,4.5
       parent: 2
+      pos: 4.5,4.5
   - uid: 300
     components:
     - type: Transform
-      pos: 5.5,4.5
       parent: 2
+      pos: 5.5,4.5
   - uid: 301
     components:
     - type: Transform
-      pos: 6.5,4.5
       parent: 2
+      pos: 6.5,4.5
   - uid: 302
     components:
     - type: Transform
-      pos: 7.5,4.5
       parent: 2
+      pos: 7.5,4.5
   - uid: 303
     components:
     - type: Transform
-      pos: 8.5,4.5
       parent: 2
+      pos: 8.5,4.5
   - uid: 304
     components:
     - type: Transform
-      pos: 5.5,-4.5
       parent: 2
+      pos: 5.5,-4.5
   - uid: 305
     components:
     - type: Transform
-      pos: 4.5,-4.5
       parent: 2
+      pos: 4.5,-4.5
   - uid: 306
     components:
     - type: Transform
-      pos: 7.5,-10.5
       parent: 2
+      pos: 7.5,-10.5
   - uid: 307
     components:
     - type: Transform
-      pos: 5.5,-10.5
       parent: 2
+      pos: 5.5,-10.5
   - uid: 308
     components:
     - type: Transform
-      pos: 4.5,-10.5
       parent: 2
+      pos: 4.5,-10.5
   - uid: 309
     components:
     - type: Transform
-      pos: 2.5,-10.5
       parent: 2
+      pos: 2.5,-10.5
   - uid: 310
     components:
     - type: Transform
-      pos: 1.5,-10.5
       parent: 2
+      pos: 1.5,-10.5
   - uid: 311
     components:
     - type: Transform
-      pos: 3.5,-10.5
       parent: 2
+      pos: 3.5,-10.5
   - uid: 312
     components:
     - type: Transform
-      pos: 1.5,-11.5
       parent: 2
+      pos: 1.5,-11.5
   - uid: 313
     components:
     - type: Transform
-      pos: 1.5,-12.5
       parent: 2
+      pos: 1.5,-12.5
   - uid: 314
     components:
     - type: Transform
-      pos: 9.5,-2.5
       parent: 2
+      pos: 9.5,-2.5
   - uid: 315
     components:
     - type: Transform
-      pos: 10.5,-2.5
       parent: 2
+      pos: 10.5,-2.5
   - uid: 316
     components:
     - type: Transform
-      pos: 11.5,-2.5
       parent: 2
+      pos: 11.5,-2.5
   - uid: 317
     components:
     - type: Transform
-      pos: -2.5,-4.5
       parent: 2
+      pos: -2.5,-4.5
   - uid: 318
     components:
     - type: Transform
-      pos: 8.5,-11.5
       parent: 2
+      pos: 8.5,-11.5
   - uid: 319
     components:
     - type: Transform
-      pos: 8.5,-12.5
       parent: 2
+      pos: 8.5,-12.5
   - uid: 320
     components:
     - type: Transform
-      pos: 8.5,-13.5
       parent: 2
+      pos: 8.5,-13.5
   - uid: 321
     components:
     - type: Transform
-      pos: 8.5,-14.5
       parent: 2
+      pos: 8.5,-14.5
   - uid: 322
     components:
     - type: Transform
-      pos: 9.5,-14.5
       parent: 2
+      pos: 9.5,-14.5
   - uid: 323
     components:
     - type: Transform
-      pos: 8.5,3.5
       parent: 2
+      pos: 8.5,3.5
   - uid: 324
     components:
     - type: Transform
-      pos: 8.5,2.5
       parent: 2
+      pos: 8.5,2.5
   - uid: 325
     components:
     - type: Transform
-      pos: 8.5,1.5
       parent: 2
+      pos: 8.5,1.5
   - uid: 326
     components:
     - type: Transform
-      pos: 8.5,0.5
       parent: 2
+      pos: 8.5,0.5
   - uid: 327
     components:
     - type: Transform
-      pos: 8.5,-0.5
       parent: 2
+      pos: 8.5,-0.5
   - uid: 328
     components:
     - type: Transform
-      pos: 8.5,-1.5
       parent: 2
+      pos: 8.5,-1.5
   - uid: 329
     components:
     - type: Transform
-      pos: 8.5,-2.5
       parent: 2
+      pos: 8.5,-2.5
   - uid: 330
     components:
     - type: Transform
-      pos: 8.5,-3.5
       parent: 2
+      pos: 8.5,-3.5
   - uid: 331
     components:
     - type: Transform
-      pos: 8.5,-4.5
       parent: 2
+      pos: 8.5,-4.5
   - uid: 332
     components:
     - type: Transform
-      pos: 8.5,-5.5
       parent: 2
+      pos: 8.5,-5.5
   - uid: 333
     components:
     - type: Transform
-      pos: 8.5,-6.5
       parent: 2
+      pos: 8.5,-6.5
   - uid: 334
     components:
     - type: Transform
-      pos: 8.5,-7.5
       parent: 2
+      pos: 8.5,-7.5
   - uid: 335
     components:
     - type: Transform
-      pos: 8.5,-8.5
       parent: 2
+      pos: 8.5,-8.5
   - uid: 336
     components:
     - type: Transform
-      pos: 8.5,-9.5
       parent: 2
+      pos: 8.5,-9.5
   - uid: 337
     components:
     - type: Transform
-      pos: 8.5,-10.5
       parent: 2
+      pos: 8.5,-10.5
   - uid: 338
     components:
     - type: Transform
-      pos: -3.5,-4.5
       parent: 2
+      pos: -3.5,-4.5
   - uid: 339
     components:
     - type: Transform
-      pos: -4.5,-4.5
       parent: 2
+      pos: -4.5,-4.5
   - uid: 340
     components:
     - type: Transform
-      pos: -5.5,-4.5
       parent: 2
+      pos: -5.5,-4.5
   - uid: 341
     components:
     - type: Transform
-      pos: -6.5,-4.5
       parent: 2
+      pos: -6.5,-4.5
   - uid: 342
     components:
     - type: Transform
-      pos: -7.5,-4.5
       parent: 2
+      pos: -7.5,-4.5
   - uid: 343
     components:
     - type: Transform
-      pos: -8.5,-4.5
       parent: 2
+      pos: -8.5,-4.5
   - uid: 344
     components:
     - type: Transform
-      pos: -9.5,-4.5
       parent: 2
+      pos: -9.5,-4.5
   - uid: 345
     components:
     - type: Transform
-      pos: -2.5,-3.5
       parent: 2
+      pos: -2.5,-3.5
   - uid: 346
     components:
     - type: Transform
-      pos: -2.5,-2.5
       parent: 2
+      pos: -2.5,-2.5
   - uid: 347
     components:
     - type: Transform
-      pos: -2.5,-1.5
       parent: 2
+      pos: -2.5,-1.5
   - uid: 348
     components:
     - type: Transform
-      pos: -2.5,-0.5
       parent: 2
+      pos: -2.5,-0.5
   - uid: 349
     components:
     - type: Transform
-      pos: -2.5,0.5
       parent: 2
+      pos: -2.5,0.5
   - uid: 350
     components:
     - type: Transform
-      pos: -2.5,1.5
       parent: 2
+      pos: -2.5,1.5
   - uid: 351
     components:
     - type: Transform
-      pos: -2.5,2.5
       parent: 2
+      pos: -2.5,2.5
   - uid: 352
     components:
     - type: Transform
-      pos: -2.5,3.5
       parent: 2
+      pos: -2.5,3.5
   - uid: 353
     components:
     - type: Transform
-      pos: 12.5,-2.5
       parent: 2
+      pos: 12.5,-2.5
   - uid: 354
     components:
     - type: Transform
-      pos: 13.5,-2.5
       parent: 2
+      pos: 13.5,-2.5
   - uid: 355
     components:
     - type: Transform
-      pos: 14.5,-2.5
       parent: 2
+      pos: 14.5,-2.5
 - proto: CableTerminal
   entities:
   - uid: 356
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,5.5
-      parent: 2
 - proto: CandleBlackInfinite
   entities:
   - uid: 357
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.2142973,-7.1859117
-      parent: 2
 - proto: CandleGreenSmallInfinite
   entities:
   - uid: 358
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.7767973,-7.3265367
-      parent: 2
 - proto: CandlePurpleSmallInfinite
   entities:
   - uid: 359
     components:
     - type: Transform
-      pos: -7.2544527,-7.1859117
       parent: 2
+      pos: -7.2544527,-7.1859117
 - proto: CandleRedInfinite
   entities:
   - uid: 360
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.7544527,-7.2327867
-      parent: 2
 - proto: Carpet
   entities:
   - uid: 361
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-16.5
-      parent: 2
   - uid: 362
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-15.5
-      parent: 2
   - uid: 363
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-15.5
-      parent: 2
   - uid: 364
     components:
     - type: Transform
-      pos: -3.5,-20.5
       parent: 2
+      pos: -3.5,-20.5
   - uid: 365
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-14.5
-      parent: 2
   - uid: 366
     components:
     - type: Transform
-      pos: -2.5,-20.5
       parent: 2
+      pos: -2.5,-20.5
   - uid: 367
     components:
     - type: Transform
-      pos: 0.5,-19.5
       parent: 2
+      pos: 0.5,-19.5
   - uid: 368
     components:
     - type: Transform
-      pos: -0.5,-20.5
       parent: 2
+      pos: -0.5,-20.5
   - uid: 369
     components:
     - type: Transform
-      pos: 0.5,-20.5
       parent: 2
+      pos: 0.5,-20.5
   - uid: 370
     components:
     - type: Transform
-      pos: -0.5,-19.5
       parent: 2
+      pos: -0.5,-19.5
   - uid: 371
     components:
     - type: Transform
-      pos: -2.5,-19.5
       parent: 2
+      pos: -2.5,-19.5
   - uid: 372
     components:
     - type: Transform
-      pos: -3.5,-19.5
       parent: 2
+      pos: -3.5,-19.5
   - uid: 373
     components:
     - type: Transform
-      pos: -1.5,-20.5
       parent: 2
+      pos: -1.5,-20.5
   - uid: 374
     components:
     - type: Transform
-      pos: -1.5,-20.5
       parent: 2
+      pos: -1.5,-20.5
   - uid: 375
     components:
     - type: Transform
-      pos: -1.5,-19.5
       parent: 2
+      pos: -1.5,-19.5
 - proto: CarpetBlack
   entities:
   - uid: 376
     components:
     - type: Transform
-      pos: -4.5,-25.5
       parent: 2
+      pos: -4.5,-25.5
   - uid: 377
     components:
     - type: Transform
-      pos: 1.5,-25.5
       parent: 2
+      pos: 1.5,-25.5
   - uid: 378
     components:
     - type: Transform
-      pos: -2.5,-25.5
       parent: 2
+      pos: -2.5,-25.5
   - uid: 379
     components:
     - type: Transform
-      pos: -0.5,-25.5
       parent: 2
+      pos: -0.5,-25.5
 - proto: CarpetGreen
   entities:
   - uid: 380
     components:
     - type: Transform
-      pos: 0.5,-14.5
       parent: 2
+      pos: 0.5,-14.5
   - uid: 381
     components:
     - type: Transform
-      pos: 0.5,-15.5
       parent: 2
+      pos: 0.5,-15.5
   - uid: 382
     components:
     - type: Transform
-      pos: 1.5,-14.5
       parent: 2
+      pos: 1.5,-14.5
   - uid: 383
     components:
     - type: Transform
-      pos: 1.5,-15.5
       parent: 2
+      pos: 1.5,-15.5
   - uid: 384
     components:
     - type: Transform
-      pos: 2.5,-14.5
       parent: 2
+      pos: 2.5,-14.5
   - uid: 385
     components:
     - type: Transform
-      pos: 2.5,-15.5
       parent: 2
+      pos: 2.5,-15.5
 - proto: CarpetWhite
   entities:
   - uid: 386
     components:
     - type: Transform
-      pos: -5.5,-14.5
       parent: 2
+      pos: -5.5,-14.5
   - uid: 387
     components:
     - type: Transform
-      pos: -5.5,-15.5
       parent: 2
+      pos: -5.5,-15.5
   - uid: 388
     components:
     - type: Transform
-      pos: -4.5,-14.5
       parent: 2
+      pos: -4.5,-14.5
   - uid: 389
     components:
     - type: Transform
-      pos: -4.5,-15.5
       parent: 2
+      pos: -4.5,-15.5
   - uid: 390
     components:
     - type: Transform
-      pos: -3.5,-14.5
       parent: 2
+      pos: -3.5,-14.5
   - uid: 391
     components:
     - type: Transform
-      pos: -3.5,-15.5
       parent: 2
+      pos: -3.5,-15.5
 - proto: Catwalk
   entities:
   - uid: 392
     components:
     - type: Transform
-      pos: -5.5,4.5
       parent: 2
+      pos: -5.5,4.5
   - uid: 393
     components:
     - type: Transform
-      pos: -8.5,4.5
       parent: 2
+      pos: -8.5,4.5
   - uid: 394
     components:
     - type: Transform
-      pos: -6.5,4.5
       parent: 2
+      pos: -6.5,4.5
   - uid: 395
     components:
     - type: Transform
-      pos: -7.5,4.5
       parent: 2
+      pos: -7.5,4.5
 - proto: Chair
   entities:
   - uid: 396
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-17.5
-      parent: 2
   - uid: 397
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-18.5
-      parent: 2
   - uid: 398
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-24.5
-      parent: 2
   - uid: 399
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-19.5
-      parent: 2
   - uid: 400
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-24.5
-      parent: 2
   - uid: 401
     components:
     - type: Transform
-      pos: 9.5,-20.5
       parent: 2
+      pos: 9.5,-20.5
   - uid: 402
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-16.5
-      parent: 2
   - uid: 403
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-20.5
-      parent: 2
   - uid: 404
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-22.5
-      parent: 2
   - uid: 405
     components:
     - type: Transform
-      pos: -8.5,-15.5
       parent: 2
+      pos: -8.5,-15.5
 - proto: ChairGreyscale
   entities:
   - uid: 406
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -5.5,-16.5
-      parent: 2
 - proto: ChairOfficeDark
   entities:
   - uid: 407
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5282974,-14.420438
-      parent: 2
 - proto: ChairWood
   entities:
   - uid: 408
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 2.5,-16.5
-      parent: 2
   - uid: 409
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-21.5
-      parent: 2
   - uid: 410
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-20.5
-      parent: 2
   - uid: 411
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-21.5
-      parent: 2
   - uid: 412
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-20.5
-      parent: 2
+- proto: ChunkEntity
+  entities:
+  - uid: 1586
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 0,-1
+    - type: DecalChunk
+      maxDecalId: 765
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            648: 14,-9
+            649: 14,-2
+            651: 14,-15
+            668: 3,-11
+            669: 7,-11
+            670: 11,-11
+            671: 7,-4
+            672: 7,-3
+            673: 11,-3
+            674: 11,-4
+        - node:
+            id: ArrowsGreyscale
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            679: 0,-4
+            680: 2,-4
+        - node:
+            zIndex: 1
+            id: BotGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            636: 7,-13
+            637: 6,-13
+            639: 8,-13
+        - node:
+            id: BrickTileDarkCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            225: 13,-5
+            226: 8,-5
+        - node:
+            id: BrickTileDarkCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            220: 6,-5
+            221: 11,-5
+        - node:
+            id: BrickTileDarkCornerSe
+            color: '#FFFFFFFF'
+          decals:
+            229: 8,-10
+            230: 13,-10
+            231: 13,-2
+            232: 8,-2
+        - node:
+            id: BrickTileDarkCornerSw
+            color: '#FFFFFFFF'
+          decals:
+            216: 6,-2
+            217: 11,-2
+            218: 6,-10
+            219: 11,-10
+        - node:
+            id: BrickTileDarkEndE
+            color: '#FFFFFFFF'
+          decals:
+            56: 3,-1
+        - node:
+            id: BrickTileDarkEndW
+            color: '#FFFFFFFF'
+          decals:
+            51: 0,-1
+        - node:
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            235: 6,-10
+            236: 11,-10
+            237: 6,-2
+            238: 11,-2
+            522: 1,-11
+            597: 11,-16
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            389: 8,-5
+            390: 13,-5
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            233: 8,-2
+            234: 13,-2
+            248: 8,-10
+            249: 13,-10
+            594: 11,-16
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            385: 6,-5
+            386: 11,-5
+        - node:
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            241: 11,-5
+            242: 6,-5
+            523: 1,-11
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            393: 8,-2
+            394: 13,-2
+            395: 13,-10
+            396: 8,-10
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            243: 8,-5
+            244: 13,-5
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            397: 6,-10
+            398: 11,-10
+            399: 11,-2
+            400: 6,-2
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            152: 6,-6
+            153: 6,-7
+            154: 6,-8
+            155: 6,-9
+            156: 8,-9
+            157: 8,-8
+            158: 8,-7
+            159: 8,-6
+            160: 13,-9
+            161: 13,-8
+            162: 13,-7
+            163: 13,-6
+            164: 13,-1
+            168: 8,-1
+            176: 6,-1
+            177: 11,-1
+            182: 11,-6
+            183: 11,-7
+            184: 11,-8
+            185: 11,-9
+            589: 10,-16
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            59: 1,-1
+            60: 2,-1
+            89: 0,-1
+            90: 1,-1
+            91: 2,-1
+            92: 3,-1
+            109: 7,-10
+            111: 12,-10
+            112: 12,-2
+            113: 7,-2
+            117: 12,-5
+            118: 7,-5
+            259: 5,-5
+            260: 9,-5
+            261: 10,-5
+            367: 5,-12
+            368: 6,-12
+            369: 7,-12
+            370: 8,-12
+            371: 9,-12
+            372: 10,-12
+            373: 11,-12
+            374: 12,-12
+            375: 13,-12
+            519: 0,-12
+            520: 1,-12
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            57: 1,-1
+            58: 2,-1
+            120: 7,-10
+            121: 12,-10
+            122: 12,-2
+            123: 7,-2
+            126: 12,-5
+            127: 7,-5
+            253: 5,-2
+            254: 9,-2
+            255: 10,-2
+            256: 9,-10
+            257: 10,-10
+            258: 5,-10
+            513: 0,-10
+            514: 1,-10
+            590: 11,-15
+        - node:
+            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            128: 6,-9
+            129: 6,-8
+            130: 6,-7
+            131: 6,-6
+            132: 11,-9
+            133: 11,-8
+            134: 11,-7
+            135: 11,-6
+            136: 13,-9
+            137: 13,-8
+            138: 13,-7
+            139: 13,-6
+            140: 6,-1
+            144: 8,-1
+            148: 13,-1
+            188: 8,-9
+            189: 8,-8
+            190: 8,-7
+            191: 8,-6
+            193: 11,-1
+            516: 2,-11
+            571: 12,-16
+        - node:
+            id: BrickTileSteelBox
+            color: '#FFFFFFFF'
+          decals:
+            535: 11,-13
+            613: 4,-11
+        - node:
+            id: BrickTileSteelCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            504: 3,-10
+            553: 12,-14
+        - node:
+            id: BrickTileSteelCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            552: 10,-14
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#FFFFFFFF'
+          decals:
+            486: 3,-12
+        - node:
+            id: BrickTileSteelEndN
+            color: '#FFFFFFFF'
+          decals:
+            610: 4,-3
+        - node:
+            id: BrickTileSteelEndS
+            color: '#FFFFFFFF'
+          decals:
+            611: 4,-4
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            489: 3,-11
+            569: 11,-14
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            568: 11,-14
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            490: 3,-11
+        - node:
+            id: BrickTileSteelLineE
+            color: '#FFFFFFFF'
+          decals:
+            565: 12,-16
+            647: 12,-15
+        - node:
+            id: BrickTileSteelLineN
+            color: '#FFFFFFFF'
+          decals:
+            499: 0,-10
+            500: 0,-10
+            501: 1,-10
+            502: 1,-10
+            503: 2,-10
+        - node:
+            id: BrickTileSteelLineS
+            color: '#FFFFFFFF'
+          decals:
+            492: 0,-12
+            493: 1,-12
+            494: 1,-12
+            495: 2,-12
+            570: 11,-13
+        - node:
+            id: BrickTileSteelLineW
+            color: '#FFFFFFFF'
+          decals:
+            549: 10,-16
+            550: 10,-16
+            551: 10,-15
+        - node:
+            id: Caution
+            color: '#FFFFFFFF'
+            angle: 4.71238898038469 rad
+          decals:
+            662: 13.595629,-2.0041823
+            663: 13.600033,-9.000203
+            664: 13.600033,-15.003099
+        - node:
+            zIndex: 1
+            id: DeliveryGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            638: 5,-13
+        - node:
+            id: GrayConcreteTrimInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            4: 0,-3
+        - node:
+            id: GrayConcreteTrimInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            9: 0,-1
+            50: 0,-5
+            61: 0,-1
+            68: 0,-1
+            202: 0,-5
+        - node:
+            id: GrayConcreteTrimLineW
+            color: '#FFFFFFFF'
+          decals:
+            7: 0,-2
+            96: 0,-6
+            97: 0,-7
+            98: 0,-8
+            228: 0,-8
+            269: 0,-2
+        - node:
+            id: MiniTileBoxOverlay
+            color: '#639137FF'
+          decals:
+            618: 3,-15
+            619: 3,-16
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            761: 15,-15
+            763: 15,-9
+            765: 15,-2
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            751: 15,-2
+            753: 15,-9
+            755: 15,-15
+        - node:
+            id: WoodTrimThinCornerNwWhite
+            color: '#DE3A3A41'
+          decals:
+            338: 5,-15
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#281E18FF'
+          decals:
+            212: 3,-8
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#422E23FF'
+          decals:
+            172: 3,-5
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#DE3A3A41'
+          decals:
+            344: 8,-15
+        - node:
+            id: WoodTrimThinInnerNeWhite
+            color: '#422E23FF'
+          decals:
+            42: 3,-3
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#422E23FF'
+          decals:
+            15: 0,-3
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#DE3A3A41'
+          decals:
+            366: 6,-15
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#422E23FF'
+          decals:
+            41: 3,-4
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#DE3A3A41'
+          decals:
+            365: 7,-15
+        - node:
+            id: WoodTrimThinInnerSwWhite
+            color: '#422E23FF'
+          decals:
+            19: 0,-1
+            70: 0,-1
+            87: 0,-5
+            203: 0,-5
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#281E18FF'
+          decals:
+            213: 3,-7
+            214: 3,-6
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#422E23FF'
+          decals:
+            66: 3,-2
+            67: 3,-5
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#DE3A3A41'
+          decals:
+            362: 7,-16
+            364: 8,-14
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#281E18FF'
+          decals:
+            210: 1,-8
+            211: 2,-8
+            215: 0,-8
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#422E23FF'
+          decals:
+            62: 0,-1
+            63: 1,-1
+            64: 2,-1
+            65: 3,-1
+            180: 2,-5
+            181: 1,-5
+            199: 0,-5
+            265: 0,-2
+            266: 1,-2
+            267: 2,-2
+            268: 3,-2
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#DE3A3A41'
+          decals:
+            327: 5,-13
+            328: 6,-13
+            329: 7,-13
+            330: 8,-13
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#422E23FF'
+          decals:
+            18: 0,-2
+            101: 0,-6
+            103: 0,-7
+            104: 0,-8
+            247: 0,-8
+            270: 0,-2
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#DE3A3A41'
+          decals:
+            356: 5,-16
+            360: 6,-14
+  - uid: 1587
+    components:
+    - type: ChunkEntity
+      root: 2
+    - type: DecalChunk
+      maxDecalId: 767
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            650: 14,2
+            667: 3,4
+            675: 7,4
+            676: 11,4
+        - node:
+            id: BrickTileDarkCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            77: 3,1
+            224: 13,3
+            227: 8,3
+        - node:
+            id: BrickTileDarkCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            73: 0,1
+            222: 6,3
+            223: 11,3
+        - node:
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            481: 1,4
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            391: 13,3
+            392: 8,3
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            84: 0,0
+        - node:
+            zIndex: 1
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            387: 6,3
+            388: 11,3
+        - node:
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            239: 6,3
+            240: 11,3
+            479: 1,4
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            86: 0,0
+            245: 8,3
+            246: 13,3
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            83: 3,0
+            165: 13,0
+            166: 13,1
+            167: 13,2
+            169: 8,0
+            170: 8,1
+            171: 8,2
+            173: 6,2
+            174: 6,1
+            175: 6,0
+            178: 11,0
+            179: 11,2
+            198: 11,1
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            78: 1,1
+            79: 2,1
+            114: 7,3
+            115: 12,3
+            262: 10,3
+            263: 9,3
+            264: 5,3
+            475: 0,3
+            476: 0,3
+            477: 0,3
+            478: 1,3
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            124: 7,3
+            125: 12,3
+            376: 13,5
+            377: 12,5
+            378: 10,5
+            379: 11,5
+            380: 9,5
+            381: 8,5
+            382: 7,5
+            383: 6,5
+            384: 5,5
+            469: 0,5
+            470: 1,5
+        - node:
+            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            141: 6,0
+            142: 6,1
+            143: 6,2
+            145: 8,0
+            146: 8,1
+            147: 8,2
+            149: 13,0
+            150: 13,1
+            151: 13,2
+            194: 11,0
+            195: 11,0
+            196: 11,1
+            197: 11,2
+            666: 2,4
+        - node:
+            id: BrickTileSteelBox
+            color: '#FFFFFFFF'
+          decals:
+            612: 4,4
+        - node:
+            id: BrickTileSteelCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            442: 3,5
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#FFFFFFFF'
+          decals:
+            441: 3,3
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            455: 3,4
+            457: 2,5
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            458: 2,5
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            456: 3,4
+        - node:
+            id: BrickTileSteelLineN
+            color: '#FFFFFFFF'
+          decals:
+            462: 0,5
+            463: 1,5
+        - node:
+            id: BrickTileSteelLineS
+            color: '#FFFFFFFF'
+          decals:
+            450: 0,3
+            451: 0,3
+            452: 1,3
+            453: 2,3
+            454: 2,3
+        - node:
+            id: Caution
+            color: '#FFFFFFFF'
+            angle: 4.71238898038469 rad
+          decals:
+            661: 13.595629,2.003996
+        - node:
+            zIndex: 1
+            id: FlowersBROne
+            color: '#FFFFFFFF'
+          decals:
+            405: 6.8216906,10.010503
+        - node:
+            zIndex: 1
+            id: FlowersBRThree
+            color: '#FFFFFFFF'
+          decals:
+            406: 11.132726,9.995637
+            408: 5.9594836,5.9358044
+        - node:
+            zIndex: 1
+            id: FlowersBRTwo
+            color: '#FFFFFFFF'
+          decals:
+            407: 12.128723,5.903023
+        - node:
+            zIndex: 1
+            id: Flowerspv1
+            color: '#FFFFFFFF'
+          decals:
+            416: 11.146828,5.949858
+        - node:
+            zIndex: 1
+            id: Flowerspv2
+            color: '#FFFFFFFF'
+          decals:
+            409: 6.47978,5.9506707
+            415: 12.12796,10.008332
+            417: 11.205407,9.958935
+        - node:
+            zIndex: 1
+            id: Flowerspv3
+            color: '#FFFFFFFF'
+          decals:
+            410: 6.34599,10.052931
+        - node:
+            zIndex: 1
+            id: Flowersy1
+            color: '#FFFFFFFF'
+          decals:
+            401: 5.9743495,10.0997
+        - node:
+            zIndex: 1
+            id: Flowersy2
+            color: '#FFFFFFFF'
+          decals:
+            402: 11.786814,10.02537
+        - node:
+            zIndex: 1
+            id: Flowersy3
+            color: '#FFFFFFFF'
+          decals:
+            403: 6.9257503,5.937163
+        - node:
+            zIndex: 1
+            id: Flowersy4
+            color: '#FFFFFFFF'
+          decals:
+            404: 11.311113,5.9074306
+        - node:
+            id: Grassd2
+            color: '#FFFFFFFF'
+          decals:
+            643: 6.818325,5.9747634
+        - node:
+            id: Grassd3
+            color: '#FFFFFFFF'
+          decals:
+            642: 6.08395,6.0060134
+            644: 11.4277,6.0685134
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            767: 15,2
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            749: 15,2
+        - node:
+            id: WoodTrimThinCornerNeWhite
+            color: '#4B362BFF'
+          decals:
+            302: 7,9
+            303: 12,9
+        - node:
+            id: WoodTrimThinCornerNwWhite
+            color: '#4B362BFF'
+          decals:
+            304: 6,9
+            305: 11,9
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#4B362BFF'
+          decals:
+            306: 12,7
+            307: 7,7
+        - node:
+            id: WoodTrimThinCornerSwWhite
+            color: '#4B362BFF'
+          decals:
+            308: 6,7
+            309: 11,7
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#4B362BFF'
+          decals:
+            310: 12,8
+            311: 7,8
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#4B362BFF'
+          decals:
+            312: 6,8
+            313: 11,8
+  - uid: 1588
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 0,-2
+    - type: DecalChunk
+      maxDecalId: 759
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            652: 14,-23
+        - node:
+            id: Bot
+            color: '#9FED5895'
+          decals:
+            684: 2,-19
+        - node:
+            id: BrickTileDarkBox
+            color: '#FFFFFFFF'
+          decals:
+            653: 11,-31
+            654: 11,-27
+        - node:
+            id: BrickTileDarkEndN
+            color: '#FFFFFFFF'
+          decals:
+            604: 9,-17
+            605: 9,-21
+        - node:
+            id: BrickTileDarkEndS
+            color: '#FFFFFFFF'
+          decals:
+            602: 9,-23
+            603: 9,-19
+        - node:
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            596: 11,-21
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            595: 11,-21
+        - node:
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            600: 11,-19
+            601: 11,-24
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            598: 11,-24
+            599: 11,-19
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            580: 10,-24
+            581: 10,-23
+            582: 10,-22
+            583: 10,-21
+            584: 10,-19
+            585: 10,-19
+            586: 10,-18
+            587: 10,-17
+            588: 10,-17
+            608: 9,-18
+            609: 9,-22
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            592: 11,-25
+            593: 11,-20
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            591: 11,-20
+        - node:
+            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            572: 12,-17
+            573: 12,-17
+            574: 12,-18
+            575: 12,-19
+            576: 12,-21
+            577: 12,-22
+            578: 12,-22
+            579: 12,-24
+            606: 9,-22
+            607: 9,-18
+            645: 12,-23
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#FFFFFFFF'
+          decals:
+            555: 12,-26
+        - node:
+            id: BrickTileSteelCornerSw
+            color: '#FFFFFFFF'
+          decals:
+            554: 10,-26
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            566: 11,-26
+        - node:
+            id: BrickTileSteelInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            567: 11,-26
+        - node:
+            id: BrickTileSteelLineE
+            color: '#FFFFFFFF'
+          decals:
+            556: 12,-25
+            557: 12,-24
+            558: 12,-22
+            559: 12,-22
+            560: 12,-21
+            561: 12,-20
+            562: 12,-19
+            563: 12,-18
+            564: 12,-17
+            646: 12,-23
+        - node:
+            id: BrickTileSteelLineW
+            color: '#FFFFFFFF'
+          decals:
+            536: 10,-23
+            537: 10,-24
+            538: 10,-24
+            539: 10,-25
+            540: 10,-23
+            541: 10,-22
+            542: 10,-21
+            543: 10,-21
+            544: 10,-20
+            545: 10,-19
+            546: 10,-18
+            547: 10,-18
+            548: 10,-17
+        - node:
+            id: Caution
+            color: '#FFFFFFFF'
+            angle: 4.71238898038469 rad
+          decals:
+            665: 13.600033,-23.005238
+        - node:
+            id: CheckerNESW
+            color: '#9FED585D'
+          decals:
+            745: 3,-22
+            746: 3,-21
+        - node:
+            id: MiniTileDarkEndE
+            color: '#FFFFFFFF'
+          decals:
+            685: 2,-17
+        - node:
+            id: MiniTileDarkEndW
+            color: '#FFFFFFFF'
+          decals:
+            688: 0,-17
+        - node:
+            id: MiniTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            742: 1,-17
+        - node:
+            id: MiniTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            740: 1,-17
+        - node:
+            id: MiniTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            732: 3,-17
+        - node:
+            id: MiniTileLineOverlayS
+            color: '#639137FF'
+          decals:
+            624: 0,-18
+            625: 1,-18
+            626: 2,-18
+            627: 3,-18
+        - node:
+            id: WarnLineE
+            color: '#FFFFFFFF'
+          decals:
+            655: 11,-30
+            656: 11,-29
+            657: 11,-28
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            759: 15,-23
+        - node:
+            id: WarnLineS
+            color: '#FFFFFFFF'
+          decals:
+            658: 11,-30
+            659: 11,-29
+            660: 11,-28
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            757: 15,-23
+        - node:
+            id: WoodTrimThinCornerNeWhite
+            color: '#4B362BFF'
+          decals:
+            725: 1,-19
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#4B362BFF'
+          decals:
+            727: 1,-22
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#DE3A3A41'
+          decals:
+            347: 7,-17
+        - node:
+            id: WoodTrimThinCornerSwWhite
+            color: '#DE3A3A41'
+          decals:
+            354: 5,-17
+        - node:
+            id: WoodTrimThinInnerNeWhite
+            color: '#4B362BFF'
+          decals:
+            731: 1,-19
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#4B362BFF'
+          decals:
+            733: 1,-22
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#4B362BFF'
+          decals:
+            736: 1,-22
+        - node:
+            id: WoodTrimThinInnerSwWhite
+            color: '#4B362BFF'
+          decals:
+            737: 1,-19
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#4B362BFF'
+          decals:
+            722: 1,-21
+            723: 1,-20
+        - node:
+            id: WoodTrimThinLineNWhite
+            color: '#4B362BFF'
+          decals:
+            709: 0,-22
+            710: 0,-19
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#4B362BFF'
+          decals:
+            696: 0,-22
+            704: 0,-19
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#DE3A3A41'
+          decals:
+            363: 6,-17
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#4B362BFF'
+          decals:
+            715: 1,-21
+            716: 1,-20
+  - uid: 1589
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: -1,0
+    - type: DecalChunk
+      maxDecalId: 793
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            681: -4,4
+        - node:
+            id: BrickTileDarkBox
+            color: '#FFFFFFFF'
+          decals:
+            47: -1,0
+            614: -3,6
+            615: -3,2
+            769: -5,0
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            480: -2,4
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            482: -2,4
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            88: -1,0
+            471: -3,4
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            472: -2,3
+            473: -2,3
+            474: -1,3
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            466: -2,5
+            467: -1,5
+            468: -1,5
+        - node:
+            id: BrickTileSteelBox
+            color: '#FFFFFFFF'
+          decals:
+            640: -5,4
+        - node:
+            id: BrickTileSteelCornerNe
+            color: '#00FFFFFF'
+          decals:
+            331: -2,13
+        - node:
+            id: BrickTileSteelCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            443: -4,5
+        - node:
+            id: BrickTileSteelCornerSe
+            color: '#00FFFFFF'
+          decals:
+            339: -2,7
+        - node:
+            id: BrickTileSteelCornerSw
+            color: '#FFFFFFFF'
+          decals:
+            440: -4,3
+        - node:
+            id: BrickTileSteelEndW
+            color: '#00FFFFFF'
+          decals:
+            411: -6,7
+            412: -6,9
+            413: -6,11
+            414: -6,13
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            445: -3,5
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#00FFFFFF'
+          decals:
+            357: -4,11
+            358: -4,9
+            359: -4,7
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            444: -3,5
+            447: -4,4
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#00FFFFFF'
+          decals:
+            361: -3,7
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            465: -3,3
+        - node:
+            id: BrickTileSteelInnerSw
+            color: '#00FFFFFF'
+          decals:
+            340: -3,7
+            341: -4,9
+            342: -4,11
+            343: -4,13
+        - node:
+            id: BrickTileSteelInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            446: -4,4
+            464: -3,3
+        - node:
+            id: BrickTileSteelLineE
+            color: '#00FFFFFF'
+          decals:
+            332: -2,12
+            333: -2,11
+            334: -2,10
+            335: -2,9
+            336: -2,9
+            337: -2,8
+        - node:
+            id: BrickTileSteelLineN
+            color: '#00FFFFFF'
+          decals:
+            323: -6,13
+            324: -5,13
+            325: -4,13
+            326: -3,13
+            348: -6,7
+            349: -5,7
+            350: -6,9
+            351: -5,9
+            352: -6,11
+            353: -5,11
+        - node:
+            id: BrickTileSteelLineN
+            color: '#FFFFFFFF'
+          decals:
+            459: -2,5
+            460: -1,5
+            461: -1,5
+        - node:
+            id: BrickTileSteelLineS
+            color: '#00FFFFFF'
+          decals:
+            314: -6,7
+            315: -5,7
+            316: -4,7
+            317: -6,9
+            318: -5,9
+            319: -6,11
+            320: -5,11
+            321: -6,13
+            322: -5,13
+        - node:
+            id: BrickTileSteelLineS
+            color: '#FFFFFFFF'
+          decals:
+            448: -2,3
+            449: -1,3
+        - node:
+            id: BrickTileSteelLineW
+            color: '#00FFFFFF'
+          decals:
+            345: -4,10
+            346: -4,8
+            355: -4,12
+        - node:
+            zIndex: 1
+            id: MiniTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            780: -9,1
+            781: -8,1
+            782: -7,1
+            783: -6,1
+            784: -6,0
+            785: -7,0
+            786: -8,0
+            787: -9,0
+            788: -9,0
+        - node:
+            zIndex: 1
+            id: MiniTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            789: -9,0
+            790: -8,0
+            791: -7,0
+            792: -6,0
+            793: -6,0
+        - node:
+            id: WoodTrimThinCornerNeWhite
+            color: '#422E23FF'
+          decals:
+            25: -2,1
+        - node:
+            id: WoodTrimThinCornerNwWhite
+            color: '#422E23FF'
+          decals:
+            26: -4,1
+        - node:
+            id: WoodTrimThinInnerNeWhite
+            color: '#422E23FF'
+          decals:
+            27: -3,1
+            38: -2,0
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#422E23FF'
+          decals:
+            28: -3,1
+            29: -4,0
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#422E23FF'
+          decals:
+            36: -2,0
+        - node:
+            id: WoodTrimThinInnerSwWhite
+            color: '#422E23FF'
+          decals:
+            30: -4,0
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#422E23FF'
+          decals:
+            93: -1,0
+  - uid: 1590
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: -1,-1
+    - type: DecalChunk
+      maxDecalId: 805
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: Arrows
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            682: -4,-11
+        - node:
+            id: ArrowsGreyscale
+            color: '#FFFFFFFF'
+            angle: 1.5707963267948966 rad
+          decals:
+            677: -6,-4
+            678: -8,-4
+        - node:
+            id: BrickLineOverlayE
+            color: '#3EB38896'
+          decals:
+            528: -9,-11
+        - node:
+            id: BrickLineOverlayN
+            color: '#3EB38896'
+          decals:
+            525: -8,-12
+            526: -7,-12
+        - node:
+            id: BrickLineOverlayS
+            color: '#3EB38896'
+          decals:
+            529: -8,-10
+            530: -7,-10
+        - node:
+            id: BrickLineOverlayW
+            color: '#3EB38896'
+          decals:
+            527: -6,-11
+        - node:
+            id: BrickTileDarkBox
+            color: '#FFFFFFFF'
+          decals:
+            430: -5,-11
+            484: -2,-13
+            641: -3,-9
+        - node:
+            id: BrickTileDarkCornerNe
+            color: '#FFFFFFFF'
+          decals:
+            432: -6,-10
+        - node:
+            id: BrickTileDarkCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            431: -9,-10
+        - node:
+            id: BrickTileDarkCornerSe
+            color: '#FFFFFFFF'
+          decals:
+            433: -6,-12
+        - node:
+            id: BrickTileDarkCornerSw
+            color: '#FFFFFFFF'
+          decals:
+            434: -9,-12
+        - node:
+            id: BrickTileDarkInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            439: -6,-11
+        - node:
+            id: BrickTileDarkInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            521: -2,-11
+        - node:
+            id: BrickTileDarkInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            438: -6,-11
+        - node:
+            id: BrickTileDarkInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            524: -2,-11
+        - node:
+            id: BrickTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            515: -3,-11
+        - node:
+            id: BrickTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            428: -8,-10
+            429: -7,-10
+            517: -2,-12
+            518: -1,-12
+        - node:
+            id: BrickTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            436: -8,-12
+            437: -7,-12
+            511: -2,-10
+            512: -1,-10
+        - node:
+            id: BrickTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            435: -9,-11
+        - node:
+            id: BrickTileSteelBox
+            color: '#FFFFFFFF'
+          decals:
+            483: -5,-11
+        - node:
+            id: BrickTileSteelCornerNw
+            color: '#FFFFFFFF'
+          decals:
+            505: -4,-10
+        - node:
+            id: BrickTileSteelCornerSw
+            color: '#FFFFFFFF'
+          decals:
+            485: -4,-12
+        - node:
+            id: BrickTileSteelInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            426: -7,-11
+            507: -3,-10
+        - node:
+            id: BrickTileSteelInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            427: -8,-11
+            487: -4,-11
+            506: -3,-10
+        - node:
+            id: BrickTileSteelInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            424: -7,-11
+            510: -2,-12
+        - node:
+            id: BrickTileSteelInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            425: -8,-11
+            488: -4,-11
+            509: -2,-12
+        - node:
+            id: BrickTileSteelLineE
+            color: '#FFFFFFFF'
+          decals:
+            418: -9,-11
+        - node:
+            id: BrickTileSteelLineN
+            color: '#FFFFFFFF'
+          decals:
+            422: -8,-12
+            423: -7,-12
+            497: -2,-10
+            498: -1,-10
+            508: -2,-13
+        - node:
+            id: BrickTileSteelLineS
+            color: '#FFFFFFFF'
+          decals:
+            419: -8,-10
+            420: -7,-10
+            491: -1,-12
+            496: -3,-12
+        - node:
+            id: BrickTileSteelLineW
+            color: '#FFFFFFFF'
+          decals:
+            421: -6,-11
+        - node:
+            id: Bushh3
+            color: '#FFFFFFFF'
+          decals:
+            282: -5.001849,-7.7211533
+        - node:
+            id: Bushk1
+            color: '#FFFFFFFF'
+          decals:
+            284: -4.954974,-6.7836533
+        - node:
+            id: Bushk2
+            color: '#FFFFFFFF'
+          decals:
+            285: -1.0018489,-7.1586533
+        - node:
+            id: Bushm4
+            color: '#FFFFFFFF'
+          decals:
+            286: -1.0330989,-5.9242783
+        - node:
+            id: ConcreteTrimCornerNe
+            color: '#422E23FF'
+          decals:
+            292: -4,-4
+        - node:
+            id: ConcreteTrimCornerSe
+            color: '#422E23FF'
+          decals:
+            293: -3,-3
+        - node:
+            id: ConcreteTrimCornerSw
+            color: '#422E23FF'
+          decals:
+            291: -2,-4
+        - node:
+            id: ConcreteTrimInnerNw
+            color: '#422E23FF'
+          decals:
+            295: -3,-4
+        - node:
+            id: ConcreteTrimInnerSe
+            color: '#422E23FF'
+          decals:
+            294: -3,-4
+        - node:
+            id: Dirt
+            color: '#FFFFFFFF'
+            cleanable: True
+          decals:
+            805: -9,-16
+        - node:
+            id: DirtHeavyMonotile
+            color: '#FFFFFFFF'
+            cleanable: True
+          decals:
+            803: -9,-16
+        - node:
+            id: FlowersBRThree
+            color: '#FFFFFFFF'
+          decals:
+            24: -0.9850607,-1.9918964
+        - node:
+            id: Flowersbr1
+            color: '#FFFFFFFF'
+          decals:
+            274: -4.986224,-6.3617783
+        - node:
+            id: Flowerspv1
+            color: '#FFFFFFFF'
+          decals:
+            23: -5.0475607,-1.9762714
+        - node:
+            id: Flowersy1
+            color: '#FFFFFFFF'
+          decals:
+            279: -0.98622394,-6.4242783
+        - node:
+            id: Flowersy3
+            color: '#FFFFFFFF'
+          decals:
+            278: -0.98622394,-7.9711533
+        - node:
+            id: Grassc1
+            color: '#FFFFFFFF'
+          decals:
+            21: -5.0006857,-1.9450214
+            273: -5.017474,-7.9711533
+            276: -1.0330989,-6.1274033
+        - node:
+            id: Grassd1
+            color: '#FFFFFFFF'
+          decals:
+            271: -5.001849,-6.1742783
+        - node:
+            id: Grassd2
+            color: '#FFFFFFFF'
+          decals:
+            277: -1.0174739,-7.9242783
+        - node:
+            id: Grassd3
+            color: '#FFFFFFFF'
+          decals:
+            20: -5.0319357,-1.9450214
+            272: -5.017474,-6.9711533
+            275: -1.0487239,-7.0649033
+        - node:
+            id: Grasse3
+            color: '#FFFFFFFF'
+          decals:
+            22: -1.0163107,-1.9293964
+        - node:
+            id: GrayConcreteTrimInnerNe
+            color: '#FFFFFFFF'
+          decals:
+            1: -6,-3
+            5: -2,-3
+        - node:
+            id: GrayConcreteTrimInnerNw
+            color: '#FFFFFFFF'
+          decals:
+            3: -4,-3
+        - node:
+            id: GrayConcreteTrimInnerSe
+            color: '#FFFFFFFF'
+          decals:
+            35: -2,-1
+            46: -6,-5
+            201: -6,-5
+            778: -2,-5
+        - node:
+            id: GrayConcreteTrimInnerSw
+            color: '#FFFFFFFF'
+          decals:
+            32: -4,-1
+            49: -4,-5
+        - node:
+            id: GrayConcreteTrimLineE
+            color: '#FFFFFFFF'
+          decals:
+            8: -2,-2
+            43: -2,-8
+            44: -2,-7
+            45: -2,-6
+            94: -6,-6
+            95: -6,-7
+            106: -2,-8
+            251: -6,-8
+        - node:
+            id: GrayConcreteTrimLineN
+            color: '#FFFFFFFF'
+          decals:
+            2: -5,-3
+            6: -1,-3
+        - node:
+            id: GrayConcreteTrimLineS
+            color: '#FFFFFFFF'
+          decals:
+            48: -5,-5
+            52: -1,-5
+        - node:
+            id: GrayConcreteTrimLineW
+            color: '#FFFFFFFF'
+          decals:
+            0: -4,-2
+            53: -4,-6
+            54: -4,-7
+            55: -4,-8
+            107: -4,-8
+        - node:
+            id: MiniTileBoxOverlay
+            color: '#FFFFFFA4'
+          decals:
+            616: -7,-16
+            617: -7,-15
+        - node:
+            id: MiniTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            690: -1,-16
+            691: -1,-15
+            724: -3,-16
+            743: -1,-14
+        - node:
+            zIndex: 1
+            id: MiniTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            794: -6,-1
+            795: -8,-1
+            796: -9,-1
+            797: -7,-1
+        - node:
+            id: MiniTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            698: -3,-16
+            699: -3,-15
+            717: -1,-16
+            744: -3,-14
+        - node:
+            id: MiniTileInnerOverlayNE
+            color: '#3EB38896'
+          decals:
+            532: -7,-11
+        - node:
+            id: MiniTileInnerOverlayNW
+            color: '#3EB38896'
+          decals:
+            531: -8,-11
+        - node:
+            id: MiniTileInnerOverlaySE
+            color: '#3EB38896'
+          decals:
+            534: -7,-11
+        - node:
+            id: MiniTileInnerOverlaySW
+            color: '#3EB38896'
+          decals:
+            533: -8,-11
+        - node:
+            id: MiniTileLineOverlayE
+            color: '#FFFFFF5D'
+          decals:
+            634: -3,-15
+            635: -3,-14
+        - node:
+            id: MiniTileLineOverlayW
+            color: '#639137FF'
+          decals:
+            620: -1,-14
+            621: -1,-15
+        - node:
+            zIndex: 1
+            id: OldConcreteTrimCornerNw
+            color: '#5C473CFF'
+          decals:
+            777: -3,-5
+        - node:
+            id: WoodTrimThinCornerNeWhite
+            color: '#422E23FF'
+          decals:
+            280: -4,-5
+        - node:
+            id: WoodTrimThinCornerNwWhite
+            color: '#463126FF'
+          decals:
+            770: -2,-5
+        - node:
+            id: WoodTrimThinCornerSeWhite
+            color: '#422E23FF'
+          decals:
+            281: -4,-3
+        - node:
+            id: WoodTrimThinCornerSwWhite
+            color: '#281E18FF'
+          decals:
+            207: -9,-8
+        - node:
+            id: WoodTrimThinCornerSwWhite
+            color: '#422E23FF'
+          decals:
+            192: -9,-5
+            283: -2,-3
+        - node:
+            id: WoodTrimThinInnerNeWhite
+            color: '#422E23FF'
+          decals:
+            13: -6,-3
+            14: -2,-3
+            299: -3,-3
+            300: -2,-4
+        - node:
+            zIndex: 1
+            id: WoodTrimThinInnerNeWhite
+            color: '#463126FF'
+          decals:
+            776: -4,-5
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#422E23FF'
+          decals:
+            11: -4,-3
+            39: -9,-3
+            297: -3,-3
+            298: -4,-4
+        - node:
+            zIndex: 1
+            id: WoodTrimThinInnerNwWhite
+            color: '#463126FF'
+          decals:
+            775: -2,-5
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#422E23FF'
+          decals:
+            37: -2,-1
+            69: -6,-5
+            119: -3,-8
+            204: -6,-5
+            301: -2,-4
+        - node:
+            zIndex: 1
+            id: WoodTrimThinInnerSeWhite
+            color: '#463126FF'
+          decals:
+            772: -3,-5
+            773: -4,-3
+            779: -2,-5
+        - node:
+            id: WoodTrimThinInnerSwWhite
+            color: '#422E23FF'
+          decals:
+            33: -4,-1
+            40: -9,-4
+            72: -4,-5
+            116: -3,-8
+            296: -4,-4
+        - node:
+            zIndex: 1
+            id: WoodTrimThinInnerSwWhite
+            color: '#463126FF'
+          decals:
+            771: -3,-5
+            774: -2,-3
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#422E23FF'
+          decals:
+            17: -2,-2
+            34: -2,-1
+            80: -2,-8
+            81: -2,-7
+            82: -2,-6
+            99: -6,-6
+            100: -6,-7
+            108: -2,-8
+            252: -6,-8
+            289: -5,-4
+        - node:
+            id: WoodTrimThinLineNWhite
+            color: '#422E23FF'
+          decals:
+            10: -5,-3
+            16: -1,-3
+            287: -3,-6
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#281E18FF'
+          decals:
+            208: -8,-8
+            209: -7,-8
+            250: -6,-8
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#422E23FF'
+          decals:
+            71: -5,-5
+            85: -1,-5
+            102: -4,-8
+            105: -2,-8
+            186: -8,-5
+            187: -7,-5
+            200: -6,-5
+            290: -3,-2
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#281E18FF'
+          decals:
+            205: -9,-6
+            206: -9,-7
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#422E23FF'
+          decals:
+            12: -4,-2
+            31: -4,-1
+            74: -4,-6
+            75: -4,-7
+            76: -4,-8
+            110: -4,-8
+            288: -1,-4
+  - uid: 1591
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: -1,-2
+    - type: DecalChunk
+      maxDecalId: 806
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: BotGreyscale
+            color: '#FFFFFFFF'
+          decals:
+            683: -6,-19
+        - node:
+            id: CheckerNWSE
+            color: '#FFFFFFFF'
+          decals:
+            747: -7,-22
+            748: -7,-21
+        - node:
+            id: Dirt
+            color: '#FFFFFFFF'
+            cleanable: True
+          decals:
+            804: -9,-17
+            806: -9,-17
+        - node:
+            id: DirtHeavy
+            color: '#FFFFFFFF'
+            cleanable: True
+          decals:
+            802: -9,-17
+        - node:
+            id: MiniTileCornerOverlaySE
+            color: '#FFFFFF5D'
+          decals:
+            632: -3,-18
+        - node:
+            id: MiniTileCornerOverlaySW
+            color: '#639137FF'
+          decals:
+            623: -1,-18
+        - node:
+            id: MiniTileDarkEndE
+            color: '#FFFFFFFF'
+          decals:
+            687: -4,-17
+        - node:
+            id: MiniTileDarkEndW
+            color: '#FFFFFFFF'
+          decals:
+            686: -6,-17
+        - node:
+            id: MiniTileDarkLineE
+            color: '#FFFFFFFF'
+          decals:
+            689: -1,-17
+            730: -7,-17
+        - node:
+            id: MiniTileDarkLineN
+            color: '#FFFFFFFF'
+          decals:
+            741: -5,-17
+        - node:
+            id: MiniTileDarkLineS
+            color: '#FFFFFFFF'
+          decals:
+            739: -5,-17
+        - node:
+            id: MiniTileDarkLineW
+            color: '#FFFFFFFF'
+          decals:
+            697: -3,-17
+        - node:
+            id: MiniTileLineOverlayE
+            color: '#FFFFFF5D'
+          decals:
+            633: -3,-17
+        - node:
+            id: MiniTileLineOverlayS
+            color: '#FFFFFF5D'
+          decals:
+            628: -7,-18
+            629: -6,-18
+            630: -5,-18
+            631: -4,-18
+        - node:
+            id: MiniTileLineOverlayW
+            color: '#639137FF'
+          decals:
+            622: -1,-17
+        - node:
+            id: WoodTrimThinCornerNwWhite
+            color: '#4B362BFF'
+          decals:
+            726: -5,-19
+        - node:
+            id: WoodTrimThinCornerSwWhite
+            color: '#4B362BFF'
+          decals:
+            728: -5,-22
+        - node:
+            id: WoodTrimThinInnerNeWhite
+            color: '#4B362BFF'
+          decals:
+            729: -5,-22
+        - node:
+            id: WoodTrimThinInnerNwWhite
+            color: '#4B362BFF'
+          decals:
+            734: -5,-19
+        - node:
+            id: WoodTrimThinInnerSeWhite
+            color: '#4B362BFF'
+          decals:
+            735: -5,-19
+        - node:
+            id: WoodTrimThinInnerSwWhite
+            color: '#4B362BFF'
+          decals:
+            738: -5,-22
+        - node:
+            id: WoodTrimThinLineEWhite
+            color: '#4B362BFF'
+          decals:
+            720: -5,-21
+            721: -5,-20
+        - node:
+            id: WoodTrimThinLineNWhite
+            color: '#4B362BFF'
+          decals:
+            705: -4,-22
+            706: -3,-22
+            707: -2,-22
+            708: -1,-22
+            711: -1,-19
+            712: -2,-19
+            713: -3,-19
+            714: -4,-19
+        - node:
+            id: WoodTrimThinLineSWhite
+            color: '#4B362BFF'
+          decals:
+            692: -4,-22
+            693: -3,-22
+            694: -2,-22
+            695: -1,-22
+            700: -4,-19
+            701: -3,-19
+            702: -2,-19
+            703: -1,-19
+        - node:
+            id: WoodTrimThinLineWWhite
+            color: '#4B362BFF'
+          decals:
+            718: -5,-21
+            719: -5,-20
+        - node:
+            id: splatter
+            color: '#57121292'
+            cleanable: True
+          decals:
+            800: -9.013203,-16.087303
+            801: -9.060078,-16.212303
+        - node:
+            id: splatter
+            color: '#9B000066'
+            cleanable: True
+          decals:
+            798: -9.075703,-16.024803
+            799: -8.825703,-16.196678
+  - uid: 1592
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 1,-2
+    - type: DecalChunk
+      maxDecalId: 760
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            760: 16,-23
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            758: 16,-23
+  - uid: 1593
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 1,-1
+    - type: DecalChunk
+      maxDecalId: 766
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            762: 16,-15
+            764: 16,-9
+            766: 16,-2
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            752: 16,-2
+            754: 16,-9
+            756: 16,-15
+  - uid: 1594
+    components:
+    - type: ChunkEntity
+      root: 2
+      chunk: 1,0
+    - type: DecalChunk
+      maxDecalId: 768
+      decals:
+        version: 1
+        nodes:
+        - node:
+            id: WarnLineN
+            color: '#FFFFFFFF'
+          decals:
+            768: 16,2
+        - node:
+            id: WarnLineW
+            color: '#FFFFFFFF'
+          decals:
+            750: 16,2
 - proto: CigaretteLicoxide
   entities:
   - uid: 1
     components:
     - type: Transform
-      pos: -1.6795454,12.353031
       parent: 2
+      pos: -1.6795454,12.353031
 - proto: CigaretteMold
   entities:
   - uid: 413
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.691752,12.017473
-      parent: 2
 - proto: CigaretteSpent
   entities:
   - uid: 414
     components:
     - type: Transform
-      pos: -1.70616,12.589549
       parent: 2
+      pos: -1.70616,12.589549
   - uid: 415
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.378035,12.433299
-      parent: 2
   - uid: 416
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.315535,12.433299
-      parent: 2
 - proto: ClothingBeltQuiver
   entities:
   - uid: 92
@@ -4249,8 +4840,8 @@ entities:
   - uid: 420
     components:
     - type: Transform
-      pos: 1.321607,-25.619549
       parent: 2
+      pos: 1.321607,-25.619549
 - proto: ClothingHeadHatTacticalMaidHeadband
   entities:
   - uid: 93
@@ -4290,8 +4881,8 @@ entities:
   - uid: 425
     components:
     - type: Transform
-      pos: -6.765032,-16.31055
       parent: 2
+      pos: -6.765032,-16.31055
 - proto: ClothingOuterWinterEngi
   entities:
   - uid: 426
@@ -4299,8 +4890,8 @@ entities:
     - type: MetaData
       name: коричневая зимняя куртка
     - type: Transform
-      pos: -6.793171,-17.483648
       parent: 2
+      pos: -6.793171,-17.483648
 - proto: ClothingOuterWinterGen
   entities:
   - uid: 427
@@ -4308,22 +4899,22 @@ entities:
     - type: MetaData
       name: бело-синяя зимняя куртка
     - type: Transform
-      pos: -6.786134,-16.921467
       parent: 2
+      pos: -6.786134,-16.921467
 - proto: ClothingShoesBootsLaceup
   entities:
   - uid: 428
     components:
     - type: Transform
-      pos: 2.352745,-13.342463
       parent: 2
+      pos: 2.352745,-13.342463
 - proto: ClothingShoesBootsWinter
   entities:
   - uid: 429
     components:
     - type: Transform
-      pos: -5.3679223,-13.595501
       parent: 2
+      pos: -5.3679223,-13.595501
 - proto: ClothingShoesBootsWinterCargo
   entities:
   - uid: 430
@@ -4331,8 +4922,8 @@ entities:
     - type: MetaData
       name: коричневые зимние ботинки
     - type: Transform
-      pos: -3.6020138,-13.568881
       parent: 2
+      pos: -3.6020138,-13.568881
 - proto: ClothingShoesBootsWinterMed
   entities:
   - uid: 431
@@ -4340,58 +4931,51 @@ entities:
     - type: MetaData
       name: синие зимние ботинки
     - type: Transform
-      pos: -4.5038624,-13.212091
       parent: 2
+      pos: -4.5038624,-13.212091
 - proto: ClothingShoesBootsWork
   entities:
   - uid: 432
     components:
     - type: Transform
-      pos: 1.3232573,-13.656497
       parent: 2
+      pos: 1.3232573,-13.656497
 - proto: ClothingShoesColorBlack
   entities:
   - uid: 433
     components:
     - type: Transform
-      pos: 0.50740063,-13.279211
       parent: 2
+      pos: 0.50740063,-13.279211
 - proto: ClothingShoesColorBlue
   entities:
   - uid: 434
     components:
     - type: Transform
-      pos: 0.4818722,-13.819506
       parent: 2
+      pos: 0.4818722,-13.819506
 - proto: ClothingShoesColorRed
   entities:
   - uid: 435
     components:
     - type: Transform
-      pos: 2.2520154,-13.7933235
       parent: 2
+      pos: 2.2520154,-13.7933235
 - proto: ClothingShoesDameDane
   entities:
   - uid: 436
     components:
     - type: Transform
-      pos: 2.990286,-16.449436
       parent: 2
+      pos: 2.990286,-16.449436
 - proto: ClothingShoesLeather
   entities:
   - uid: 437
     components:
     - type: Transform
+      parent: 2
       pos: 1.5809284,-13.332744
-      parent: 2
-- proto: ClothingShoesSlippers
-  entities:
-  - uid: 438
-    components:
-    - type: Transform
-      pos: 1.727857,-25.275799
-      parent: 2
-- proto: ClothingShoesTourist
+- proto: ClothingShoesSandalsBlack
   entities:
   - uid: 95
     components:
@@ -4400,13 +4984,20 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
+- proto: ClothingShoesSlippers
+  entities:
+  - uid: 438
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.727857,-25.275799
 - proto: ClothingUniformJumpskirtBlackElegantDress
   entities:
   - uid: 419
     components:
     - type: MetaData
-      desc: Элегантное платье с красивым бантом.
       name: чёрное элегантное платье
+      desc: Элегантное платье с красивым бантом.
     - type: Transform
       parent: 417
     - type: Physics
@@ -4414,31 +5005,31 @@ entities:
   - uid: 439
     components:
     - type: MetaData
-      desc: Элегантное платье с красивым бантом.
       name: чёрное элегантное платье.
+      desc: Элегантное платье с красивым бантом.
     - type: Transform
-      pos: 3.8379946,-16.860613
       parent: 2
+      pos: 3.8379946,-16.860613
 - proto: ClothingUniformJumpskirtGreenTurtleneckDress
   entities:
   - uid: 440
     components:
     - type: MetaData
-      desc: Платье с водолазкой и уникальным дизайном.
       name: зелёное платье с водолазкой
+      desc: Платье с водолазкой и уникальным дизайном.
     - type: Transform
-      pos: 3.8496308,-17.384262
       parent: 2
+      pos: 3.8496308,-17.384262
 - proto: ClothingUniformJumpskirtPurpleElegantDress
   entities:
   - uid: 441
     components:
     - type: MetaData
-      desc: Элегантное платье с красивым бантом.
       name: фиолетовое элегантное платье
+      desc: Элегантное платье с красивым бантом.
     - type: Transform
-      pos: 3.8296533,-16.31055
       parent: 2
+      pos: 3.8296533,-16.31055
 - proto: ClothingUniformJumpsuitCasualRed
   entities:
   - uid: 96
@@ -4461,860 +5052,860 @@ entities:
   - uid: 442
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-16.5
-      parent: 2
 - proto: Cobweb2
   entities:
   - uid: 443
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-15.5
-      parent: 2
 - proto: ComfyChair
   entities:
   - uid: 444
     components:
     - type: Transform
-      pos: 6.5,9.5
       parent: 2
+      pos: 6.5,9.5
   - uid: 445
     components:
     - type: Transform
-      pos: 12.5,9.5
       parent: 2
+      pos: 12.5,9.5
   - uid: 446
     components:
     - type: Transform
-      pos: 7.5,9.5
       parent: 2
+      pos: 7.5,9.5
   - uid: 447
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-5.5
-      parent: 2
   - uid: 448
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-6.5
-      parent: 2
   - uid: 449
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,7.5
-      parent: 2
   - uid: 450
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,7.5
-      parent: 2
   - uid: 451
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-7.5
-      parent: 2
   - uid: 452
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-7.5
-      parent: 2
   - uid: 453
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-5.5
-      parent: 2
   - uid: 454
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-7.5
-      parent: 2
   - uid: 455
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-5.5
-      parent: 2
   - uid: 456
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-6.5
-      parent: 2
   - uid: 457
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-7.5
-      parent: 2
   - uid: 458
     components:
     - type: Transform
-      pos: 11.5,9.5
       parent: 2
+      pos: 11.5,9.5
   - uid: 459
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,7.5
-      parent: 2
   - uid: 460
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,7.5
-      parent: 2
   - uid: 461
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-6.5
-      parent: 2
   - uid: 462
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-6.5
-      parent: 2
   - uid: 463
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-5.5
-      parent: 2
   - uid: 464
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,-20.5
-      parent: 2
   - uid: 465
     components:
     - type: Transform
-      pos: -8.5,-11.5
       parent: 2
+      pos: -8.5,-11.5
 - proto: ComputerCriminalRecords
   entities:
   - uid: 466
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-15.5
-      parent: 2
 - proto: ComputerSurveillanceCameraMonitor
   entities:
   - uid: 467
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-14.5
-      parent: 2
 - proto: ConveyorBelt
   entities:
   - uid: 468
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,16.5
-      parent: 2
   - uid: 469
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,16.5
-      parent: 2
   - uid: 470
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,16.5
-      parent: 2
   - uid: 471
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.5,16.5
-      parent: 2
   - uid: 472
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,16.5
-      parent: 2
   - uid: 473
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,16.5
-      parent: 2
 - proto: CowToolboxFilled
   entities:
   - uid: 474
     components:
     - type: Transform
-      pos: -6.457727,-11.454361
       parent: 2
+      pos: -6.457727,-11.454361
 - proto: CrateTrashCartFilled
   entities:
   - uid: 475
     components:
     - type: Transform
-      pos: -5.5,15.5
       parent: 2
+      pos: -5.5,15.5
 - proto: CurtainsWhite
   entities:
   - uid: 476
     components:
     - type: Transform
-      pos: 1.5,-23.5
       parent: 2
+      pos: 1.5,-23.5
 - proto: CurtainsWhiteOpen
   entities:
   - uid: 477
     components:
     - type: Transform
-      pos: -4.5,-23.5
       parent: 2
+      pos: -4.5,-23.5
   - uid: 478
     components:
     - type: Transform
-      pos: -0.5,-23.5
       parent: 2
+      pos: -0.5,-23.5
   - uid: 479
     components:
     - type: Transform
-      pos: -2.5,-23.5
       parent: 2
+      pos: -2.5,-23.5
 - proto: DisposalBend
   entities:
   - uid: 480
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-17.5
-      parent: 2
   - uid: 481
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.5,7.5
-      parent: 2
   - uid: 482
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,16.5
-      parent: 2
   - uid: 483
     components:
     - type: Transform
-      pos: 5.5,4.5
       parent: 2
+      pos: 5.5,4.5
   - uid: 484
     components:
     - type: Transform
-      pos: 11.5,-10.5
       parent: 2
+      pos: 11.5,-10.5
   - uid: 485
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-10.5
-      parent: 2
 - proto: DisposalJunction
   entities:
   - uid: 486
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-7.5
-      parent: 2
   - uid: 487
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,4.5
-      parent: 2
   - uid: 488
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 5.5,-10.5
-      parent: 2
   - uid: 489
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,9.5
-      parent: 2
   - uid: 490
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,7.5
-      parent: 2
 - proto: DisposalJunctionFlipped
   entities:
   - uid: 491
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,1.5
-      parent: 2
   - uid: 492
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,13.5
-      parent: 2
   - uid: 493
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,11.5
-      parent: 2
   - uid: 494
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,9.5
-      parent: 2
   - uid: 495
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,9.5
-      parent: 2
 - proto: DisposalPipe
   entities:
   - uid: 496
     components:
     - type: Transform
-      pos: -2.5,0.5
       parent: 2
+      pos: -2.5,0.5
   - uid: 497
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-3.5
-      parent: 2
   - uid: 498
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,-10.5
-      parent: 2
   - uid: 499
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-4.5
-      parent: 2
   - uid: 500
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,6.5
-      parent: 2
   - uid: 501
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,10.5
-      parent: 2
   - uid: 502
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,15.5
-      parent: 2
   - uid: 503
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-16.5
-      parent: 2
   - uid: 504
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-15.5
-      parent: 2
   - uid: 505
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-14.5
-      parent: 2
   - uid: 506
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-13.5
-      parent: 2
   - uid: 507
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-12.5
-      parent: 2
   - uid: 508
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-11.5
-      parent: 2
   - uid: 509
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,5.5
-      parent: 2
   - uid: 510
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,8.5
-      parent: 2
   - uid: 511
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.5,13.5
-      parent: 2
   - uid: 512
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.5,11.5
-      parent: 2
   - uid: 513
     components:
     - type: Transform
-      pos: -3.5,8.5
       parent: 2
+      pos: -3.5,8.5
   - uid: 514
     components:
     - type: Transform
-      pos: -2.5,-9.5
       parent: 2
+      pos: -2.5,-9.5
   - uid: 515
     components:
     - type: Transform
-      pos: -2.5,-8.5
       parent: 2
+      pos: -2.5,-8.5
   - uid: 516
     components:
     - type: Transform
-      pos: -2.5,-6.5
       parent: 2
+      pos: -2.5,-6.5
   - uid: 517
     components:
     - type: Transform
-      pos: -2.5,-5.5
       parent: 2
+      pos: -2.5,-5.5
   - uid: 518
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-10.5
-      parent: 2
   - uid: 519
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-10.5
-      parent: 2
   - uid: 520
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-10.5
-      parent: 2
   - uid: 521
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,-10.5
-      parent: 2
   - uid: 522
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-10.5
-      parent: 2
   - uid: 523
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 4.5,-10.5
-      parent: 2
   - uid: 524
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 10.5,-10.5
-      parent: 2
   - uid: 525
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-10.5
-      parent: 2
   - uid: 526
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 8.5,-10.5
-      parent: 2
   - uid: 527
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 7.5,-10.5
-      parent: 2
   - uid: 528
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-0.5
-      parent: 2
   - uid: 529
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-1.5
-      parent: 2
   - uid: 530
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-2.5
-      parent: 2
   - uid: 531
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 6.5,-10.5
-      parent: 2
   - uid: 532
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 4.5,4.5
-      parent: 2
   - uid: 533
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,4.5
-      parent: 2
   - uid: 534
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,4.5
-      parent: 2
   - uid: 535
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,4.5
-      parent: 2
   - uid: 536
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,4.5
-      parent: 2
   - uid: 537
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,4.5
-      parent: 2
   - uid: 538
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,4.5
-      parent: 2
   - uid: 539
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,3.5
-      parent: 2
   - uid: 540
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,2.5
-      parent: 2
   - uid: 541
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-17.5
-      parent: 2
   - uid: 542
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,14.5
-      parent: 2
   - uid: 543
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,13.5
-      parent: 2
   - uid: 544
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,11.5
-      parent: 2
   - uid: 545
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,9.5
-      parent: 2
   - uid: 546
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,7.5
-      parent: 2
   - uid: 547
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,12.5
-      parent: 2
 - proto: DisposalTrunk
   entities:
   - uid: 548
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-17.5
-      parent: 2
   - uid: 549
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
-      parent: 2
   - uid: 550
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,7.5
-      parent: 2
   - uid: 551
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,16.5
-      parent: 2
   - uid: 552
     components:
     - type: Transform
-      pos: 5.5,-9.5
       parent: 2
+      pos: 5.5,-9.5
   - uid: 553
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,13.5
-      parent: 2
   - uid: 554
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,11.5
-      parent: 2
   - uid: 555
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,9.5
-      parent: 2
   - uid: 556
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,7.5
-      parent: 2
   - uid: 557
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 5.5,3.5
-      parent: 2
   - uid: 558
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,-7.5
-      parent: 2
 - proto: DisposalUnit
   entities:
   - uid: 559
     components:
     - type: Transform
-      pos: 9.5,-17.5
       parent: 2
+      pos: 9.5,-17.5
   - uid: 560
     components:
     - type: Transform
-      pos: -1.5,7.5
       parent: 2
+      pos: -1.5,7.5
   - uid: 561
     components:
     - type: Transform
-      pos: -3.5,1.5
       parent: 2
+      pos: -3.5,1.5
   - uid: 562
     components:
     - type: Transform
-      pos: 5.5,3.5
       parent: 2
+      pos: 5.5,3.5
   - uid: 563
     components:
     - type: Transform
-      pos: 5.5,-9.5
       parent: 2
+      pos: 5.5,-9.5
   - uid: 564
     components:
     - type: Transform
-      pos: -1.5,-7.5
       parent: 2
+      pos: -1.5,-7.5
 - proto: DrinkBadTouchGlass
   entities:
   - uid: 565
     components:
     - type: Transform
-      pos: 2.7226288,-0.3183478
       parent: 2
+      pos: 2.7226288,-0.3183478
 - proto: DrinkColaCan
   entities:
   - uid: 566
     components:
     - type: Transform
-      pos: -5.311922,-0.20970154
       parent: 2
+      pos: -5.311922,-0.20970154
   - uid: 567
     components:
     - type: Transform
-      pos: -5.4770956,-0.40791774
       parent: 2
+      pos: -5.4770956,-0.40791774
   - uid: 568
     components:
     - type: Transform
-      pos: -5.6800737,-0.25959373
       parent: 2
+      pos: -5.6800737,-0.25959373
 - proto: DrinkGlass
   entities:
   - uid: 569
     components:
     - type: Transform
-      pos: 3.1884108,1.6255958
       parent: 2
+      pos: 3.1884108,1.6255958
   - uid: 570
     components:
     - type: Transform
-      pos: 3.2977858,1.7662208
       parent: 2
+      pos: 3.2977858,1.7662208
   - uid: 571
     components:
     - type: Transform
-      pos: 3.4696608,1.6099708
       parent: 2
+      pos: 3.4696608,1.6099708
   - uid: 572
     components:
     - type: Transform
-      pos: -6.3673034,-20.542006
       parent: 2
+      pos: -6.3673034,-20.542006
   - uid: 573
     components:
     - type: Transform
-      pos: 3.49748,-21.225851
       parent: 2
+      pos: 3.49748,-21.225851
   - uid: 574
     components:
     - type: Transform
-      pos: 3.6521113,-20.442896
       parent: 2
+      pos: 3.6521113,-20.442896
   - uid: 575
     components:
     - type: Transform
-      pos: -6.555601,-21.315048
       parent: 2
+      pos: -6.555601,-21.315048
 - proto: DrinkHotCoffee
   entities:
   - uid: 576
     components:
     - type: Transform
-      pos: 6.602686,8.518019
       parent: 2
+      pos: 6.602686,8.518019
   - uid: 577
     components:
     - type: Transform
-      pos: 7.524561,8.736769
       parent: 2
+      pos: 7.524561,8.736769
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 578
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-0.5
-      parent: 2
   - uid: 579
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-8.5
-      parent: 2
   - uid: 580
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,2.5
-      parent: 2
 - proto: Firelock
   entities:
   - uid: 581
     components:
     - type: Transform
-      pos: -2.5,6.5
       parent: 2
+      pos: -2.5,6.5
     - type: DeviceNetwork
       deviceLists:
       - 6
   - uid: 582
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
       parent: 2
+      rot: 4.71238898038469 rad
+      pos: -0.5,0.5
   - uid: 583
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,2.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -5322,51 +5913,51 @@ entities:
   - uid: 584
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,0.5
       parent: 2
+      rot: 4.71238898038469 rad
+      pos: -4.5,0.5
   - uid: 585
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,-0.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
   - uid: 586
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-0.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
   - uid: 587
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 2.5,-0.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
   - uid: 588
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 0.5,-0.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
   - uid: 589
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-8.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -5374,8 +5965,9 @@ entities:
   - uid: 590
     components:
     - type: Transform
-      pos: -4.5,-10.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-10.5
     - type: DeviceNetwork
       deviceLists:
       - 8
@@ -5383,8 +5975,9 @@ entities:
   - uid: 591
     components:
     - type: Transform
-      pos: -4.5,4.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,4.5
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -5393,8 +5986,8 @@ entities:
   - uid: 592
     components:
     - type: Transform
-      pos: -1.5,-12.5
       parent: 2
+      pos: -1.5,-12.5
     - type: DeviceNetwork
       deviceLists:
       - 3
@@ -5402,17 +5995,17 @@ entities:
   - uid: 593
     components:
     - type: Transform
-      pos: 11.5,-12.5
       parent: 2
+      pos: 11.5,-12.5
     - type: DeviceNetwork
       deviceLists:
       - 7
   - uid: 594
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
       parent: 2
+      rot: 4.71238898038469 rad
+      pos: 4.5,-2.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -5420,9 +6013,9 @@ entities:
   - uid: 595
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-3.5
       parent: 2
+      rot: 4.71238898038469 rad
+      pos: 4.5,-3.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -5430,8 +6023,9 @@ entities:
   - uid: 596
     components:
     - type: Transform
-      pos: 4.5,4.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,4.5
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -5439,8 +6033,9 @@ entities:
   - uid: 597
     components:
     - type: Transform
-      pos: 4.5,-10.5
       parent: 2
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-10.5
     - type: DeviceNetwork
       deviceLists:
       - 3
@@ -5450,15 +6045,15 @@ entities:
   - uid: 598
     components:
     - type: Transform
-      pos: 12.368311,8.596144
       parent: 2
+      pos: 12.368311,8.596144
 - proto: FoodBoxPizzaFilled
   entities:
   - uid: 599
     components:
     - type: Transform
-      pos: -5.4837027,1.7526376
       parent: 2
+      pos: -5.4837027,1.7526376
 - proto: GasMinerNitrogenStationLarge
   entities:
   - uid: 600
@@ -5466,8 +6061,8 @@ entities:
     - type: MetaData
       name: газодобытчик воздуха
     - type: Transform
-      pos: -8.5,-13.5
       parent: 2
+      pos: -8.5,-13.5
 - proto: GasMinerOxygenStationLarge
   entities:
   - uid: 601
@@ -5475,24 +6070,24 @@ entities:
     - type: MetaData
       name: газодобытчик воздуха
     - type: Transform
-      pos: -8.5,-13.5
       parent: 2
+      pos: -8.5,-13.5
 - proto: GasPassiveVent
   entities:
   - uid: 602
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -10.5,-8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 603
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-13.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
 - proto: GasPipeBend
@@ -5500,204 +6095,204 @@ entities:
   - uid: 604
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -7.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 605
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 606
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 607
     components:
     - type: Transform
-      pos: 8.5,8.5
       parent: 2
+      pos: 8.5,8.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 608
     components:
     - type: Transform
-      pos: 10.5,-9.5
       parent: 2
+      pos: 10.5,-9.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 609
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 610
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -7.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 611
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 612
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 613
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-20.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 614
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 615
     components:
     - type: Transform
-      pos: 11.5,4.5
       parent: 2
+      pos: 11.5,4.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 616
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 617
     components:
     - type: Transform
-      pos: -9.5,-8.5
       parent: 2
+      pos: -9.5,-8.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 618
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 619
     components:
     - type: Transform
-      pos: -9.5,-1.5
       parent: 2
+      pos: -9.5,-1.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 620
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 621
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 622
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 623
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 624
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 625
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-18.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 626
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,-18.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 627
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 628
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 629
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
 - proto: GasPipeFourway
@@ -5705,29 +6300,29 @@ entities:
   - uid: 630
     components:
     - type: Transform
-      pos: 1.5,-2.5
       parent: 2
+      pos: 1.5,-2.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 631
     components:
     - type: Transform
-      pos: 2.5,-4.5
       parent: 2
+      pos: 2.5,-4.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 632
     components:
     - type: Transform
-      pos: -0.5,-15.5
       parent: 2
+      pos: -0.5,-15.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 633
     components:
     - type: Transform
-      pos: -1.5,-16.5
       parent: 2
+      pos: -1.5,-16.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
 - proto: GasPipeStraight
@@ -5735,1577 +6330,1577 @@ entities:
   - uid: 634
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 635
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 636
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 637
     components:
     - type: Transform
-      pos: -6.5,-1.5
       parent: 2
+      pos: -6.5,-1.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 638
     components:
     - type: Transform
-      pos: -1.5,10.5
       parent: 2
+      pos: -1.5,10.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 639
     components:
     - type: Transform
-      pos: -1.5,8.5
       parent: 2
+      pos: -1.5,8.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 640
     components:
     - type: Transform
-      pos: -6.5,-0.5
       parent: 2
+      pos: -6.5,-0.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 641
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,6.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 642
     components:
     - type: Transform
-      pos: -0.5,-11.5
       parent: 2
+      pos: -0.5,-11.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 643
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 644
     components:
     - type: Transform
-      pos: -0.5,-12.5
       parent: 2
+      pos: -0.5,-12.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 645
     components:
     - type: Transform
-      pos: 11.5,-6.5
       parent: 2
+      pos: 11.5,-6.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 646
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 10.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 647
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 7.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 648
     components:
     - type: Transform
-      pos: 11.5,-13.5
       parent: 2
+      pos: 11.5,-13.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 649
     components:
     - type: Transform
-      pos: 11.5,-12.5
       parent: 2
+      pos: 11.5,-12.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 650
     components:
     - type: Transform
-      pos: 11.5,-11.5
       parent: 2
+      pos: 11.5,-11.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 651
     components:
     - type: Transform
-      pos: 10.5,-12.5
       parent: 2
+      pos: 10.5,-12.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 652
     components:
     - type: Transform
-      pos: 10.5,-13.5
       parent: 2
+      pos: 10.5,-13.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 653
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 654
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 655
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 656
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 657
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-0.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 658
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 659
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-6.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 660
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 661
     components:
     - type: Transform
-      pos: 10.5,-11.5
       parent: 2
+      pos: 10.5,-11.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 662
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 7.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 663
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 6.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 664
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 5.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 665
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 666
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 667
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 4.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 668
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 669
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 670
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 671
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 1.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 672
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,0.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 673
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-7.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 674
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 675
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 676
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-17.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 677
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-17.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 678
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 679
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 680
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,1.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 681
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 10.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 682
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 683
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-0.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 684
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 685
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 686
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 687
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 688
     components:
     - type: Transform
-      pos: -7.5,-0.5
       parent: 2
+      pos: -7.5,-0.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 689
     components:
     - type: Transform
-      pos: -7.5,-2.5
       parent: 2
+      pos: -7.5,-2.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 690
     components:
     - type: Transform
-      pos: 1.5,-1.5
       parent: 2
+      pos: 1.5,-1.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 691
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,7.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 692
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-18.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 693
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 694
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 695
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 696
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-6.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 697
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 698
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -3.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 699
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 8.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 700
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 5.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 701
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 702
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 703
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 704
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 705
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 706
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 707
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 708
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 709
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -0.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 710
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 711
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 712
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 8.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 713
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 714
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -7.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 715
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-7.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 716
     components:
     - type: Transform
-      pos: -0.5,-10.5
       parent: 2
+      pos: -0.5,-10.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 717
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 718
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 719
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 720
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 721
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 7.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 722
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-19.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 723
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 8.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 724
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 4.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 725
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 726
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 727
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 728
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 729
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 730
     components:
     - type: Transform
-      pos: -6.5,-3.5
       parent: 2
+      pos: -6.5,-3.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 731
     components:
     - type: Transform
-      pos: 1.5,-4.5
       parent: 2
+      pos: 1.5,-4.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 732
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 733
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 734
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,6.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 735
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 736
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 737
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 738
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 739
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 740
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 741
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 6.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 742
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 743
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 744
     components:
     - type: Transform
-      pos: 11.5,-8.5
       parent: 2
+      pos: 11.5,-8.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 745
     components:
     - type: Transform
-      pos: 8.5,-8.5
       parent: 2
+      pos: 8.5,-8.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 746
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 747
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 748
     components:
     - type: Transform
-      pos: 7.5,-10.5
       parent: 2
+      pos: 7.5,-10.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 749
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 750
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-13.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 751
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-12.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 752
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 753
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-13.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 754
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-12.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 755
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 756
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 757
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 758
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 759
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 760
     components:
     - type: Transform
-      pos: -0.5,-13.5
       parent: 2
+      pos: -0.5,-13.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 761
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 762
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 763
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -0.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 764
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 765
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 766
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,6.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 767
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 768
     components:
     - type: Transform
-      pos: -6.5,-4.5
       parent: 2
+      pos: -6.5,-4.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 769
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 770
     components:
     - type: Transform
-      pos: -1.5,9.5
       parent: 2
+      pos: -1.5,9.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 771
     components:
     - type: Transform
-      pos: -2.5,7.5
       parent: 2
+      pos: -2.5,7.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 772
     components:
     - type: Transform
-      pos: 1.5,-3.5
       parent: 2
+      pos: 1.5,-3.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 773
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 774
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 775
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,7.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 776
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-12.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 777
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 778
     components:
     - type: Transform
-      pos: -1.5,-13.5
       parent: 2
+      pos: -1.5,-13.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 779
     components:
     - type: Transform
-      pos: -1.5,-12.5
       parent: 2
+      pos: -1.5,-12.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 780
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 781
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-7.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 782
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 783
     components:
     - type: Transform
-      pos: -2.5,-5.5
       parent: 2
+      pos: -2.5,-5.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 784
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 785
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 786
     components:
     - type: Transform
-      pos: -2.5,-4.5
       parent: 2
+      pos: -2.5,-4.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 787
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 788
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 789
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 790
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 791
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 792
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 793
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 794
     components:
     - type: Transform
-      pos: -1.5,6.5
       parent: 2
+      pos: -1.5,6.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 795
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 796
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 797
     components:
     - type: Transform
-      pos: -1.5,7.5
       parent: 2
+      pos: -1.5,7.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 798
     components:
     - type: Transform
-      pos: 2.5,-2.5
       parent: 2
+      pos: 2.5,-2.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 799
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 800
     components:
     - type: Transform
-      pos: -7.5,-1.5
       parent: 2
+      pos: -7.5,-1.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 801
     components:
     - type: Transform
-      pos: 2.5,-1.5
       parent: 2
+      pos: 2.5,-1.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 802
     components:
     - type: Transform
-      pos: 2.5,-3.5
       parent: 2
+      pos: 2.5,-3.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 803
     components:
     - type: Transform
-      pos: -7.5,-3.5
       parent: 2
+      pos: -7.5,-3.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 804
     components:
     - type: Transform
-      pos: 1.5,-0.5
       parent: 2
+      pos: 1.5,-0.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 805
     components:
     - type: Transform
-      pos: 2.5,-0.5
       parent: 2
+      pos: 2.5,-0.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 806
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 807
     components:
     - type: Transform
-      pos: -2.5,-3.5
       parent: 2
+      pos: -2.5,-3.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 808
     components:
     - type: Transform
-      pos: -2.5,-6.5
       parent: 2
+      pos: -2.5,-6.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 809
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 810
     components:
     - type: Transform
-      pos: 8.5,-7.5
       parent: 2
+      pos: 8.5,-7.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 811
     components:
     - type: Transform
-      pos: 8.5,0.5
       parent: 2
+      pos: 8.5,0.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 812
     components:
     - type: Transform
-      pos: 11.5,1.5
       parent: 2
+      pos: 11.5,1.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 813
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 814
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-16.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 815
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 816
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 817
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 818
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 1.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 819
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 820
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 821
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 822
     components:
     - type: Transform
-      pos: -0.5,-17.5
       parent: 2
+      pos: -0.5,-17.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 823
     components:
     - type: Transform
-      pos: -0.5,-16.5
       parent: 2
+      pos: -0.5,-16.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 824
     components:
     - type: Transform
-      pos: -1.5,-17.5
       parent: 2
+      pos: -1.5,-17.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 825
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-18.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 826
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 827
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,13.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 828
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,12.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 829
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 830
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 831
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 832
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,12.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 833
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,14.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 834
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 835
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,13.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 836
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-15.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
 - proto: GasPipeTJunction
@@ -7313,223 +7908,223 @@ entities:
   - uid: 837
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,8.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 838
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 839
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -7.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 840
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 841
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-2.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 842
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-10.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 843
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 8.5,-3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 844
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,3.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 845
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -6.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 846
     components:
     - type: Transform
-      pos: -3.5,-4.5
       parent: 2
+      pos: -3.5,-4.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 847
     components:
     - type: Transform
-      pos: 2.5,-9.5
       parent: 2
+      pos: 2.5,-9.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 848
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 849
     components:
     - type: Transform
-      pos: -3.5,4.5
       parent: 2
+      pos: -3.5,4.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 850
     components:
     - type: Transform
-      pos: 6.5,-10.5
       parent: 2
+      pos: 6.5,-10.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 851
     components:
     - type: Transform
-      pos: -0.5,-9.5
       parent: 2
+      pos: -0.5,-9.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 852
     components:
     - type: Transform
-      pos: 7.5,-9.5
       parent: 2
+      pos: 7.5,-9.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 853
     components:
     - type: Transform
-      pos: -3.5,-10.5
       parent: 2
+      pos: -3.5,-10.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 854
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 855
     components:
     - type: Transform
-      pos: 1.5,5.5
       parent: 2
+      pos: 1.5,5.5
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 856
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 8.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 857
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-9.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 858
     components:
     - type: Transform
-      pos: -2.5,-2.5
       parent: 2
+      pos: -2.5,-2.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 859
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,5.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 860
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 8.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 861
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 8.5,-1.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 862
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-1.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 863
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-4.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 864
     components:
     - type: Transform
-      pos: -1.5,-11.5
       parent: 2
+      pos: -1.5,-11.5
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 865
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,11.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
 - proto: GasVentPump
@@ -7537,8 +8132,8 @@ entities:
   - uid: 866
     components:
     - type: Transform
-      pos: -6.5,-10.5
       parent: 2
+      pos: -6.5,-10.5
     - type: DeviceNetwork
       deviceLists:
       - 8
@@ -7547,9 +8142,9 @@ entities:
   - uid: 867
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,8.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7558,16 +8153,16 @@ entities:
   - uid: 868
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 11.5,-18.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#0000FFFF'
   - uid: 869
     components:
     - type: Transform
-      pos: 1.5,0.5
       parent: 2
+      pos: 1.5,0.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7576,9 +8171,9 @@ entities:
   - uid: 870
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-15.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7587,9 +8182,9 @@ entities:
   - uid: 871
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -6.5,-5.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7598,9 +8193,9 @@ entities:
   - uid: 872
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,-5.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7609,9 +8204,9 @@ entities:
   - uid: 873
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7620,8 +8215,8 @@ entities:
   - uid: 874
     components:
     - type: Transform
-      pos: -6.5,0.5
       parent: 2
+      pos: -6.5,0.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7630,8 +8225,8 @@ entities:
   - uid: 875
     components:
     - type: Transform
-      pos: -2.5,9.5
       parent: 2
+      pos: -2.5,9.5
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7640,9 +8235,9 @@ entities:
   - uid: 876
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -2.5,-10.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 3
@@ -7651,9 +8246,9 @@ entities:
   - uid: 877
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7662,9 +8257,9 @@ entities:
   - uid: 878
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7673,9 +8268,9 @@ entities:
   - uid: 879
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-1.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7684,9 +8279,9 @@ entities:
   - uid: 880
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-16.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7695,9 +8290,9 @@ entities:
   - uid: 881
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,-16.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7706,9 +8301,9 @@ entities:
   - uid: 882
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-19.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7717,8 +8312,8 @@ entities:
   - uid: 883
     components:
     - type: Transform
-      pos: -2.5,16.5
       parent: 2
+      pos: -2.5,16.5
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7729,8 +8324,8 @@ entities:
   - uid: 884
     components:
     - type: Transform
-      pos: 2.5,0.5
       parent: 2
+      pos: 2.5,0.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7739,9 +8334,9 @@ entities:
   - uid: 885
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -7.5,4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7750,9 +8345,9 @@ entities:
   - uid: 886
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,8.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7761,17 +8356,17 @@ entities:
   - uid: 887
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-20.5
-      parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
   - uid: 888
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 2.5,-5.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7780,9 +8375,9 @@ entities:
   - uid: 889
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -7.5,-10.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 8
@@ -7791,9 +8386,9 @@ entities:
   - uid: 890
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-15.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7802,9 +8397,9 @@ entities:
   - uid: 891
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -7.5,-5.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7813,9 +8408,9 @@ entities:
   - uid: 892
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,11.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7824,8 +8419,8 @@ entities:
   - uid: 893
     components:
     - type: Transform
-      pos: -7.5,0.5
       parent: 2
+      pos: -7.5,0.5
     - type: DeviceNetwork
       deviceLists:
       - 9
@@ -7834,9 +8429,9 @@ entities:
   - uid: 894
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 2.5,-10.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 3
@@ -7845,9 +8440,9 @@ entities:
   - uid: 895
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7856,9 +8451,9 @@ entities:
   - uid: 896
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 9.5,-1.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 7
@@ -7867,9 +8462,9 @@ entities:
   - uid: 897
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-15.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7878,9 +8473,9 @@ entities:
   - uid: 898
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-15.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7889,9 +8484,9 @@ entities:
   - uid: 899
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-19.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 5
@@ -7900,9 +8495,9 @@ entities:
   - uid: 900
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,4.5
-      parent: 2
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7911,8 +8506,8 @@ entities:
   - uid: 901
     components:
     - type: Transform
-      pos: -1.5,16.5
       parent: 2
+      pos: -1.5,16.5
     - type: DeviceNetwork
       deviceLists:
       - 6
@@ -7923,15 +8518,15 @@ entities:
   - uid: 902
     components:
     - type: Transform
-      pos: -5.5,5.5
       parent: 2
+      pos: -5.5,5.5
     - type: PowerSupplier
       supplyRate: 30000
   - uid: 903
     components:
     - type: Transform
-      pos: -5.5,3.5
       parent: 2
+      pos: -5.5,3.5
     - type: PowerSupplier
       supplyRate: 30000
 - proto: GravityGeneratorMini
@@ -7939,92 +8534,80 @@ entities:
   - uid: 904
     components:
     - type: Transform
-      pos: -8.5,3.5
       parent: 2
+      pos: -8.5,3.5
 - proto: Grille
   entities:
   - uid: 905
     components:
     - type: Transform
-      pos: 14.5,-4.5
       parent: 2
+      pos: 14.5,-4.5
   - uid: 906
     components:
     - type: Transform
-      pos: 14.5,-5.5
       parent: 2
+      pos: 14.5,-5.5
   - uid: 907
     components:
     - type: Transform
-      pos: 13.5,-19.5
       parent: 2
+      pos: 13.5,-19.5
   - uid: 908
     components:
     - type: Transform
-      pos: 13.5,-17.5
       parent: 2
+      pos: 13.5,-17.5
   - uid: 909
     components:
     - type: Transform
-      pos: 8.5,-22.5
       parent: 2
+      pos: 8.5,-22.5
   - uid: 910
     components:
     - type: Transform
-      pos: -8.5,-12.5
       parent: 2
+      pos: -8.5,-12.5
   - uid: 911
     components:
     - type: Transform
-      pos: 13.5,-18.5
       parent: 2
+      pos: 13.5,-18.5
   - uid: 912
     components:
     - type: Transform
-      pos: 8.5,-21.5
       parent: 2
+      pos: 8.5,-21.5
   - uid: 913
     components:
     - type: Transform
-      pos: 8.5,-20.5
       parent: 2
+      pos: 8.5,-20.5
 - proto: LockerAtmospherics
   entities:
   - uid: 914
     components:
     - type: Transform
-      pos: -7.5,-9.5
       parent: 2
+      pos: -7.5,-9.5
 - proto: LockerSecurity
   entities:
   - uid: 90
     components:
     - type: Transform
-      pos: 6.5,-16.5
       parent: 2
+      pos: 6.5,-16.5
     - type: EntityStorage
       air:
-        volume: 200
-        immutable: False
         temperature: 293.14673
+        volume: 200
         moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+          Oxygen: 1.7459903
+          Nitrogen: 6.568249
+        immutable: False
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
-          showEnts: False
-          occludes: True
           ents:
           - 91
           - 92
@@ -8032,310 +8615,282 @@ entities:
           - 93
           - 94
           - 95
-        paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
+        paper_label: !type:ContainerSlot
           ent: null
+          showEnts: False
+          occludes: True
 - proto: LogicGateXnor
   entities:
   - uid: 915
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
-      pos: 13.5,-22.5
       parent: 2
+      pos: 13.5,-22.5
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        25:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
   - uid: 916
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
-      pos: 13.5,-14.5
       parent: 2
+      pos: 13.5,-14.5
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        23:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
   - uid: 917
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-25.5
-      parent: 2
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        28:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
   - uid: 918
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
-      pos: 13.5,2.5
       parent: 2
+      pos: 13.5,2.5
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        24:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
   - uid: 919
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
-      pos: 13.5,-1.5
       parent: 2
+      pos: 13.5,-1.5
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        26:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
   - uid: 920
     components:
     - type: MetaData
-      desc: Невидимый гейт
       name: Удаляй читы
+      desc: Невидимый гейт
     - type: Transform
-      anchored: True
-      pos: 13.5,-8.5
       parent: 2
+      pos: 13.5,-8.5
+      anchored: True
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        27:
-        - Output: DoorBolt
     - type: Physics
       canCollide: False
       bodyType: Static
     - type: Visibility
-      layer: 10
 - proto: Mannequin
   entities:
   - uid: 417
     components:
     - type: Transform
-      pos: -0.5,-13.5
       parent: 2
+      pos: -0.5,-13.5
     - type: ContainerContainer
       containers:
         jumpsuit: !type:ContainerSlot
-          showEnts: False
-          occludes: False
           ent: 419
+          showEnts: False
+          occludes: False
         outerClothing: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         neck: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         mask: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         eyes: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         head: !type:ContainerSlot
-          showEnts: False
-          occludes: False
           ent: 418
+          showEnts: False
+          occludes: False
         suitstorage: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         back: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
     - type: FrenchAccent
   - uid: 421
     components:
     - type: Transform
-      pos: -2.5,-13.5
       parent: 2
+      pos: -2.5,-13.5
     - type: ContainerContainer
       containers:
         jumpsuit: !type:ContainerSlot
-          showEnts: False
-          occludes: False
           ent: 424
+          showEnts: False
+          occludes: False
         outerClothing: !type:ContainerSlot
-          showEnts: False
-          occludes: False
           ent: 423
+          showEnts: False
+          occludes: False
         neck: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         mask: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         eyes: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         head: !type:ContainerSlot
-          showEnts: False
-          occludes: False
           ent: 422
+          showEnts: False
+          occludes: False
         suitstorage: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
         back: !type:ContainerSlot
+          ent: null
           showEnts: False
           occludes: False
-          ent: null
     - type: RussianAccent
 - proto: Mirror
   entities:
   - uid: 921
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-26.5
-      parent: 2
   - uid: 922
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-26.5
-      parent: 2
   - uid: 923
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-26.5
-      parent: 2
   - uid: 924
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,-26.5
-      parent: 2
 - proto: Paper
   entities:
   - uid: 925
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.765255,-4.4293413
-      parent: 2
   - uid: 926
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.921505,-4.4762163
-      parent: 2
   - uid: 927
     components:
     - type: Transform
-      pos: -0.11029482,-19.458694
       parent: 2
+      pos: -0.11029482,-19.458694
   - uid: 928
     components:
     - type: Transform
-      pos: -0.35465497,-19.342327
       parent: 2
+      pos: -0.35465497,-19.342327
   - uid: 929
     components:
     - type: Transform
-      pos: -0.5408342,-19.505241
       parent: 2
+      pos: -0.5408342,-19.505241
 - proto: Pen
   entities:
   - uid: 930
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.18060982,-19.551788
-      parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 931
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,16.5
-      parent: 2
 - proto: PlushieAtmosian
   entities:
   - uid: 932
     components:
     - type: Transform
-      pos: -8.480301,-11.51842
       parent: 2
+      pos: -8.480301,-11.51842
 - proto: PlushieLizard
   entities:
   - uid: 933
     components:
     - type: MetaData
-      desc: Доревьювился.
       name: неизвестный мейнтейнер
+      desc: Доревьювился.
     - type: Transform
-      pos: -8.528828,-15.495922
       parent: 2
+      pos: -8.528828,-15.495922
 - proto: PlushieLizardMirrored
   entities:
   - uid: 934
     components:
     - type: Transform
-      pos: 5.5931134,-0.44783163
       parent: 2
+      pos: 5.5931134,-0.44783163
 - proto: PlushiePenguin
   entities:
   - uid: 935
@@ -8343,15 +8898,15 @@ entities:
     - type: MetaData
       desc: Надо было ставить Линукс.
     - type: Transform
-      pos: 9.50761,2.5900903
       parent: 2
+      pos: 9.50761,2.5900903
 - proto: PlushieSlime
   entities:
   - uid: 937
     components:
     - type: MetaData
-      desc: Уверяю вас. Мне можно доверить огнестрельное оружие...
       name: плюшевый Керн
+      desc: Уверяю вас. Мне можно доверить огнестрельное оружие...
     - type: Transform
       parent: 936
     - type: Physics
@@ -8359,781 +8914,785 @@ entities:
   - uid: 938
     components:
     - type: Transform
-      pos: 9.412727,-6.492947
       parent: 2
+      pos: 9.412727,-6.492947
 - proto: PosterContrabandAtmosiaDeclarationIndependence
   entities:
   - uid: 939
     components:
     - type: Transform
-      pos: -9.5,-11.5
       parent: 2
+      pos: -9.5,-11.5
 - proto: PottedPlant11
   entities:
   - uid: 940
     components:
     - type: Transform
-      pos: -7.0200777,-7.4046617
       parent: 2
+      pos: -7.0200777,-7.4046617
 - proto: PottedPlant13
   entities:
   - uid: 941
     components:
     - type: Transform
-      pos: -3.5,-20.5
       parent: 2
+      pos: -3.5,-20.5
 - proto: PottedPlant17
   entities:
   - uid: 942
     components:
     - type: Transform
-      pos: 2.010267,-7.4168715
       parent: 2
+      pos: 2.010267,-7.4168715
 - proto: PottedPlant7
   entities:
   - uid: 936
     components:
     - type: Transform
-      pos: 5.5,-16.5
       parent: 2
+      pos: 5.5,-16.5
     - type: ContainerContainer
       containers:
         stash: !type:ContainerSlot
+          ent: 937
           showEnts: False
           occludes: True
-          ent: 937
 - proto: PottedPlantAlt2
   entities:
   - uid: 943
     components:
     - type: Transform
-      pos: 8.25,10.5
       parent: 2
+      pos: 8.25,10.5
   - uid: 944
     components:
     - type: Transform
-      pos: 10.75,10.5
       parent: 2
+      pos: 10.75,10.5
 - proto: PottedPlantAlt8
   entities:
   - uid: 945
     components:
     - type: Transform
-      pos: 0.5,-20.5
       parent: 2
+      pos: 0.5,-20.5
 - proto: PottedPlantRandom
   entities:
   - uid: 946
     components:
     - type: Transform
-      pos: 6.5,5.5
       parent: 2
+      pos: 6.5,5.5
   - uid: 947
     components:
     - type: Transform
-      pos: -1.5,1.5
       parent: 2
+      pos: -1.5,1.5
   - uid: 948
     components:
     - type: Transform
-      pos: -1.5,13.5
       parent: 2
+      pos: -1.5,13.5
   - uid: 949
     components:
     - type: Transform
-      pos: -3.5,-7.5
       parent: 2
+      pos: -3.5,-7.5
   - uid: 950
     components:
     - type: Transform
-      pos: 12.5,5.5
       parent: 2
+      pos: 12.5,5.5
   - uid: 951
     components:
     - type: Transform
-      pos: 13.5,-11.5
       parent: 2
+      pos: 13.5,-11.5
   - uid: 952
     components:
     - type: Transform
-      pos: 10.5,-13.5
       parent: 2
+      pos: 10.5,-13.5
   - uid: 953
     components:
     - type: Transform
-      pos: 12.5,-13.5
       parent: 2
+      pos: 12.5,-13.5
   - uid: 954
     components:
     - type: Transform
-      pos: 10.5,-25.5
       parent: 2
+      pos: 10.5,-25.5
   - uid: 955
     components:
     - type: Transform
-      pos: 12.5,-25.5
       parent: 2
+      pos: 12.5,-25.5
 - proto: Poweredlight
   entities:
   - uid: 956
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-3.5
-      parent: 2
   - uid: 957
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-6.5
-      parent: 2
   - uid: 958
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 7.5,-15.5
-      parent: 2
   - uid: 959
     components:
     - type: Transform
-      pos: 0.5,1.5
       parent: 2
+      pos: 0.5,1.5
   - uid: 960
     components:
     - type: Transform
-      pos: -1.5,1.5
       parent: 2
+      pos: -1.5,1.5
   - uid: 961
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-7.5
-      parent: 2
   - uid: 962
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-6.5
-      parent: 2
   - uid: 963
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,-7.5
-      parent: 2
   - uid: 964
     components:
     - type: Transform
-      pos: -3.5,1.5
       parent: 2
+      pos: -3.5,1.5
   - uid: 965
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,8.5
-      parent: 2
   - uid: 966
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-15.5
-      parent: 2
   - uid: 967
     components:
     - type: Transform
-      pos: 9.5,-16.5
       parent: 2
+      pos: 9.5,-16.5
   - uid: 968
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-22.5
-      parent: 2
   - uid: 969
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,-21.5
-      parent: 2
   - uid: 970
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-25.5
-      parent: 2
   - uid: 971
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,-25.5
-      parent: 2
   - uid: 972
     components:
     - type: Transform
-      pos: 10.5,-13.5
       parent: 2
+      pos: 10.5,-13.5
   - uid: 973
     components:
     - type: Transform
-      pos: 12.5,-13.5
       parent: 2
+      pos: 12.5,-13.5
   - uid: 974
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-9.5
-      parent: 2
   - uid: 975
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-11.5
-      parent: 2
   - uid: 976
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-11.5
-      parent: 2
   - uid: 977
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-9.5
-      parent: 2
   - uid: 978
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,3.5
-      parent: 2
   - uid: 979
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,7.5
-      parent: 2
   - uid: 980
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.5,13.5
-      parent: 2
   - uid: 981
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,5.5
-      parent: 2
   - uid: 982
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,5.5
-      parent: 2
   - uid: 983
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,3.5
-      parent: 2
   - uid: 984
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,0.5
-      parent: 2
   - uid: 985
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,0.5
-      parent: 2
   - uid: 986
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 12.5,8.5
-      parent: 2
   - uid: 987
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,5.5
-      parent: 2
   - uid: 988
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,5.5
-      parent: 2
   - uid: 989
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-21.5
-      parent: 2
   - uid: 990
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-11.5
-      parent: 2
   - uid: 991
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-6.5
-      parent: 2
   - uid: 992
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-11.5
-      parent: 2
   - uid: 993
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-6.5
-      parent: 2
   - uid: 994
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-21.5
-      parent: 2
   - uid: 995
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-15.5
-      parent: 2
   - uid: 996
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-15.5
-      parent: 2
   - uid: 997
     components:
     - type: Transform
-      pos: -3.5,-13.5
       parent: 2
+      pos: -3.5,-13.5
   - uid: 998
     components:
     - type: Transform
-      pos: 0.5,-13.5
       parent: 2
+      pos: 0.5,-13.5
   - uid: 999
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,-22.5
-      parent: 2
   - uid: 1000
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 0.5,-22.5
-      parent: 2
 - proto: PoweredlightPink
   entities:
   - uid: 1001
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,0.5
-      parent: 2
 - proto: PoweredSmallLight
   entities:
   - uid: 1002
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 11.5,-28.5
-      parent: 2
   - uid: 1003
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -4.5,-24.5
-      parent: 2
   - uid: 1004
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,7.5
-      parent: 2
   - uid: 1005
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,13.5
-      parent: 2
   - uid: 1006
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,-22.5
-      parent: 2
   - uid: 1007
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,11.5
-      parent: 2
   - uid: 1008
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,9.5
-      parent: 2
   - uid: 1009
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,-8.5
-      parent: 2
   - uid: 1010
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,-1.5
-      parent: 2
   - uid: 1011
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,-14.5
-      parent: 2
   - uid: 1012
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,-10.5
-      parent: 2
   - uid: 1013
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,4.5
-      parent: 2
   - uid: 1014
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 15.5,2.5
-      parent: 2
   - uid: 1015
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-24.5
-      parent: 2
   - uid: 1016
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,15.5
-      parent: 2
   - uid: 1017
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-13.5
-      parent: 2
   - uid: 1018
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -0.5,-24.5
-      parent: 2
   - uid: 1019
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 1.5,-24.5
-      parent: 2
 - proto: Rack
   entities:
   - uid: 1020
     components:
     - type: Transform
-      pos: -5.5,-11.5
       parent: 2
+      pos: -5.5,-11.5
   - uid: 1021
     components:
     - type: Transform
-      pos: -6.5,-11.5
       parent: 2
+      pos: -6.5,-11.5
 - proto: Railing
   entities:
   - uid: 1022
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-12.5
-      parent: 2
   - uid: 1023
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-12.5
-      parent: 2
   - uid: 1024
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-17.5
-      parent: 2
   - uid: 1025
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-16.5
-      parent: 2
   - uid: 1026
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-17.5
-      parent: 2
   - uid: 1027
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-16.5
-      parent: 2
   - uid: 1028
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-13.5
-      parent: 2
   - uid: 1029
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-13.5
-      parent: 2
   - uid: 1030
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-13.5
-      parent: 2
   - uid: 1031
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-13.5
-      parent: 2
 - proto: RailingCornerSmall
   entities:
   - uid: 1032
     components:
     - type: Transform
-      pos: 8.5,-12.5
       parent: 2
+      pos: 8.5,-12.5
   - uid: 1033
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
-      pos: -6.5,-16.5
       parent: 2
+      pos: -6.5,-16.5
   - uid: 1034
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 5.5,-12.5
-      parent: 2
   - uid: 1035
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -6.5,-17.5
-      parent: 2
   - uid: 1036
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-17.5
-      parent: 2
   - uid: 1037
     components:
     - type: MetaData
-      desc: Вешалка для одежды.
       name: вешалка
+      desc: Вешалка для одежды.
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-16.5
-      parent: 2
 - proto: RandomDrinkBottle
   entities:
   - uid: 1038
     components:
     - type: Transform
-      pos: 3.5,1.5
       parent: 2
+      pos: 3.5,1.5
 - proto: RandomDrinkGlass
   entities:
   - uid: 1039
     components:
     - type: Transform
-      pos: -6.5,-5.5
       parent: 2
+      pos: -6.5,-5.5
   - uid: 1040
     components:
     - type: Transform
-      pos: 11.5,8.5
       parent: 2
+      pos: 11.5,8.5
 - proto: RandomFoodBakedSingle
   entities:
   - uid: 1041
     components:
     - type: Transform
-      pos: 1.5,-5.5
       parent: 2
+      pos: 1.5,-5.5
 - proto: RandomFoodBakedWhole
   entities:
   - uid: 1042
     components:
     - type: Transform
-      pos: 2.5,-6.5
       parent: 2
+      pos: 2.5,-6.5
 - proto: RandomFoodMeal
   entities:
   - uid: 1043
     components:
     - type: Transform
-      pos: -7.5,-6.5
       parent: 2
+      pos: -7.5,-6.5
   - uid: 1044
     components:
     - type: Transform
-      pos: 9.5,-21.5
       parent: 2
+      pos: 9.5,-21.5
 - proto: RandomPosterLegit
   entities:
   - uid: 1045
     components:
     - type: Transform
-      pos: 1.5,6.5
       parent: 2
+      pos: 1.5,6.5
 - proto: RandomVendingDrinks
   entities:
   - uid: 1046
     components:
     - type: Transform
-      pos: -7.5,-2.5
       parent: 2
+      pos: -7.5,-2.5
   - uid: 1047
     components:
     - type: Transform
-      pos: 5.5,-4.5
       parent: 2
+      pos: 5.5,-4.5
   - uid: 1048
     components:
     - type: Transform
-      pos: -6.5,-22.5
       parent: 2
+      pos: -6.5,-22.5
 - proto: RandomVendingSnacks
   entities:
   - uid: 1049
     components:
     - type: Transform
-      pos: 5.5,-1.5
       parent: 2
+      pos: 5.5,-1.5
   - uid: 1050
     components:
     - type: Transform
-      pos: -8.5,-2.5
       parent: 2
+      pos: -8.5,-2.5
 - proto: Recycler
   entities:
   - uid: 1051
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -4.5,16.5
-      parent: 2
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 1052
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-12.5
-      parent: 2
 - proto: ShardGlass
   entities:
   - uid: 1053
     components:
     - type: Transform
-      pos: -8.872578,-16.071678
       parent: 2
+      pos: -8.872578,-16.071678
   - uid: 1054
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -8.169453,-15.165428
-      parent: 2
 - proto: SignalButton
   entities:
   - uid: 1055
     components:
     - type: Transform
-      pos: -5.5,10.5
       parent: 2
+      pos: -5.5,10.5
     - type: DeviceLinkSource
       linkedPorts:
         16:
-        - Pressed: DoorBolt
+        - - Pressed
+          - DoorBolt
   - uid: 1056
     components:
     - type: Transform
-      pos: -5.5,12.5
       parent: 2
+      pos: -5.5,12.5
     - type: DeviceLinkSource
       linkedPorts:
         18:
-        - Pressed: DoorBolt
+        - - Pressed
+          - DoorBolt
   - uid: 1057
     components:
     - type: Transform
-      pos: -5.5,14.5
       parent: 2
+      pos: -5.5,14.5
     - type: DeviceLinkSource
       linkedPorts:
         15:
-        - Pressed: DoorBolt
+        - - Pressed
+          - DoorBolt
   - uid: 1058
     components:
     - type: Transform
-      pos: -5.5,8.5
       parent: 2
+      pos: -5.5,8.5
     - type: DeviceLinkSource
       linkedPorts:
         17:
-        - Pressed: DoorBolt
+        - - Pressed
+          - DoorBolt
 - proto: SignalTimer
   entities:
   - uid: 1224
@@ -9141,300 +9700,275 @@ entities:
     - type: MetaData
       name: невидимый таймер
     - type: Transform
-      pos: 16.5,-13.5
       parent: 2
+      pos: 16.5,-13.5
     - type: SignalTimer
       delay: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        23:
-        - Timer: Open
     - type: Visibility
-      layer: 10
   - uid: 1225
     components:
     - type: MetaData
       name: невидимый таймер
     - type: Transform
-      pos: 16.5,-0.5
       parent: 2
+      pos: 16.5,-0.5
     - type: SignalTimer
       delay: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        26:
-        - Timer: Open
     - type: Visibility
-      layer: 10
   - uid: 1226
     components:
     - type: MetaData
       name: невидимый таймер
     - type: Transform
-      pos: 16.5,-7.5
       parent: 2
+      pos: 16.5,-7.5
     - type: SignalTimer
       delay: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        27:
-        - Timer: Open
     - type: Visibility
-      layer: 10
   - uid: 1575
     components:
     - type: MetaData
       name: невидимый таймер
     - type: Transform
-      pos: 16.5,3.5
       parent: 2
+      pos: 16.5,3.5
     - type: SignalTimer
       delay: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        24:
-        - Timer: Open
     - type: Visibility
-      layer: 10
   - uid: 1576
     components:
     - type: MetaData
       name: невидимый таймер
     - type: Transform
-      pos: 16.5,-21.5
       parent: 2
+      pos: 16.5,-21.5
     - type: SignalTimer
       delay: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        25:
-        - Timer: Open
     - type: Visibility
-      layer: 10
 - proto: SignArcade
   entities:
   - uid: 1059
     components:
     - type: Transform
-      pos: -4.5,-0.5
       parent: 2
+      pos: -4.5,-0.5
 - proto: SignAtmos
   entities:
   - uid: 1060
     components:
     - type: Transform
-      pos: -4.5,-9.5
       parent: 2
+      pos: -4.5,-9.5
 - proto: SignBar
   entities:
   - uid: 1061
     components:
     - type: Transform
-      pos: 4.5,-1.5
       parent: 2
+      pos: 4.5,-1.5
 - proto: SignDisposalSpace
   entities:
   - uid: 1062
     components:
     - type: Transform
-      pos: -1.5,14.5
       parent: 2
+      pos: -1.5,14.5
 - proto: SignEngineering
   entities:
   - uid: 1063
     components:
     - type: Transform
-      pos: -4.5,5.5
       parent: 2
+      pos: -4.5,5.5
 - proto: SignJanitor
   entities:
   - uid: 1064
     components:
     - type: Transform
-      pos: -1.5,6.5
       parent: 2
+      pos: -1.5,6.5
 - proto: SignShipDock
   entities:
   - uid: 1065
     components:
     - type: Transform
-      pos: 14.5,1.5
       parent: 2
+      pos: 14.5,1.5
   - uid: 1066
     components:
     - type: Transform
-      pos: 14.5,-9.5
       parent: 2
+      pos: 14.5,-9.5
 - proto: SignSmoking
   entities:
   - uid: 1067
     components:
     - type: Transform
-      pos: -0.5,12.5
       parent: 2
+      pos: -0.5,12.5
 - proto: Sink
   entities:
   - uid: 1068
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,0.5
-      parent: 2
 - proto: SinkStemlessWater
   entities:
   - uid: 1069
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-14.5
-      parent: 2
   - uid: 1070
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.8169644,11.372251
-      parent: 2
   - uid: 1071
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -1.8013394,9.356626
-      parent: 2
 - proto: SMESBasic
   entities:
   - uid: 1072
     components:
     - type: Transform
-      pos: -7.5,5.5
       parent: 2
+      pos: -7.5,5.5
 - proto: SodaDispenser
   entities:
   - uid: 1073
     components:
     - type: Transform
-      pos: 2.5,1.5
       parent: 2
+      pos: 2.5,1.5
 - proto: SpaceVillainArcadeFilled
   entities:
   - uid: 1074
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,0.5
-      parent: 2
   - uid: 1075
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -8.5,1.5
-      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 1076
     components:
     - type: Transform
-      pos: 5.5,1.5
       parent: 2
+      pos: 5.5,1.5
   - uid: 1077
     components:
     - type: Transform
-      pos: 10.5,-0.5
       parent: 2
+      pos: 10.5,-0.5
   - uid: 1078
     components:
     - type: Transform
-      pos: 9.5,-8.5
       parent: 2
+      pos: 9.5,-8.5
   - uid: 1079
     components:
     - type: Transform
-      pos: 10.5,-6.5
       parent: 2
+      pos: 10.5,-6.5
   - uid: 1080
     components:
     - type: Transform
-      pos: 9.5,-7.5
       parent: 2
+      pos: 9.5,-7.5
   - uid: 1081
     components:
     - type: Transform
-      pos: 9.5,-5.5
       parent: 2
+      pos: 9.5,-5.5
   - uid: 1082
     components:
     - type: Transform
-      pos: 5.5,0.5
       parent: 2
+      pos: 5.5,0.5
   - uid: 1083
     components:
     - type: Transform
-      pos: 10.5,-5.5
       parent: 2
+      pos: 10.5,-5.5
   - uid: 1084
     components:
     - type: Transform
-      pos: 5.5,-8.5
       parent: 2
+      pos: 5.5,-8.5
   - uid: 1085
     components:
     - type: Transform
-      pos: 9.5,-0.5
       parent: 2
+      pos: 9.5,-0.5
   - uid: 1086
     components:
     - type: Transform
-      pos: 9.5,0.5
       parent: 2
+      pos: 9.5,0.5
   - uid: 1087
     components:
     - type: Transform
-      pos: 9.5,1.5
       parent: 2
+      pos: 9.5,1.5
   - uid: 1088
     components:
     - type: Transform
-      pos: 10.5,0.5
       parent: 2
+      pos: 10.5,0.5
   - uid: 1089
     components:
     - type: Transform
-      pos: 10.5,1.5
       parent: 2
+      pos: 10.5,1.5
   - uid: 1090
     components:
     - type: Transform
-      pos: 5.5,2.5
       parent: 2
+      pos: 5.5,2.5
   - uid: 1091
     components:
     - type: Transform
-      pos: 10.5,2.5
       parent: 2
+      pos: 10.5,2.5
   - uid: 1092
     components:
     - type: Transform
-      pos: 10.5,-7.5
       parent: 2
+      pos: 10.5,-7.5
   - uid: 1093
     components:
     - type: Transform
-      pos: 10.5,-8.5
       parent: 2
+      pos: 10.5,-8.5
   - uid: 1094
     components:
     - type: Transform
-      pos: 5.5,-7.5
       parent: 2
+      pos: 5.5,-7.5
   - uid: 1095
     components:
     - type: Transform
-      pos: 5.5,-6.5
       parent: 2
+      pos: 5.5,-6.5
   - uid: 1096
     components:
     - type: Transform
-      pos: 5.5,-5.5
       parent: 2
+      pos: 5.5,-5.5
 - proto: Spoon
   entities:
   - uid: 1097
@@ -9442,34 +9976,34 @@ entities:
     - type: MetaData
       name: ложка для обуви
     - type: Transform
+      parent: 2
       rot: -0.5235987755982988 rad
       pos: 1.7093852,-16.486588
-      parent: 2
   - uid: 1098
     components:
     - type: MetaData
       name: ложка для обуви
     - type: Transform
+      parent: 2
       rot: -0.8726646259971648 rad
       pos: -4.697705,-16.59065
-      parent: 2
 - proto: StairDark
   entities:
   - uid: 1099
     components:
     - type: Transform
-      pos: 8.5,6.5
       parent: 2
+      pos: 8.5,6.5
   - uid: 1100
     components:
     - type: Transform
-      pos: 10.5,6.5
       parent: 2
+      pos: 10.5,6.5
   - uid: 1101
     components:
     - type: Transform
-      pos: 9.5,6.5
       parent: 2
+      pos: 9.5,6.5
 - proto: Stairs
   entities:
   - uid: 1102
@@ -9477,731 +10011,731 @@ entities:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: -5.5,-13.5
       parent: 2
+      pos: -5.5,-13.5
   - uid: 1103
     components:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: -4.5,-13.5
       parent: 2
+      pos: -4.5,-13.5
   - uid: 1104
     components:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: -3.5,-13.5
       parent: 2
+      pos: -3.5,-13.5
   - uid: 1105
     components:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: 0.5,-13.5
       parent: 2
+      pos: 0.5,-13.5
   - uid: 1106
     components:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: 1.5,-13.5
       parent: 2
+      pos: 1.5,-13.5
   - uid: 1107
     components:
     - type: MetaData
       name: полки для обуви
     - type: Transform
-      pos: 2.5,-13.5
       parent: 2
+      pos: 2.5,-13.5
 - proto: SteelBench
   entities:
   - uid: 1108
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-25.5
-      parent: 2
   - uid: 1109
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-25.5
-      parent: 2
   - uid: 1110
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-25.5
-      parent: 2
   - uid: 1111
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,-25.5
-      parent: 2
 - proto: StoolBar
   entities:
   - uid: 1112
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,1.5
-      parent: 2
   - uid: 1113
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,0.5
-      parent: 2
   - uid: 1114
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,-0.5
-      parent: 2
   - uid: 1115
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 0.5,-1.5
-      parent: 2
   - uid: 1116
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 3.5,-1.5
-      parent: 2
   - uid: 1117
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 1.5,-1.5
-      parent: 2
   - uid: 1118
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 2.5,-1.5
-      parent: 2
 - proto: SubstationBasic
   entities:
   - uid: 1119
     components:
     - type: Transform
-      pos: -8.5,5.5
       parent: 2
+      pos: -8.5,5.5
 - proto: SuitStorageBase
   entities:
   - uid: 1120
     components:
     - type: Transform
-      pos: -8.5,-9.5
       parent: 2
+      pos: -8.5,-9.5
 - proto: SurveillanceCameraGeneral
   entities:
   - uid: 1121
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-9.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Южный коридор
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1122
     components:
     - type: Transform
-      pos: -6.5,3.5
       parent: 2
+      pos: -6.5,3.5
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Инженерия
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1123
     components:
     - type: Transform
-      pos: -0.5,3.5
       parent: 2
+      pos: -0.5,3.5
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Северный коридор
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1124
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -7.5,-9.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Атмос
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1125
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,1.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Бар
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1126
     components:
     - type: Transform
-      pos: -5.5,-7.5
       parent: 2
+      pos: -5.5,-7.5
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Ресторан
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1127
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 12.5,9.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Рекреация
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1128
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 2.5,-18.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Одежда
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1129
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 13.5,1.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Терминал 1
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1130
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 13.5,-9.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Терминал 2
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
   - uid: 1131
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 10.5,-19.5
-      parent: 2
     - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraGeneral
       nameSet: True
       id: Терминал 3
+      setupAvailableNetworks:
+      - SurveillanceCameraGeneral
 - proto: SurveillanceCameraRouterGeneral
   entities:
   - uid: 1132
     components:
     - type: Transform
-      pos: -6.5,3.5
       parent: 2
+      pos: -6.5,3.5
 - proto: SurveillanceCameraWirelessRouterEntertainment
   entities:
   - uid: 1133
     components:
     - type: Transform
-      pos: -8.5,4.5
       parent: 2
+      pos: -8.5,4.5
 - proto: SurveillanceWirelessCameraAnchoredEntertainment
   entities:
   - uid: 1134
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -8.5,-16.5
-      parent: 2
 - proto: TableCarpet
   entities:
   - uid: 1135
     components:
     - type: Transform
-      pos: 2.5,1.5
       parent: 2
+      pos: 2.5,1.5
   - uid: 1136
     components:
     - type: Transform
-      pos: 1.5,1.5
       parent: 2
+      pos: 1.5,1.5
   - uid: 1137
     components:
     - type: Transform
-      pos: 3.5,1.5
       parent: 2
+      pos: 3.5,1.5
   - uid: 1138
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-20.5
-      parent: 2
   - uid: 1139
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-20.5
-      parent: 2
 - proto: TableCounterWood
   entities:
   - uid: 1140
     components:
     - type: Transform
-      pos: 1.5,-0.5
       parent: 2
+      pos: 1.5,-0.5
   - uid: 1141
     components:
     - type: Transform
-      pos: 3.5,-0.5
       parent: 2
+      pos: 3.5,-0.5
   - uid: 1142
     components:
     - type: Transform
-      pos: 2.5,-0.5
       parent: 2
+      pos: 2.5,-0.5
   - uid: 1143
     components:
     - type: Transform
-      pos: 0.5,-0.5
       parent: 2
+      pos: 0.5,-0.5
   - uid: 1144
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-16.5
-      parent: 2
   - uid: 1145
     components:
     - type: Transform
-      pos: -4.5,-16.5
       parent: 2
+      pos: -4.5,-16.5
   - uid: 1146
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-19.5
-      parent: 2
   - uid: 1147
     components:
     - type: Transform
-      pos: 0.5,-19.5
       parent: 2
+      pos: 0.5,-19.5
   - uid: 1148
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -0.5,-19.5
-      parent: 2
   - uid: 1149
     components:
     - type: Transform
-      pos: -3.5,-19.5
       parent: 2
+      pos: -3.5,-19.5
   - uid: 1150
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -3.5,-20.5
-      parent: 2
   - uid: 1151
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 0.5,-20.5
-      parent: 2
 - proto: TableFancyBlack
   entities:
   - uid: 1152
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-6.5
-      parent: 2
   - uid: 1153
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,-7.5
-      parent: 2
   - uid: 1154
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-7.5
-      parent: 2
   - uid: 1155
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,-6.5
-      parent: 2
   - uid: 1156
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,-6.5
-      parent: 2
   - uid: 1157
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -7.5,-5.5
-      parent: 2
   - uid: 1158
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-7.5
-      parent: 2
   - uid: 1159
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-5.5
-      parent: 2
   - uid: 1160
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,-7.5
-      parent: 2
   - uid: 1161
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 2.5,-5.5
-      parent: 2
   - uid: 1162
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-6.5
-      parent: 2
   - uid: 1163
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 1.5,-5.5
-      parent: 2
 - proto: TableGlass
   entities:
   - uid: 1164
     components:
     - type: Transform
-      pos: 9.5,-21.5
       parent: 2
+      pos: 9.5,-21.5
 - proto: TableReinforced
   entities:
   - uid: 1165
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,1.5
-      parent: 2
   - uid: 1166
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -5.5,-0.5
-      parent: 2
   - uid: 1167
     components:
     - type: Transform
-      pos: 6.5,-13.5
       parent: 2
+      pos: 6.5,-13.5
   - uid: 1168
     components:
     - type: Transform
-      pos: 7.5,-13.5
       parent: 2
+      pos: 7.5,-13.5
   - uid: 1169
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-16.5
-      parent: 2
 - proto: TableReinforcedGlass
   entities:
   - uid: 1170
     components:
     - type: Transform
-      pos: 10.5,-4.5
       parent: 2
+      pos: 10.5,-4.5
   - uid: 1171
     components:
     - type: Transform
-      pos: 10.5,-1.5
       parent: 2
+      pos: 10.5,-1.5
   - uid: 1172
     components:
     - type: Transform
-      pos: 9.5,-1.5
       parent: 2
+      pos: 9.5,-1.5
   - uid: 1173
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,8.5
-      parent: 2
   - uid: 1174
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 6.5,8.5
-      parent: 2
   - uid: 1175
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 12.5,8.5
-      parent: 2
   - uid: 1176
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 11.5,8.5
-      parent: 2
   - uid: 1177
     components:
     - type: Transform
-      pos: 9.5,-4.5
       parent: 2
+      pos: 9.5,-4.5
   - uid: 1178
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-9.5
-      parent: 2
   - uid: 1179
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,-9.5
-      parent: 2
   - uid: 1180
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 10.5,3.5
-      parent: 2
   - uid: 1181
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,3.5
-      parent: 2
 - proto: TableStone
   entities:
   - uid: 1182
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,12.5
-      parent: 2
   - uid: 1183
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,9.5
-      parent: 2
   - uid: 1184
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,10.5
-      parent: 2
   - uid: 1185
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,11.5
-      parent: 2
   - uid: 1186
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -1.5,8.5
-      parent: 2
 - proto: TableWood
   entities:
   - uid: 1187
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -6.5,-21.5
-      parent: 2
   - uid: 1188
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 3.5,-21.5
-      parent: 2
 - proto: TelecomServerFilled
   entities:
   - uid: 1189
     components:
     - type: Transform
-      pos: -7.5,3.5
       parent: 2
+      pos: -7.5,3.5
 - proto: TintedWindow
   entities:
   - uid: 1190
     components:
     - type: Transform
-      pos: 14.5,-4.5
       parent: 2
+      pos: 14.5,-4.5
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1191
     components:
     - type: Transform
-      pos: 14.5,-5.5
       parent: 2
+      pos: 14.5,-5.5
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1192
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-17.5
-      parent: 2
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1193
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-18.5
-      parent: 2
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1194
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-19.5
-      parent: 2
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1195
     components:
     - type: Transform
-      pos: 8.5,-20.5
       parent: 2
+      pos: 8.5,-20.5
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1196
     components:
     - type: Transform
-      pos: 8.5,-21.5
       parent: 2
+      pos: 8.5,-21.5
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
   - uid: 1197
     components:
     - type: Transform
-      pos: 8.5,-22.5
       parent: 2
+      pos: 8.5,-22.5
     missingComponents:
     - Occluder
     - Damageable
-    - RCDDeconstructable
     - Destructible
+    - RCDDeconstructable
 - proto: ToiletEmpty
   entities:
   - uid: 1198
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,11.5
-      parent: 2
   - uid: 1199
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,7.5
-      parent: 2
   - uid: 1200
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,13.5
-      parent: 2
   - uid: 1201
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -5.5,9.5
-      parent: 2
 - proto: ToolboxElectrical
   entities:
   - uid: 1202
     components:
     - type: Transform
-      pos: -5.395227,-11.313736
       parent: 2
+      pos: -5.395227,-11.313736
 - proto: ToolboxMechanical
   entities:
   - uid: 1203
     components:
     - type: Transform
-      pos: -5.582727,-11.532486
       parent: 2
+      pos: -5.582727,-11.532486
 - proto: ToyFigurineBartender
   entities:
   - uid: 1204
     components:
     - type: Transform
-      pos: 0.45116568,-0.33467317
       parent: 2
+      pos: 0.45116568,-0.33467317
 - proto: TrashBag
   entities:
   - uid: 1205
@@ -10209,69 +10743,90 @@ entities:
     - type: MetaData
       name: пакет для покупок
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.547278,-20.178963
-      parent: 2
   - uid: 1206
     components:
     - type: MetaData
       name: пакет для покупок
     - type: Transform
-      pos: -3.0217736,-20.58265
       parent: 2
-- proto: TrashBagBlue
+      pos: -3.0217736,-20.58265
+- proto: TrashBagHolding
   entities:
   - uid: 1207
     components:
     - type: MetaData
       name: пакет для покупок
     - type: Transform
-      pos: -2.9506664,-20.171206
       parent: 2
+      pos: -2.9506664,-20.171206
 - proto: TwoWayLever
   entities:
   - uid: 1208
     components:
     - type: Transform
-      pos: -4.5,15.5
       parent: 2
+      pos: -4.5,15.5
     - type: DeviceLinkSource
       linkedPorts:
         468:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         469:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         470:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         1051:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         471:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         472:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
         473:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
+        - - Left
+          - Forward
+        - - Right
+          - Reverse
+        - - Middle
+          - Off
 - proto: VendingMachineBooze
   entities:
   - uid: 1209
     components:
     - type: Transform
-      pos: 0.5,1.5
       parent: 2
+      pos: 0.5,1.5
     missingComponents:
     - AccessReader
 - proto: VendingMachineChang
@@ -10279,1981 +10834,1981 @@ entities:
   - uid: 1210
     components:
     - type: Transform
-      pos: 3.5,-22.5
       parent: 2
+      pos: 3.5,-22.5
 - proto: VendingMachineCigs
   entities:
   - uid: 1211
     components:
     - type: Transform
-      pos: 5.5,5.5
       parent: 2
+      pos: 5.5,5.5
   - uid: 1212
     components:
     - type: Transform
-      pos: -5.5,-2.5
       parent: 2
+      pos: -5.5,-2.5
   - uid: 1213
     components:
     - type: Transform
-      pos: 9.5,-16.5
       parent: 2
+      pos: 9.5,-16.5
 - proto: VendingMachineClothing
   entities:
   - uid: 1214
     components:
     - type: Transform
-      pos: 3.5,-15.5
       parent: 2
+      pos: 3.5,-15.5
   - uid: 1215
     components:
     - type: Transform
-      pos: 3.5,-14.5
       parent: 2
+      pos: 3.5,-14.5
 - proto: VendingMachineCoffee
   entities:
   - uid: 1216
     components:
     - type: Transform
-      pos: -6.5,-2.5
       parent: 2
+      pos: -6.5,-2.5
   - uid: 1217
     components:
     - type: Transform
-      pos: 13.5,5.5
       parent: 2
+      pos: 13.5,5.5
   - uid: 1218
     components:
     - type: Transform
-      pos: 9.5,-18.5
       parent: 2
+      pos: 9.5,-18.5
 - proto: VendingMachineSecDrobe
   entities:
   - uid: 1219
     components:
     - type: Transform
-      pos: 7.5,-16.5
       parent: 2
+      pos: 7.5,-16.5
 - proto: VendingMachineTankDispenserEVA
   entities:
   - uid: 1220
     components:
     - type: Transform
-      pos: -5.5,-9.5
       parent: 2
+      pos: -5.5,-9.5
 - proto: VendingMachineWinter
   entities:
   - uid: 1221
     components:
     - type: Transform
-      pos: -6.5,-14.5
       parent: 2
+      pos: -6.5,-14.5
   - uid: 1222
     components:
     - type: Transform
+      parent: 2
       pos: -6.5,-15.5
-      parent: 2
-- proto: WallmountTelevision
-  entities:
-  - uid: 1223
-    components:
-    - type: Transform
-      pos: 9.5,11.5
-      parent: 2
-- proto: WallPlastitaniumIndestructible
-  entities:
-  - uid: 1227
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,2.5
-      parent: 2
-  - uid: 1228
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 2
-  - uid: 1229
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,14.5
-      parent: 2
-  - uid: 1230
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,6.5
-      parent: 2
-  - uid: 1231
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,6.5
-      parent: 2
-  - uid: 1232
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,17.5
-      parent: 2
-  - uid: 1233
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,2.5
-      parent: 2
-  - uid: 1234
-    components:
-    - type: Transform
-      pos: -9.5,-0.5
-      parent: 2
-  - uid: 1235
-    components:
-    - type: Transform
-      pos: -5.5,-8.5
-      parent: 2
-  - uid: 1236
-    components:
-    - type: Transform
-      pos: -9.5,-4.5
-      parent: 2
-  - uid: 1237
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,10.5
-      parent: 2
-  - uid: 1238
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,9.5
-      parent: 2
-  - uid: 1239
-    components:
-    - type: Transform
-      pos: 2.5,6.5
-      parent: 2
-  - uid: 1240
-    components:
-    - type: Transform
-      pos: -3.5,-8.5
-      parent: 2
-  - uid: 1241
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,11.5
-      parent: 2
-  - uid: 1242
-    components:
-    - type: Transform
-      pos: 0.5,-24.5
-      parent: 2
-  - uid: 1243
-    components:
-    - type: Transform
-      pos: 4.5,-22.5
-      parent: 2
-  - uid: 1244
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,11.5
-      parent: 2
-  - uid: 1245
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,11.5
-      parent: 2
-  - uid: 1246
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,11.5
-      parent: 2
-  - uid: 1247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,11.5
-      parent: 2
-  - uid: 1248
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,11.5
-      parent: 2
-  - uid: 1249
-    components:
-    - type: Transform
-      pos: -9.5,-3.5
-      parent: 2
-  - uid: 1250
-    components:
-    - type: Transform
-      pos: -9.5,-2.5
-      parent: 2
-  - uid: 1251
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 2
-  - uid: 1252
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,10.5
-      parent: 2
-  - uid: 1253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,9.5
-      parent: 2
-  - uid: 1254
-    components:
-    - type: Transform
-      pos: 3.5,6.5
-      parent: 2
-  - uid: 1255
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,8.5
-      parent: 2
-  - uid: 1256
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,7.5
-      parent: 2
-  - uid: 1257
-    components:
-    - type: Transform
-      pos: 4.5,-14.5
-      parent: 2
-  - uid: 1258
-    components:
-    - type: Transform
-      pos: -6.5,-1.5
-      parent: 2
-  - uid: 1259
-    components:
-    - type: Transform
-      pos: 5.5,-17.5
-      parent: 2
-  - uid: 1260
-    components:
-    - type: Transform
-      pos: 7.5,-17.5
-      parent: 2
-  - uid: 1261
-    components:
-    - type: Transform
-      pos: 4.5,-15.5
-      parent: 2
-  - uid: 1262
-    components:
-    - type: Transform
-      pos: -9.5,0.5
-      parent: 2
-  - uid: 1263
-    components:
-    - type: Transform
-      pos: -8.5,-1.5
-      parent: 2
-  - uid: 1264
-    components:
-    - type: Transform
-      pos: -7.5,-1.5
-      parent: 2
-  - uid: 1265
-    components:
-    - type: Transform
-      pos: -9.5,-8.5
-      parent: 2
-  - uid: 1266
-    components:
-    - type: Transform
-      pos: -8.5,-8.5
-      parent: 2
-  - uid: 1267
-    components:
-    - type: Transform
-      pos: 1.5,-26.5
-      parent: 2
-  - uid: 1268
-    components:
-    - type: Transform
-      pos: 2.5,-26.5
-      parent: 2
-  - uid: 1269
-    components:
-    - type: Transform
-      pos: -9.5,-7.5
-      parent: 2
-  - uid: 1270
-    components:
-    - type: Transform
-      pos: -9.5,2.5
-      parent: 2
-  - uid: 1271
-    components:
-    - type: Transform
-      pos: 6.5,-17.5
-      parent: 2
-  - uid: 1272
-    components:
-    - type: Transform
-      pos: 4.5,-16.5
-      parent: 2
-  - uid: 1273
-    components:
-    - type: Transform
-      pos: 4.5,-17.5
-      parent: 2
-  - uid: 1274
-    components:
-    - type: Transform
-      pos: -7.5,-22.5
-      parent: 2
-  - uid: 1275
-    components:
-    - type: Transform
-      pos: -9.5,-11.5
-      parent: 2
-  - uid: 1276
-    components:
-    - type: Transform
-      pos: -6.5,-12.5
-      parent: 2
-  - uid: 1277
-    components:
-    - type: Transform
-      pos: -9.5,-12.5
-      parent: 2
-  - uid: 1278
-    components:
-    - type: Transform
-      pos: -7.5,-16.5
-      parent: 2
-  - uid: 1279
-    components:
-    - type: Transform
-      pos: -9.5,-13.5
-      parent: 2
-  - uid: 1280
-    components:
-    - type: Transform
-      pos: -5.5,-25.5
-      parent: 2
-  - uid: 1281
-    components:
-    - type: Transform
-      pos: -7.5,-15.5
-      parent: 2
-  - uid: 1282
-    components:
-    - type: Transform
-      pos: 0.5,-23.5
-      parent: 2
-  - uid: 1283
-    components:
-    - type: Transform
-      pos: 4.5,-23.5
-      parent: 2
-  - uid: 1284
-    components:
-    - type: Transform
-      pos: 3.5,-23.5
-      parent: 2
-  - uid: 1285
-    components:
-    - type: Transform
-      pos: 3.5,-18.5
-      parent: 2
-  - uid: 1286
-    components:
-    - type: Transform
-      pos: 2.5,-25.5
-      parent: 2
-  - uid: 1287
-    components:
-    - type: Transform
-      pos: 0.5,-26.5
-      parent: 2
-  - uid: 1288
-    components:
-    - type: Transform
-      pos: 0.5,-25.5
-      parent: 2
-  - uid: 1289
-    components:
-    - type: Transform
-      pos: -3.5,-24.5
-      parent: 2
-  - uid: 1290
-    components:
-    - type: Transform
-      pos: -3.5,-25.5
-      parent: 2
-  - uid: 1291
-    components:
-    - type: Transform
-      pos: -5.5,-1.5
-      parent: 2
-  - uid: 1292
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,13.5
-      parent: 2
-  - uid: 1293
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,11.5
-      parent: 2
-  - uid: 1294
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,7.5
-      parent: 2
-  - uid: 1295
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,9.5
-      parent: 2
-  - uid: 1296
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,13.5
-      parent: 2
-  - uid: 1297
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,14.5
-      parent: 2
-  - uid: 1298
-    components:
-    - type: Transform
-      pos: -3.5,-23.5
-      parent: 2
-  - uid: 1299
-    components:
-    - type: Transform
-      pos: -9.5,-6.5
-      parent: 2
-  - uid: 1300
-    components:
-    - type: Transform
-      pos: -4.5,-11.5
-      parent: 2
-  - uid: 1301
-    components:
-    - type: Transform
-      pos: -6.5,-13.5
-      parent: 2
-  - uid: 1302
-    components:
-    - type: Transform
-      pos: -7.5,-23.5
-      parent: 2
-  - uid: 1303
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,11.5
-      parent: 2
-  - uid: 1304
-    components:
-    - type: Transform
-      pos: -3.5,-26.5
-      parent: 2
-  - uid: 1305
-    components:
-    - type: Transform
-      pos: -5.5,-23.5
-      parent: 2
-  - uid: 1306
-    components:
-    - type: Transform
-      pos: -1.5,-23.5
-      parent: 2
-  - uid: 1307
-    components:
-    - type: Transform
-      pos: 2.5,-12.5
-      parent: 2
-  - uid: 1308
-    components:
-    - type: Transform
-      pos: 4.5,-19.5
-      parent: 2
-  - uid: 1309
-    components:
-    - type: Transform
-      pos: 2.5,-23.5
-      parent: 2
-  - uid: 1310
-    components:
-    - type: Transform
-      pos: 4.5,-20.5
-      parent: 2
-  - uid: 1311
-    components:
-    - type: Transform
-      pos: 4.5,-21.5
-      parent: 2
-  - uid: 1312
-    components:
-    - type: Transform
-      pos: -9.5,-9.5
-      parent: 2
-  - uid: 1313
-    components:
-    - type: Transform
-      pos: -9.5,1.5
-      parent: 2
-  - uid: 1314
-    components:
-    - type: Transform
-      pos: -9.5,-1.5
-      parent: 2
-  - uid: 1315
-    components:
-    - type: Transform
-      pos: -4.5,-8.5
-      parent: 2
-  - uid: 1316
-    components:
-    - type: Transform
-      pos: -9.5,-5.5
-      parent: 2
-  - uid: 1317
-    components:
-    - type: Transform
-      pos: -7.5,-8.5
-      parent: 2
-  - uid: 1318
-    components:
-    - type: Transform
-      pos: -6.5,-8.5
-      parent: 2
-  - uid: 1319
-    components:
-    - type: Transform
-      pos: -4.5,-12.5
-      parent: 2
-  - uid: 1320
-    components:
-    - type: Transform
-      pos: -4.5,-9.5
-      parent: 2
-  - uid: 1321
-    components:
-    - type: Transform
-      pos: -7.5,-12.5
-      parent: 2
-  - uid: 1322
-    components:
-    - type: Transform
-      pos: -7.5,-19.5
-      parent: 2
-  - uid: 1323
-    components:
-    - type: Transform
-      pos: -7.5,-18.5
-      parent: 2
-  - uid: 1324
-    components:
-    - type: Transform
-      pos: -7.5,-17.5
-      parent: 2
-  - uid: 1325
-    components:
-    - type: Transform
-      pos: -2.5,-26.5
-      parent: 2
-  - uid: 1326
-    components:
-    - type: Transform
-      pos: -5.5,-26.5
-      parent: 2
-  - uid: 1327
-    components:
-    - type: Transform
-      pos: -5.5,-24.5
-      parent: 2
-  - uid: 1328
-    components:
-    - type: Transform
-      pos: -1.5,-24.5
-      parent: 2
-  - uid: 1329
-    components:
-    - type: Transform
-      pos: -6.5,-23.5
-      parent: 2
-  - uid: 1330
-    components:
-    - type: Transform
-      pos: -5.5,-12.5
-      parent: 2
-  - uid: 1331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,14.5
-      parent: 2
-  - uid: 1332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,10.5
-      parent: 2
-  - uid: 1333
-    components:
-    - type: Transform
-      pos: -7.5,-14.5
-      parent: 2
-  - uid: 1334
-    components:
-    - type: Transform
-      pos: -9.5,-10.5
-      parent: 2
-  - uid: 1335
-    components:
-    - type: Transform
-      pos: -6.5,-18.5
-      parent: 2
-  - uid: 1336
-    components:
-    - type: Transform
-      pos: -7.5,-20.5
-      parent: 2
-  - uid: 1337
-    components:
-    - type: Transform
-      pos: -7.5,-13.5
-      parent: 2
-  - uid: 1338
-    components:
-    - type: Transform
-      pos: -4.5,-26.5
-      parent: 2
-  - uid: 1339
-    components:
-    - type: Transform
-      pos: -0.5,-26.5
-      parent: 2
-  - uid: 1340
-    components:
-    - type: Transform
-      pos: 4.5,-18.5
-      parent: 2
-  - uid: 1341
-    components:
-    - type: Transform
-      pos: -1.5,-26.5
-      parent: 2
-  - uid: 1342
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 2
-  - uid: 1343
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 2
-  - uid: 1344
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 2
-  - uid: 1345
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,6.5
-      parent: 2
-  - uid: 1346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,2.5
-      parent: 2
-  - uid: 1347
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -3.5,6.5
-      parent: 2
-  - uid: 1348
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,6.5
-      parent: 2
-  - uid: 1349
-    components:
-    - type: Transform
-      pos: 0.5,-8.5
-      parent: 2
-  - uid: 1350
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
-      parent: 2
-  - uid: 1351
-    components:
-    - type: Transform
-      pos: 1.5,-8.5
-      parent: 2
-  - uid: 1352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,2.5
-      parent: 2
-  - uid: 1353
-    components:
-    - type: Transform
-      pos: 1.5,-12.5
-      parent: 2
-  - uid: 1354
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,8.5
-      parent: 2
-  - uid: 1355
-    components:
-    - type: Transform
-      pos: -3.5,-12.5
-      parent: 2
-  - uid: 1356
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,7.5
-      parent: 2
-  - uid: 1357
-    components:
-    - type: Transform
-      pos: -8.5,-14.5
-      parent: 2
-  - uid: 1358
-    components:
-    - type: Transform
-      pos: -1.5,-8.5
-      parent: 2
-  - uid: 1359
-    components:
-    - type: Transform
-      pos: -1.5,-25.5
-      parent: 2
-  - uid: 1360
-    components:
-    - type: Transform
-      pos: -9.5,-14.5
-      parent: 2
-  - uid: 1361
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,15.5
-      parent: 2
-  - uid: 1362
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,14.5
-      parent: 2
-  - uid: 1363
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,17.5
-      parent: 2
-  - uid: 1364
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,7.5
-      parent: 2
-  - uid: 1365
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,12.5
-      parent: 2
-  - uid: 1366
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,14.5
-      parent: 2
-  - uid: 1367
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,6.5
-      parent: 2
-  - uid: 1368
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,11.5
-      parent: 2
-  - uid: 1369
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,14.5
-      parent: 2
-  - uid: 1370
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,8.5
-      parent: 2
-  - uid: 1371
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,9.5
-      parent: 2
-  - uid: 1372
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,3.5
-      parent: 2
-  - uid: 1373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,5.5
-      parent: 2
-  - uid: 1374
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,6.5
-      parent: 2
-  - uid: 1375
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,6.5
-      parent: 2
-  - uid: 1376
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 2
-  - uid: 1377
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
-      parent: 2
-  - uid: 1378
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,2.5
-      parent: 2
-  - uid: 1379
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,2.5
-      parent: 2
-  - uid: 1380
-    components:
-    - type: Transform
-      pos: 0.5,-12.5
-      parent: 2
-  - uid: 1381
-    components:
-    - type: Transform
-      pos: -2.5,-12.5
-      parent: 2
-  - uid: 1382
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,11.5
-      parent: 2
-  - uid: 1383
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 2
-  - uid: 1384
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,11.5
-      parent: 2
-  - uid: 1385
-    components:
-    - type: Transform
-      pos: 2.5,-24.5
-      parent: 2
-  - uid: 1386
-    components:
-    - type: Transform
-      pos: -7.5,-21.5
-      parent: 2
-  - uid: 1387
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,8.5
-      parent: 2
-  - uid: 1388
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,8.5
-      parent: 2
-  - uid: 1389
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,2.5
-      parent: 2
-  - uid: 1390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,10.5
-      parent: 2
-  - uid: 1391
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,12.5
-      parent: 2
-  - uid: 1392
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,10.5
-      parent: 2
-  - uid: 1393
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,8.5
-      parent: 2
-  - uid: 1394
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,2.5
-      parent: 2
-  - uid: 1395
-    components:
-    - type: Transform
-      pos: -9.5,5.5
-      parent: 2
-  - uid: 1396
-    components:
-    - type: Transform
-      pos: 2.5,-8.5
-      parent: 2
-  - uid: 1397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,2.5
-      parent: 2
-  - uid: 1398
-    components:
-    - type: Transform
-      pos: -9.5,3.5
-      parent: 2
-  - uid: 1399
-    components:
-    - type: Transform
-      pos: -9.5,4.5
-      parent: 2
-  - uid: 1400
-    components:
-    - type: Transform
-      pos: 3.5,-8.5
-      parent: 2
-  - uid: 1401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,6.5
-      parent: 2
-  - uid: 1402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,12.5
-      parent: 2
-  - uid: 1403
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,2.5
-      parent: 2
-  - uid: 1404
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,12.5
-      parent: 2
-  - uid: 1405
-    components:
-    - type: Transform
-      pos: -9.5,6.5
-      parent: 2
-  - uid: 1406
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,10.5
-      parent: 2
-  - uid: 1407
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,2.5
-      parent: 2
-  - uid: 1408
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,17.5
-      parent: 2
-  - uid: 1409
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,17.5
-      parent: 2
-  - uid: 1410
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,17.5
-      parent: 2
-  - uid: 1411
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,17.5
-      parent: 2
-  - uid: 1412
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,16.5
-      parent: 2
-  - uid: 1413
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,17.5
-      parent: 2
-  - uid: 1414
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,15.5
-      parent: 2
-  - uid: 1415
-    components:
-    - type: Transform
-      pos: -9.5,-15.5
-      parent: 2
-  - uid: 1416
-    components:
-    - type: Transform
-      pos: -9.5,-17.5
-      parent: 2
-  - uid: 1417
-    components:
-    - type: Transform
-      pos: -9.5,-16.5
-      parent: 2
-  - uid: 1418
-    components:
-    - type: Transform
-      pos: -8.5,-17.5
-      parent: 2
-- proto: WallRiveted
+- proto: WallMarble
   entities:
   - uid: 1419
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,2.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1420
     components:
     - type: Transform
-      pos: 14.5,1.5
       parent: 2
+      pos: 14.5,1.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1421
     components:
     - type: Transform
-      pos: 14.5,6.5
       parent: 2
+      pos: 14.5,6.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1422
     components:
     - type: Transform
-      pos: 14.5,5.5
       parent: 2
+      pos: 14.5,5.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1423
     components:
     - type: Transform
-      pos: 14.5,0.5
       parent: 2
+      pos: 14.5,0.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1424
     components:
     - type: Transform
-      pos: 16.5,-23.5
       parent: 2
+      pos: 16.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1425
     components:
     - type: Transform
-      pos: 14.5,-0.5
       parent: 2
+      pos: 14.5,-0.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1426
     components:
     - type: Transform
-      pos: 14.5,4.5
       parent: 2
+      pos: 14.5,4.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1427
     components:
     - type: Transform
-      pos: 14.5,3.5
       parent: 2
+      pos: 14.5,3.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1428
     components:
     - type: Transform
-      pos: 15.5,3.5
       parent: 2
+      pos: 15.5,3.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1429
     components:
     - type: Transform
-      pos: 14.5,-2.5
       parent: 2
+      pos: 14.5,-2.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1430
     components:
     - type: Transform
-      pos: 15.5,-2.5
       parent: 2
+      pos: 15.5,-2.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1431
     components:
     - type: Transform
-      pos: 14.5,-15.5
       parent: 2
+      pos: 14.5,-15.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1432
     components:
     - type: Transform
-      pos: 14.5,-6.5
       parent: 2
+      pos: 14.5,-6.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1433
     components:
     - type: Transform
-      pos: 14.5,-7.5
       parent: 2
+      pos: 14.5,-7.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1434
     components:
     - type: Transform
-      pos: 15.5,-7.5
       parent: 2
+      pos: 15.5,-7.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1435
     components:
     - type: Transform
-      pos: 14.5,-13.5
       parent: 2
+      pos: 14.5,-13.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1436
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-13.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1437
     components:
     - type: Transform
-      pos: 16.5,-9.5
       parent: 2
+      pos: 16.5,-9.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1438
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 13.5,6.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1439
     components:
     - type: Transform
-      pos: 14.5,-9.5
       parent: 2
+      pos: 14.5,-9.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1440
     components:
     - type: Transform
-      pos: 15.5,-9.5
       parent: 2
+      pos: 15.5,-9.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1441
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-9.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1442
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-11.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1443
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-13.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1444
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-14.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1445
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-12.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1446
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-15.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1447
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-15.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1448
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-17.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1449
     components:
     - type: Transform
-      pos: 10.5,-12.5
       parent: 2
+      pos: 10.5,-12.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1450
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 9.5,-12.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1451
     components:
     - type: Transform
-      pos: 9.5,-23.5
       parent: 2
+      pos: 9.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1452
     components:
     - type: Transform
-      pos: 12.5,-26.5
       parent: 2
+      pos: 12.5,-26.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1453
     components:
     - type: Transform
-      pos: 13.5,-23.5
       parent: 2
+      pos: 13.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1454
     components:
     - type: Transform
-      pos: 12.5,-12.5
       parent: 2
+      pos: 12.5,-12.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1455
     components:
     - type: Transform
-      pos: 13.5,-13.5
       parent: 2
+      pos: 13.5,-13.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1456
     components:
     - type: Transform
-      pos: 13.5,-12.5
       parent: 2
+      pos: 13.5,-12.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1457
     components:
     - type: Transform
-      pos: 14.5,-12.5
       parent: 2
+      pos: 14.5,-12.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1458
     components:
     - type: Transform
-      pos: 10.5,-30.5
       parent: 2
+      pos: 10.5,-30.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1459
     components:
     - type: Transform
-      pos: 13.5,-21.5
       parent: 2
+      pos: 13.5,-21.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1460
     components:
     - type: Transform
-      pos: 15.5,-15.5
       parent: 2
+      pos: 15.5,-15.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1461
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-20.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1462
     components:
     - type: Transform
-      pos: 14.5,-3.5
       parent: 2
+      pos: 14.5,-3.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1463
     components:
     - type: Transform
-      pos: 13.5,-15.5
       parent: 2
+      pos: 13.5,-15.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1464
     components:
     - type: Transform
-      pos: 9.5,-19.5
       parent: 2
+      pos: 9.5,-19.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1465
     components:
     - type: Transform
-      pos: 8.5,-18.5
       parent: 2
+      pos: 8.5,-18.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1466
     components:
     - type: Transform
-      pos: 8.5,-19.5
       parent: 2
+      pos: 8.5,-19.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1467
     components:
     - type: Transform
-      pos: 16.5,-21.5
       parent: 2
+      pos: 16.5,-21.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1468
     components:
     - type: Transform
-      pos: 10.5,-26.5
       parent: 2
+      pos: 10.5,-26.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1469
     components:
     - type: Transform
-      pos: 13.5,-26.5
       parent: 2
+      pos: 13.5,-26.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1470
     components:
     - type: Transform
-      pos: 8.5,-23.5
       parent: 2
+      pos: 8.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1471
     components:
     - type: Transform
-      pos: 14.5,-10.5
       parent: 2
+      pos: 14.5,-10.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1472
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 13.5,-16.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1473
     components:
     - type: Transform
-      pos: 9.5,-26.5
       parent: 2
+      pos: 9.5,-26.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1474
     components:
     - type: Transform
-      pos: 15.5,-13.5
       parent: 2
+      pos: 15.5,-13.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1475
     components:
     - type: Transform
-      pos: 14.5,-23.5
       parent: 2
+      pos: 14.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1476
     components:
     - type: Transform
-      pos: 14.5,-11.5
       parent: 2
+      pos: 14.5,-11.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1477
     components:
     - type: Transform
-      pos: 15.5,1.5
       parent: 2
+      pos: 15.5,1.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1478
     components:
     - type: Transform
-      pos: 16.5,-2.5
       parent: 2
+      pos: 16.5,-2.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1479
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 8.5,-16.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1480
     components:
     - type: Transform
-      pos: 16.5,-0.5
       parent: 2
+      pos: 16.5,-0.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1481
     components:
     - type: Transform
-      pos: 14.5,-21.5
       parent: 2
+      pos: 14.5,-21.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1482
     components:
     - type: Transform
-      pos: 12.5,-30.5
       parent: 2
+      pos: 12.5,-30.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1483
     components:
     - type: Transform
-      pos: 16.5,-13.5
       parent: 2
+      pos: 16.5,-13.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1484
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 13.5,-24.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1485
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,1.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1486
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-5.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1487
     components:
     - type: Transform
-      pos: 15.5,-0.5
       parent: 2
+      pos: 15.5,-0.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1488
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,-13.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1489
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 5.5,6.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1490
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,6.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1491
     components:
     - type: Transform
-      pos: 16.5,-15.5
       parent: 2
+      pos: 16.5,-15.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1492
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-24.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1493
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 9.5,-25.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1494
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,0.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1495
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,3.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1496
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,5.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1497
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-4.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1498
     components:
     - type: Transform
-      pos: -0.5,-0.5
       parent: 2
+      pos: -0.5,-0.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1499
     components:
     - type: Transform
-      pos: 15.5,-23.5
       parent: 2
+      pos: 15.5,-23.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1500
     components:
     - type: Transform
-      pos: 16.5,-7.5
       parent: 2
+      pos: 16.5,-7.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1501
     components:
     - type: Transform
-      pos: 16.5,1.5
       parent: 2
+      pos: 16.5,1.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1502
     components:
     - type: Transform
-      pos: 16.5,3.5
       parent: 2
+      pos: 16.5,3.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1503
     components:
     - type: Transform
-      pos: 15.5,-21.5
       parent: 2
+      pos: 15.5,-21.5
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1504
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 13.5,-25.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1505
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-7.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1506
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-0.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1507
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-1.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1508
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-8.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1509
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 4.5,-6.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1510
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,-29.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1511
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,-27.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1512
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-28.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1513
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-27.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1514
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 12.5,-28.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
   - uid: 1515
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 10.5,-29.5
-      parent: 2
     missingComponents:
     - Damageable
     - Destructible
+- proto: WallmountTelevision
+  entities:
+  - uid: 1223
+    components:
+    - type: Transform
+      parent: 2
+      pos: 9.5,11.5
+- proto: WallPlastitaniumIndestructible
+  entities:
+  - uid: 1227
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,2.5
+  - uid: 1228
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,1.5
+  - uid: 1229
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,14.5
+  - uid: 1230
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,6.5
+  - uid: 1231
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,6.5
+  - uid: 1232
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -3.5,17.5
+  - uid: 1233
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -3.5,2.5
+  - uid: 1234
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-0.5
+  - uid: 1235
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-8.5
+  - uid: 1236
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-4.5
+  - uid: 1237
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,10.5
+  - uid: 1238
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,9.5
+  - uid: 1239
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,6.5
+  - uid: 1240
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-8.5
+  - uid: 1241
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 8.5,11.5
+  - uid: 1242
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-24.5
+  - uid: 1243
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-22.5
+  - uid: 1244
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 7.5,11.5
+  - uid: 1245
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 11.5,11.5
+  - uid: 1246
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 9.5,11.5
+  - uid: 1247
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 10.5,11.5
+  - uid: 1248
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,11.5
+  - uid: 1249
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-3.5
+  - uid: 1250
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-2.5
+  - uid: 1251
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,6.5
+  - uid: 1252
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,10.5
+  - uid: 1253
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,9.5
+  - uid: 1254
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,6.5
+  - uid: 1255
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,8.5
+  - uid: 1256
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,7.5
+  - uid: 1257
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-14.5
+  - uid: 1258
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-1.5
+  - uid: 1259
+    components:
+    - type: Transform
+      parent: 2
+      pos: 5.5,-17.5
+  - uid: 1260
+    components:
+    - type: Transform
+      parent: 2
+      pos: 7.5,-17.5
+  - uid: 1261
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-15.5
+  - uid: 1262
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,0.5
+  - uid: 1263
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-1.5
+  - uid: 1264
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-1.5
+  - uid: 1265
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-8.5
+  - uid: 1266
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-8.5
+  - uid: 1267
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-26.5
+  - uid: 1268
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-26.5
+  - uid: 1269
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-7.5
+  - uid: 1270
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,2.5
+  - uid: 1271
+    components:
+    - type: Transform
+      parent: 2
+      pos: 6.5,-17.5
+  - uid: 1272
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-16.5
+  - uid: 1273
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-17.5
+  - uid: 1274
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-22.5
+  - uid: 1275
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-11.5
+  - uid: 1276
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-12.5
+  - uid: 1277
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-12.5
+  - uid: 1278
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-16.5
+  - uid: 1279
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-13.5
+  - uid: 1280
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-25.5
+  - uid: 1281
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-15.5
+  - uid: 1282
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-23.5
+  - uid: 1283
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-23.5
+  - uid: 1284
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-23.5
+  - uid: 1285
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-18.5
+  - uid: 1286
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-25.5
+  - uid: 1287
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-26.5
+  - uid: 1288
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-25.5
+  - uid: 1289
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-24.5
+  - uid: 1290
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-25.5
+  - uid: 1291
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-1.5
+  - uid: 1292
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,13.5
+  - uid: 1293
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,11.5
+  - uid: 1294
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,7.5
+  - uid: 1295
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,9.5
+  - uid: 1296
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,13.5
+  - uid: 1297
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -3.5,14.5
+  - uid: 1298
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-23.5
+  - uid: 1299
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-6.5
+  - uid: 1300
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-11.5
+  - uid: 1301
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-13.5
+  - uid: 1302
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-23.5
+  - uid: 1303
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 13.5,11.5
+  - uid: 1304
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-26.5
+  - uid: 1305
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-23.5
+  - uid: 1306
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-23.5
+  - uid: 1307
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-12.5
+  - uid: 1308
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-19.5
+  - uid: 1309
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-23.5
+  - uid: 1310
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-20.5
+  - uid: 1311
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-21.5
+  - uid: 1312
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-9.5
+  - uid: 1313
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,1.5
+  - uid: 1314
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-1.5
+  - uid: 1315
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-8.5
+  - uid: 1316
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-5.5
+  - uid: 1317
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-8.5
+  - uid: 1318
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-8.5
+  - uid: 1319
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-12.5
+  - uid: 1320
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-9.5
+  - uid: 1321
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-12.5
+  - uid: 1322
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-19.5
+  - uid: 1323
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-18.5
+  - uid: 1324
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-17.5
+  - uid: 1325
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-26.5
+  - uid: 1326
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-26.5
+  - uid: 1327
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-24.5
+  - uid: 1328
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-24.5
+  - uid: 1329
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-23.5
+  - uid: 1330
+    components:
+    - type: Transform
+      parent: 2
+      pos: -5.5,-12.5
+  - uid: 1331
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5,14.5
+  - uid: 1332
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,10.5
+  - uid: 1333
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-14.5
+  - uid: 1334
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-10.5
+  - uid: 1335
+    components:
+    - type: Transform
+      parent: 2
+      pos: -6.5,-18.5
+  - uid: 1336
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-20.5
+  - uid: 1337
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-13.5
+  - uid: 1338
+    components:
+    - type: Transform
+      parent: 2
+      pos: -4.5,-26.5
+  - uid: 1339
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-26.5
+  - uid: 1340
+    components:
+    - type: Transform
+      parent: 2
+      pos: 4.5,-18.5
+  - uid: 1341
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-26.5
+  - uid: 1342
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-12.5
+  - uid: 1343
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5,2.5
+  - uid: 1344
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-0.5
+  - uid: 1345
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,6.5
+  - uid: 1346
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
+  - uid: 1347
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -3.5,6.5
+  - uid: 1348
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,6.5
+  - uid: 1349
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-8.5
+  - uid: 1350
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-8.5
+  - uid: 1351
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-8.5
+  - uid: 1352
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -8.5,2.5
+  - uid: 1353
+    components:
+    - type: Transform
+      parent: 2
+      pos: 1.5,-12.5
+  - uid: 1354
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,8.5
+  - uid: 1355
+    components:
+    - type: Transform
+      parent: 2
+      pos: -3.5,-12.5
+  - uid: 1356
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+  - uid: 1357
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-14.5
+  - uid: 1358
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-8.5
+  - uid: 1359
+    components:
+    - type: Transform
+      parent: 2
+      pos: -1.5,-25.5
+  - uid: 1360
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-14.5
+  - uid: 1361
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,15.5
+  - uid: 1362
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,14.5
+  - uid: 1363
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -4.5,17.5
+  - uid: 1364
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,7.5
+  - uid: 1365
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,12.5
+  - uid: 1366
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,14.5
+  - uid: 1367
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -1.5,6.5
+  - uid: 1368
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,11.5
+  - uid: 1369
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,14.5
+  - uid: 1370
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,8.5
+  - uid: 1371
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,9.5
+  - uid: 1372
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,3.5
+  - uid: 1373
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,5.5
+  - uid: 1374
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,6.5
+  - uid: 1375
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,6.5
+  - uid: 1376
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-13.5
+  - uid: 1377
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,1.5
+  - uid: 1378
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,2.5
+  - uid: 1379
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -7.5,2.5
+  - uid: 1380
+    components:
+    - type: Transform
+      parent: 2
+      pos: 0.5,-12.5
+  - uid: 1381
+    components:
+    - type: Transform
+      parent: 2
+      pos: -2.5,-12.5
+  - uid: 1382
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 6.5,11.5
+  - uid: 1383
+    components:
+    - type: Transform
+      parent: 2
+      pos: -0.5,-12.5
+  - uid: 1384
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 12.5,11.5
+  - uid: 1385
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-24.5
+  - uid: 1386
+    components:
+    - type: Transform
+      parent: 2
+      pos: -7.5,-21.5
+  - uid: 1387
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,8.5
+  - uid: 1388
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,8.5
+  - uid: 1389
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 0.5,2.5
+  - uid: 1390
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,10.5
+  - uid: 1391
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,12.5
+  - uid: 1392
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,10.5
+  - uid: 1393
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,8.5
+  - uid: 1394
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
+  - uid: 1395
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,5.5
+  - uid: 1396
+    components:
+    - type: Transform
+      parent: 2
+      pos: 2.5,-8.5
+  - uid: 1397
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+  - uid: 1398
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,3.5
+  - uid: 1399
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,4.5
+  - uid: 1400
+    components:
+    - type: Transform
+      parent: 2
+      pos: 3.5,-8.5
+  - uid: 1401
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,6.5
+  - uid: 1402
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,12.5
+  - uid: 1403
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+  - uid: 1404
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -5.5,12.5
+  - uid: 1405
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,6.5
+  - uid: 1406
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -4.5,10.5
+  - uid: 1407
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -0.5,2.5
+  - uid: 1408
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -5.5,17.5
+  - uid: 1409
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -2.5,17.5
+  - uid: 1410
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -1.5,17.5
+  - uid: 1411
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -0.5,17.5
+  - uid: 1412
+    components:
+    - type: Transform
+      parent: 2
+      rot: 1.5707963267948966 rad
+      pos: -0.5,16.5
+  - uid: 1413
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,17.5
+  - uid: 1414
+    components:
+    - type: Transform
+      parent: 2
+      rot: -1.5707963267948966 rad
+      pos: -6.5,15.5
+  - uid: 1415
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-15.5
+  - uid: 1416
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-17.5
+  - uid: 1417
+    components:
+    - type: Transform
+      parent: 2
+      pos: -9.5,-16.5
+  - uid: 1418
+    components:
+    - type: Transform
+      parent: 2
+      pos: -8.5,-17.5
 - proto: WardrobeAtmospherics
   entities:
   - uid: 1516
     components:
     - type: Transform
-      pos: -6.5,-9.5
       parent: 2
+      pos: -6.5,-9.5
 - proto: WardrobeMixedFilled
   entities:
   - uid: 1517
     components:
     - type: Transform
-      pos: 2.5,-18.5
       parent: 2
+      pos: 2.5,-18.5
 - proto: WardrobeWhiteFilled
   entities:
   - uid: 1518
     components:
     - type: Transform
-      pos: -5.5,-18.5
       parent: 2
+      pos: -5.5,-18.5
 - proto: WarningAir
   entities:
   - uid: 1519
     components:
     - type: Transform
-      pos: -7.5,-12.5
       parent: 2
+      pos: -7.5,-12.5
 - proto: WarpPoint
   entities:
   - uid: 1520
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,-3.5
-      parent: 2
     - type: WarpPoint
       location: Терминал
 - proto: WaterCooler
@@ -12261,358 +12816,356 @@ entities:
   - uid: 1521
     components:
     - type: Transform
-      pos: -6.5,-19.5
       parent: 2
+      pos: -6.5,-19.5
   - uid: 1522
     components:
     - type: Transform
-      pos: 3.5,-19.5
       parent: 2
+      pos: 3.5,-19.5
 - proto: Windoor
   entities:
   - uid: 1523
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 7.5,-13.5
-      parent: 2
   - uid: 1524
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: 6.5,-13.5
-      parent: 2
   - uid: 1525
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-15.5
-      parent: 2
   - uid: 1526
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-15.5
-      parent: 2
-- proto: WindoorSecure
-  entities:
   - uid: 1527
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -1.5,15.5
-      parent: 2
-- proto: WindoorSecureSecurityLocked
+- proto: WindoorSecurityLocked
   entities:
   - uid: 1528
     components:
     - type: Transform
-      pos: 6.5,-13.5
       parent: 2
+      pos: 6.5,-13.5
   - uid: 1529
     components:
     - type: Transform
-      pos: 7.5,-13.5
       parent: 2
+      pos: 7.5,-13.5
 - proto: Window
   entities:
   - uid: 1530
     components:
     - type: Transform
-      pos: 12.5,6.5
       parent: 2
+      pos: 12.5,6.5
   - uid: 1531
     components:
     - type: Transform
-      pos: 12.5,10.5
       parent: 2
+      pos: 12.5,10.5
   - uid: 1532
     components:
     - type: Transform
-      pos: 7.5,6.5
       parent: 2
+      pos: 7.5,6.5
   - uid: 1533
     components:
     - type: Transform
-      pos: 11.5,10.5
       parent: 2
+      pos: 11.5,10.5
     - type: PointLight
-      energy: 3
-      color: '#AF60FCFF'
       radius: 2
       offset: 0.5,0
+      energy: 3
+      color: '#AF60FCFF'
   - uid: 1534
     components:
     - type: Transform
-      pos: 6.5,6.5
       parent: 2
+      pos: 6.5,6.5
     - type: PointLight
-      energy: 3
-      color: '#AF60FCFF'
       radius: 2
       offset: 0.5,0
+      energy: 3
+      color: '#AF60FCFF'
   - uid: 1535
     components:
     - type: Transform
-      pos: 11.5,6.5
       parent: 2
+      pos: 11.5,6.5
     - type: PointLight
-      energy: 3
-      color: '#AF60FCFF'
       radius: 2
       offset: 0.5,0
+      energy: 3
+      color: '#AF60FCFF'
   - uid: 1536
     components:
     - type: Transform
-      pos: 7.5,10.5
       parent: 2
+      pos: 7.5,10.5
   - uid: 1537
     components:
     - type: Transform
-      pos: 6.5,10.5
       parent: 2
+      pos: 6.5,10.5
     - type: PointLight
-      energy: 3
-      color: '#AF60FCFF'
       radius: 2
       offset: 0.5,0
+      energy: 3
+      color: '#AF60FCFF'
   - uid: 1538
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-1.5
-      parent: 2
     - type: PointLight
+      radius: 2
       energy: 3
       color: '#AF60FCFF'
-      radius: 2
   - uid: 1539
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-1.5
-      parent: 2
     - type: PointLight
+      radius: 2
       energy: 3
       color: '#AF60FCFF'
-      radius: 2
   - uid: 1540
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-7.5
-      parent: 2
   - uid: 1541
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-6.5
-      parent: 2
     - type: PointLight
+      radius: 3
       energy: 3
       color: '#AF60FCFF'
-      radius: 3
   - uid: 1542
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-5.5
-      parent: 2
   - uid: 1543
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-5.5
-      parent: 2
   - uid: 1544
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -0.5,-7.5
-      parent: 2
   - uid: 1545
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,-6.5
-      parent: 2
     - type: PointLight
+      radius: 3
       energy: 3
       color: '#AF60FCFF'
-      radius: 3
 - proto: WindowDirectional
   entities:
   - uid: 1546
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 0.5,-0.5
-      parent: 2
   - uid: 1547
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 3.5,-0.5
-      parent: 2
   - uid: 1548
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-13.5
-      parent: 2
   - uid: 1549
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-16.5
-      parent: 2
   - uid: 1550
     components:
     - type: Transform
-      pos: -5.5,-17.5
       parent: 2
+      pos: -5.5,-17.5
   - uid: 1551
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-14.5
-      parent: 2
   - uid: 1552
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-14.5
-      parent: 2
   - uid: 1553
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-13.5
-      parent: 2
   - uid: 1554
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-16.5
-      parent: 2
   - uid: 1555
     components:
     - type: Transform
-      pos: -2.5,-17.5
       parent: 2
+      pos: -2.5,-17.5
   - uid: 1556
     components:
     - type: Transform
-      pos: -4.5,-17.5
       parent: 2
+      pos: -4.5,-17.5
   - uid: 1557
     components:
     - type: Transform
-      pos: -3.5,-17.5
       parent: 2
+      pos: -3.5,-17.5
   - uid: 1558
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: -2.5,-17.5
-      parent: 2
   - uid: 1559
     components:
     - type: Transform
-      pos: -6.5,-17.5
       parent: 2
+      pos: -6.5,-17.5
   - uid: 1560
     components:
     - type: Transform
-      pos: 0.5,-17.5
       parent: 2
+      pos: 0.5,-17.5
   - uid: 1561
     components:
     - type: Transform
-      pos: 1.5,-17.5
       parent: 2
+      pos: 1.5,-17.5
   - uid: 1562
     components:
     - type: Transform
-      pos: 2.5,-17.5
       parent: 2
+      pos: 2.5,-17.5
   - uid: 1563
     components:
     - type: Transform
-      pos: 3.5,-17.5
       parent: 2
+      pos: 3.5,-17.5
   - uid: 1564
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,-17.5
-      parent: 2
   - uid: 1565
     components:
     - type: Transform
-      pos: -0.5,-17.5
       parent: 2
+      pos: -0.5,-17.5
   - uid: 1566
     components:
     - type: MetaData
       name: зеркало
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,11.5
-      parent: 2
   - uid: 1567
     components:
     - type: MetaData
       name: зеркало
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: -0.5,9.5
-      parent: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 1568
     components:
     - type: Transform
+      parent: 2
       rot: 1.5707963267948966 rad
       pos: 7.5,-13.5
-      parent: 2
   - uid: 1569
     components:
     - type: Transform
+      parent: 2
       rot: -1.5707963267948966 rad
       pos: 6.5,-13.5
-      parent: 2
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 1570
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -4.5,15.5
-      parent: 2
   - uid: 1571
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -5.5,15.5
-      parent: 2
   - uid: 1572
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -3.5,15.5
-      parent: 2
   - uid: 1573
     components:
     - type: Transform
+      parent: 2
       rot: 3.141592653589793 rad
       pos: -2.5,15.5
-      parent: 2
 - proto: ZiptiesBroken
   entities:
   - uid: 1574
     components:
     - type: Transform
-      pos: -8.450703,-15.806053
       parent: 2
+      pos: -8.450703,-15.806053
 ...